tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YRTb+qUuBYWjJDVg@linux-uq9g.fritz.box
+11
-1
+5
drivers/gpu/drm/meson/meson_registers.h
+5
drivers/gpu/drm/meson/meson_registers.h
···
634
634
#define VPP_WRAP_OSD3_MATRIX_PRE_OFFSET2 0x3dbc
635
635
#define VPP_WRAP_OSD3_MATRIX_EN_CTRL 0x3dbd
636
636
637
+
/* osd1 HDR */
638
+
#define OSD1_HDR2_CTRL 0x38a0
639
+
#define OSD1_HDR2_CTRL_VDIN0_HDR2_TOP_EN BIT(13)
640
+
#define OSD1_HDR2_CTRL_REG_ONLY_MAT BIT(16)
641
+
637
642
/* osd2 scaler */
638
643
#define OSD2_VSC_PHASE_STEP 0x3d00
639
644
#define OSD2_VSC_INI_PHASE 0x3d01
+6
-1
drivers/gpu/drm/meson/meson_viu.c
+6
-1
drivers/gpu/drm/meson/meson_viu.c
···
425
425
if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_GXM) ||
426
426
meson_vpu_is_compatible(priv, VPU_COMPATIBLE_GXL))
427
427
meson_viu_load_matrix(priv);
428
-
else if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A))
428
+
else if (meson_vpu_is_compatible(priv, VPU_COMPATIBLE_G12A)) {
429
429
meson_viu_set_g12a_osd1_matrix(priv, RGB709_to_YUV709l_coeff,
430
430
true);
431
+
/* fix green/pink color distortion from vendor u-boot */
432
+
writel_bits_relaxed(OSD1_HDR2_CTRL_REG_ONLY_MAT |
433
+
OSD1_HDR2_CTRL_VDIN0_HDR2_TOP_EN, 0,
434
+
priv->io_base + _REG(OSD1_HDR2_CTRL));
435
+
}
431
436
432
437
/* Initialize OSD1 fifo control register */
433
438
reg = VIU_OSD_DDR_PRIORITY_URGENT |