diff --git a/projects/Allwinner/patches/linux/0001-backport-from-5.6.patch b/projects/Allwinner/patches/linux/0001-backport-from-5.6.patch index 4bf09fe522..ef5f45e946 100644 --- a/projects/Allwinner/patches/linux/0001-backport-from-5.6.patch +++ b/projects/Allwinner/patches/linux/0001-backport-from-5.6.patch @@ -1900,83 +1900,6 @@ index c17d30e74bb1..ce497d0197df 100644 -- 2.24.1 -From ad659ce8a20e12b2508c977818e8c21487f67793 Mon Sep 17 00:00:00 2001 -From: Jernej Skrabec -Date: Sat, 29 Feb 2020 09:49:49 +0100 -Subject: [PATCH v2 1/4] drm/bridge: dw-hdmi: fix AVI frame colorimetry - -CTA-861-F explicitly states that for RGB colorspace colorimetry should -be set to "none". Fix that. - -Acked-by: Laurent Pinchart -Fixes: def23aa7e982 ("drm: bridge: dw-hdmi: Switch to V4L bus format and encodings") -Signed-off-by: Jernej Skrabec ---- - drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 46 +++++++++++++---------- - 1 file changed, 26 insertions(+), 20 deletions(-) - -diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c -index 67fca439bbfb..24965e53d351 100644 ---- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c -+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c -@@ -1624,28 +1624,34 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, struct drm_display_mode *mode) - frame.colorspace = HDMI_COLORSPACE_RGB; - - /* Set up colorimetry */ -- switch (hdmi->hdmi_data.enc_out_encoding) { -- case V4L2_YCBCR_ENC_601: -- if (hdmi->hdmi_data.enc_in_encoding == V4L2_YCBCR_ENC_XV601) -- frame.colorimetry = HDMI_COLORIMETRY_EXTENDED; -- else -+ if (!hdmi_bus_fmt_is_rgb(hdmi->hdmi_data.enc_out_bus_format)) { -+ switch (hdmi->hdmi_data.enc_out_encoding) { -+ case V4L2_YCBCR_ENC_601: -+ if (hdmi->hdmi_data.enc_in_encoding == V4L2_YCBCR_ENC_XV601) -+ frame.colorimetry = HDMI_COLORIMETRY_EXTENDED; -+ else -+ frame.colorimetry = HDMI_COLORIMETRY_ITU_601; -+ frame.extended_colorimetry = -+ HDMI_EXTENDED_COLORIMETRY_XV_YCC_601; -+ break; -+ case V4L2_YCBCR_ENC_709: -+ if (hdmi->hdmi_data.enc_in_encoding == V4L2_YCBCR_ENC_XV709) -+ frame.colorimetry = HDMI_COLORIMETRY_EXTENDED; -+ else -+ frame.colorimetry = HDMI_COLORIMETRY_ITU_709; -+ frame.extended_colorimetry = -+ HDMI_EXTENDED_COLORIMETRY_XV_YCC_709; -+ break; -+ default: /* Carries no data */ - frame.colorimetry = HDMI_COLORIMETRY_ITU_601; -+ frame.extended_colorimetry = -+ HDMI_EXTENDED_COLORIMETRY_XV_YCC_601; -+ break; -+ } -+ } else { -+ frame.colorimetry = HDMI_COLORIMETRY_NONE; - frame.extended_colorimetry = -- HDMI_EXTENDED_COLORIMETRY_XV_YCC_601; -- break; -- case V4L2_YCBCR_ENC_709: -- if (hdmi->hdmi_data.enc_in_encoding == V4L2_YCBCR_ENC_XV709) -- frame.colorimetry = HDMI_COLORIMETRY_EXTENDED; -- else -- frame.colorimetry = HDMI_COLORIMETRY_ITU_709; -- frame.extended_colorimetry = -- HDMI_EXTENDED_COLORIMETRY_XV_YCC_709; -- break; -- default: /* Carries no data */ -- frame.colorimetry = HDMI_COLORIMETRY_ITU_601; -- frame.extended_colorimetry = -- HDMI_EXTENDED_COLORIMETRY_XV_YCC_601; -- break; -+ HDMI_EXTENDED_COLORIMETRY_XV_YCC_601; - } - - frame.scan_mode = HDMI_SCAN_MODE_NONE; --- -2.25.1 - From 9ad42557109a9db9ca16964352c3c045a775b018 Mon Sep 17 00:00:00 2001 From: Ondrej Jirman Date: Thu, 19 Dec 2019 09:28:21 -0800