mirror of
https://github.com/armbian/build.git
synced 2025-08-18 00:56:57 +02:00
54 lines
2.0 KiB
Diff
54 lines
2.0 KiB
Diff
From f9a39553dcf5e87eba968d2aac4f5acf52baa392 Mon Sep 17 00:00:00 2001
|
|
From: Jernej Skrabec <jernej.skrabec@gmail.com>
|
|
Date: Sun, 29 Sep 2024 22:04:39 +1300
|
|
Subject: drm: sun4i: de3: add formatter flag to mixer config
|
|
|
|
Only the DE3 (and newer) display engines have a formatter module. This
|
|
could be inferred from the is_de3 flag alone, however this will not
|
|
scale with addition of future DE versions in subsequent patches.
|
|
|
|
Add a separate flag to signal this in the mixer configuration.
|
|
|
|
Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
|
|
Signed-off-by: Ryan Walklin <ryan@testtoast.com>
|
|
---
|
|
drivers/gpu/drm/sun4i/sun8i_mixer.c | 1 +
|
|
drivers/gpu/drm/sun4i/sun8i_mixer.h | 2 ++
|
|
2 files changed, 3 insertions(+)
|
|
|
|
diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c
|
|
index bd0fe2c6624e..252827715de1 100644
|
|
--- a/drivers/gpu/drm/sun4i/sun8i_mixer.c
|
|
+++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c
|
|
@@ -717,6 +717,7 @@ static const struct sun8i_mixer_cfg sun50i_a64_mixer1_cfg = {
|
|
static const struct sun8i_mixer_cfg sun50i_h6_mixer0_cfg = {
|
|
.ccsc = CCSC_MIXER0_LAYOUT,
|
|
.is_de3 = true,
|
|
+ .has_formatter = 1,
|
|
.mod_rate = 600000000,
|
|
.scaler_mask = 0xf,
|
|
.scanline_yuv = 4096,
|
|
diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.h b/drivers/gpu/drm/sun4i/sun8i_mixer.h
|
|
index d7898c9c9cc0..8417b8fef2e1 100644
|
|
--- a/drivers/gpu/drm/sun4i/sun8i_mixer.h
|
|
+++ b/drivers/gpu/drm/sun4i/sun8i_mixer.h
|
|
@@ -163,6 +163,7 @@ enum {
|
|
* @mod_rate: module clock rate that needs to be set in order to have
|
|
* a functional block.
|
|
* @is_de3: true, if this is next gen display engine 3.0, false otherwise.
|
|
+ * @has_formatter: true, if mixer has formatter core, for 10-bit and YUV handling
|
|
* @scaline_yuv: size of a scanline for VI scaler for YUV formats.
|
|
*/
|
|
struct sun8i_mixer_cfg {
|
|
@@ -172,6 +173,7 @@ struct sun8i_mixer_cfg {
|
|
int ccsc;
|
|
unsigned long mod_rate;
|
|
unsigned int is_de3 : 1;
|
|
+ unsigned int has_formatter : 1;
|
|
unsigned int scanline_yuv;
|
|
};
|
|
|
|
--
|
|
2.35.3
|
|
|