35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martin Blumenstingl <[email protected]>
|
|
Date: Sat, 25 Apr 2020 22:00:57 +0200
|
|
Subject: drm/meson: Enable the RGB to YUV converter on Meson8/Meson8b/Meson8m2
|
|
|
|
Set VIU_OSD1_BLK0_CFG_W0[7] to 1 to enable RGB to YUV converter, just
|
|
like on GXBB.
|
|
|
|
Signed-off-by: Martin Blumenstingl <[email protected]>
|
|
---
|
|
drivers/gpu/drm/meson/meson_plane.c | 7 +++++--
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/gpu/drm/meson/meson_plane.c b/drivers/gpu/drm/meson/meson_plane.c
|
|
index 111111111111..222222222222 100644
|
|
--- a/drivers/gpu/drm/meson/meson_plane.c
|
|
+++ b/drivers/gpu/drm/meson/meson_plane.c
|
|
@@ -200,8 +200,11 @@ static void meson_plane_atomic_update(struct drm_plane *plane,
|
|
priv->viu.osd1_ctrl_stat2 &= ~OSD_DPATH_MALI_AFBCD;
|
|
}
|
|
|
|
- /* On GXBB, Use the old non-HDR RGB2YUV converter */
|
|
- if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_GXBB))
|
|
+ /* On GXBB and earlier, Use the old non-HDR RGB2YUV converter */
|
|
+ if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_M8) ||
|
|
+ meson_vpu_is_compatible(priv, VPU_COMPATIBLE_M8B) ||
|
|
+ meson_vpu_is_compatible(priv, VPU_COMPATIBLE_M8M2) ||
|
|
+ meson_vpu_is_compatible(priv, VPU_COMPATIBLE_GXBB))
|
|
priv->viu.osd1_blk0_cfg[0] |= OSD_OUTPUT_COLOR_RGB;
|
|
|
|
if (priv->viu.osd1_afbcd &&
|
|
--
|
|
Armbian
|
|
|