From 2cf9c7f2901733b98f3d6553e668585c73db28be Mon Sep 17 00:00:00 2001 From: Dongjin Kim Date: Tue, 31 Aug 2021 12:53:43 +0900 Subject: [PATCH 68/75] Revert "drm/meson: fix colour distortion from HDR set during vendor u-boot" This reverts commit 75004b47fba41ffba1c779350d9e457ace11cc6b. --- drivers/gpu/drm/meson/meson_registers.h | 5 ----- drivers/gpu/drm/meson/meson_viu.c | 7 +------ 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/gpu/drm/meson/meson_registers.h b/drivers/gpu/drm/meson/meson_registers.h index 0f3cafab8860..446e7961da48 100644 --- a/drivers/gpu/drm/meson/meson_registers.h +++ b/drivers/gpu/drm/meson/meson_registers.h @@ -634,11 +634,6 @@ #define VPP_WRAP_OSD3_MATRIX_PRE_OFFSET2 0x3dbc #define VPP_WRAP_OSD3_MATRIX_EN_CTRL 0x3dbd -/* osd1 HDR */ -#define OSD1_HDR2_CTRL 0x38a0 -#define OSD1_HDR2_CTRL_VDIN0_HDR2_TOP_EN BIT(13) -#define OSD1_HDR2_CTRL_REG_ONLY_MAT BIT(16) - /* osd2 scaler */ #define OSD2_VSC_PHASE_STEP 0x3d00 #define OSD2_VSC_INI_PHASE 0x3d01 diff --git a/drivers/gpu/drm/meson/meson_viu.c b/drivers/gpu/drm/meson/meson_viu.c index 259f3e6bec90..aede0c67a57f 100644 --- a/drivers/gpu/drm/meson/meson_viu.c +++ b/drivers/gpu/drm/meson/meson_viu.c @@ -425,14 +425,9 @@ void meson_viu_init(struct meson_drm *priv) if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_GXM) || meson_vpu_is_compatible(priv, VPU_COMPATIBLE_GXL)) meson_viu_load_matrix(priv); - else if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A)) { + else if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A)) meson_viu_set_g12a_osd1_matrix(priv, RGB709_to_YUV709l_coeff, true); - /* fix green/pink color distortion from vendor u-boot */ - writel_bits_relaxed(OSD1_HDR2_CTRL_REG_ONLY_MAT | - OSD1_HDR2_CTRL_VDIN0_HDR2_TOP_EN, 0, - priv->io_base + _REG(OSD1_HDR2_CTRL)); - } /* Initialize OSD1 fifo control register */ reg = VIU_OSD_DDR_PRIORITY_URGENT | -- 2.25.1