Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21213fb6 authored by Jernej Skrabec's avatar Jernej Skrabec Committed by Greg Kroah-Hartman
Browse files

drm/bridge: dw-hdmi: fix AVI frame colorimetry 



commit e8dca30f7118461d47e1c3510d0e31b277439151 upstream.

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

Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Fixes: def23aa7 ("drm: bridge: dw-hdmi: Switch to V4L bus format and encodings")
Signed-off-by: default avatarJernej Skrabec <jernej.skrabec@siol.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20200304232512.51616-2-jernej.skrabec@siol.net


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d59848ca

drivers/gpu/drm/bridge/synopsys/dw-hdmi.c

+26 −20
Original line number Diff line number Diff line
@@ -1364,6 +1364,7 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, struct drm_display_mode *mode) 
		frame.colorspace = HDMI_COLORSPACE_RGB;



	/* Set up colorimetry */

	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)
@@ -1387,6 +1388,11 @@ static void hdmi_config_AVI(struct dw_hdmi *hdmi, struct drm_display_mode *mode) 
					HDMI_EXTENDED_COLORIMETRY_XV_YCC_601;

			break;

		}

	} else {

		frame.colorimetry = HDMI_COLORIMETRY_NONE;

		frame.extended_colorimetry =

			HDMI_EXTENDED_COLORIMETRY_XV_YCC_601;

	}



	frame.scan_mode = HDMI_SCAN_MODE_NONE;