Commit a1fa7268 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2021-08-12' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



Short summary of fixes pull:

 * meson: Fix colors when booting with HDR

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YRTb+qUuBYWjJDVg@linux-uq9g.fritz.box
parents 3e234e9f bf33677a

drivers/gpu/drm/meson/meson_registers.h

+5 −0
Original line number Diff line number Diff line
@@ -634,6 +634,11 @@ 
#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

drivers/gpu/drm/meson/meson_viu.c

+6 −1
Original line number Diff line number Diff line
@@ -425,9 +425,14 @@ 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 |