lkml.org 
[lkml]   [2020]   [Apr]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 052/148] drm/bridge: dw-hdmi: fix AVI frame colorimetry
    Date
    From: Jernej Skrabec <jernej.skrabec@siol.net>

    commit e8dca30f7118461d47e1c3510d0e31b277439151 upstream.

    CTA-861-F explicitly states that for RGB colorspace colorimetry should
    be set to "none". Fix that.

    Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    Fixes: def23aa7e982 ("drm: bridge: dw-hdmi: Switch to V4L bus format and encodings")
    Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
    Link: https://patchwork.freedesktop.org/patch/msgid/20200304232512.51616-2-jernej.skrabec@siol.net
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 46 ++++++++++++++++--------------
    1 file changed, 26 insertions(+), 20 deletions(-)

    --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
    +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
    @@ -1348,28 +1348,34 @@ static void hdmi_config_AVI(struct dw_hd
    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;

    \
     
     \ /
      Last update: 2020-04-01 18:42    [W:3.287 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site