]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
drm: lcdif: Switch to limited range for RGB to YUV conversion
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Fri, 30 Sep 2022 08:39:54 +0000 (11:39 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 31 Dec 2022 12:32:02 +0000 (13:32 +0100)
[ Upstream commit ec39dee8b25229a646271815cc86a8fc865525cf ]

Up to and including v1.3, HDMI supported limited quantization range only
for YCbCr. HDMI v1.4 introduced selectable quantization ranges, but this
feature isn't supported in the dw-hdmi driver that is used in
conjunction with the LCDIF in the i.MX8MP. The HDMI YCbCr output is thus
always advertised in the AVI infoframe as limited range.

The LCDIF driver, on the other hand, configures the CSC to produce full
range YCbCr. This mismatch results in loss of details and incorrect
colours. Fix it by switching to limited range YCbCr.

The coefficients are copied from drivers/media/platforms/nxp/imx-pxp.c
for coherency, as the hardware is most likely identical.

Fixes: 9db35bb349a0 ("drm: lcdif: Add support for i.MX8MP LCDIF variant")
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Marek Vasut <marex@denx.de>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Liu Ying <victor.liu@nxp.com>
Signed-off-by: Marek Vasut <marex@denx.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20220930083955.31580-4-laurent.pinchart@ideasonboard.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/mxsfb/lcdif_kms.c

index b1092aab142317a1da3eba22320ba79deb693eb2..9f212e29059b3c3ed46900df9461b6bc0a84caf1 100644 (file)
@@ -52,16 +52,22 @@ static void lcdif_set_formats(struct lcdif_drm_private *lcdif,
                writel(DISP_PARA_LINE_PATTERN_UYVY_H,
                       lcdif->base + LCDC_V8_DISP_PARA);
 
-               /* CSC: BT.601 Full Range RGB to YCbCr coefficients. */
-               writel(CSC0_COEF0_A2(0x096) | CSC0_COEF0_A1(0x04c),
+               /*
+                * CSC: BT.601 Limited Range RGB to YCbCr coefficients.
+                *
+                * |Y |   | 0.2568  0.5041  0.0979|   |R|   |16 |
+                * |Cb| = |-0.1482 -0.2910  0.4392| * |G| + |128|
+                * |Cr|   | 0.4392  0.4392 -0.3678|   |B|   |128|
+                */
+               writel(CSC0_COEF0_A2(0x081) | CSC0_COEF0_A1(0x041),
                       lcdif->base + LCDC_V8_CSC0_COEF0);
-               writel(CSC0_COEF1_B1(0x7d5) | CSC0_COEF1_A3(0x01d),
+               writel(CSC0_COEF1_B1(0x7db) | CSC0_COEF1_A3(0x019),
                       lcdif->base + LCDC_V8_CSC0_COEF1);
-               writel(CSC0_COEF2_B3(0x080) | CSC0_COEF2_B2(0x7ac),
+               writel(CSC0_COEF2_B3(0x070) | CSC0_COEF2_B2(0x7b6),
                       lcdif->base + LCDC_V8_CSC0_COEF2);
-               writel(CSC0_COEF3_C2(0x795) | CSC0_COEF3_C1(0x080),
+               writel(CSC0_COEF3_C2(0x7a2) | CSC0_COEF3_C1(0x070),
                       lcdif->base + LCDC_V8_CSC0_COEF3);
-               writel(CSC0_COEF4_D1(0x000) | CSC0_COEF4_C3(0x7ec),
+               writel(CSC0_COEF4_D1(0x010) | CSC0_COEF4_C3(0x7ee),
                       lcdif->base + LCDC_V8_CSC0_COEF4);
                writel(CSC0_COEF5_D3(0x080) | CSC0_COEF5_D2(0x080),
                       lcdif->base + LCDC_V8_CSC0_COEF5);