Commit 1581b2df authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/edid: Add display_info.rgb_quant_range_selectable 



Move the CEA-861 QS bit handling entirely into the edid code. No
need to bother the drivers with this.

Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: "David (ChunMing) Zhou" <David1.Zhou@amd.com>
Cc: amd-gfx@lists.freedesktop.org
Cc: Eric Anholt <eric@anholt.net> (supporter:DRM DRIVERS FOR VC4)
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Acked-by: default avatarEric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20190108172828.15184-4-ville.syrjala@linux.intel.com
parent 8ee491b4

drivers/gpu/drm/drm_edid.c

+31 −39
Original line number Diff line number Diff line
@@ -3641,6 +3641,20 @@ static bool cea_db_is_hdmi_forum_vsdb(const u8 *db) 
	return oui == HDMI_FORUM_IEEE_OUI;

}



static bool cea_db_is_vcdb(const u8 *db)

{

	if (cea_db_tag(db) != USE_EXTENDED_TAG)

		return false;



	if (cea_db_payload_len(db) != 2)

		return false;



	if (cea_db_extended_tag(db) != EXT_VIDEO_CAPABILITY_BLOCK)

		return false;



	return true;

}



static bool cea_db_is_y420cmdb(const u8 *db)

{

	if (cea_db_tag(db) != USE_EXTENDED_TAG)
@@ -4223,41 +4237,6 @@ end: 
}

EXPORT_SYMBOL(drm_detect_monitor_audio);



/**

 * drm_rgb_quant_range_selectable - is RGB quantization range selectable?

 * @edid: EDID block to scan

 *

 * Check whether the monitor reports the RGB quantization range selection

 * as supported. The AVI infoframe can then be used to inform the monitor

 * which quantization range (full or limited) is used.

 *

 * Return: True if the RGB quantization range is selectable, false otherwise.

 */

bool drm_rgb_quant_range_selectable(struct edid *edid)

{

	u8 *edid_ext;

	int i, start, end;



	edid_ext = drm_find_cea_extension(edid);

	if (!edid_ext)

		return false;



	if (cea_db_offsets(edid_ext, &start, &end))

		return false;



	for_each_cea_db(edid_ext, i, start, end) {

		if (cea_db_tag(&edid_ext[i]) == USE_EXTENDED_TAG &&

		    cea_db_payload_len(&edid_ext[i]) == 2 &&

		    cea_db_extended_tag(&edid_ext[i]) ==

			EXT_VIDEO_CAPABILITY_BLOCK) {

			DRM_DEBUG_KMS("CEA VCDB 0x%02x\n", edid_ext[i + 2]);

			return edid_ext[i + 2] & EDID_CEA_VCDB_QS;

		}

	}



	return false;

}

EXPORT_SYMBOL(drm_rgb_quant_range_selectable);



/**

 * drm_default_rgb_quant_range - default RGB quantization range
@@ -4278,6 +4257,16 @@ drm_default_rgb_quant_range(const struct drm_display_mode *mode) 
}

EXPORT_SYMBOL(drm_default_rgb_quant_range);



static void drm_parse_vcdb(struct drm_connector *connector, const u8 *db)

{

	struct drm_display_info *info = &connector->display_info;



	DRM_DEBUG_KMS("CEA VCDB 0x%02x\n", db[2]);



	if (db[2] & EDID_CEA_VCDB_QS)

		info->rgb_quant_range_selectable = true;

}



static void drm_parse_ycbcr420_deep_color_info(struct drm_connector *connector,

					       const u8 *db)

{
@@ -4452,6 +4441,8 @@ static void drm_parse_cea_ext(struct drm_connector *connector, 
			drm_parse_hdmi_forum_vsdb(connector, db);

		if (cea_db_is_y420cmdb(db))

			drm_parse_y420cmdb_bitmap(connector, db);

		if (cea_db_is_vcdb(db))

			drm_parse_vcdb(connector, db);

	}

}
@@ -4472,6 +4463,7 @@ drm_reset_display_info(struct drm_connector *connector) 
	info->max_tmds_clock = 0;

	info->dvi_dual = false;

	info->has_hdmi_infoframe = false;

	info->rgb_quant_range_selectable = false;

	memset(&info->hdmi, 0, sizeof(info->hdmi));



	info->non_desktop = 0;
@@ -4939,15 +4931,15 @@ EXPORT_SYMBOL(drm_hdmi_avi_infoframe_from_display_mode); 
 * @connector: the connector

 * @mode: DRM display mode

 * @rgb_quant_range: RGB quantization range (Q)

 * @rgb_quant_range_selectable: Sink support selectable RGB quantization range (QS)

 */

void

drm_hdmi_avi_infoframe_quant_range(struct hdmi_avi_infoframe *frame,

				   struct drm_connector *connector,

				   const struct drm_display_mode *mode,

				   enum hdmi_quantization_range rgb_quant_range,

				   bool rgb_quant_range_selectable)

				   enum hdmi_quantization_range rgb_quant_range)

{

	const struct drm_display_info *info = &connector->display_info;



	/*

	 * CEA-861:

	 * "A Source shall not send a non-zero Q value that does not correspond
@@ -4958,7 +4950,7 @@ drm_hdmi_avi_infoframe_quant_range(struct hdmi_avi_infoframe *frame, 
	 * HDMI 2.0 recommends sending non-zero Q when it does match the

	 * default RGB quantization range for the mode, even when QS=0.

	 */

	if (rgb_quant_range_selectable ||

	if (info->rgb_quant_range_selectable ||

	    rgb_quant_range == drm_default_rgb_quant_range(mode))

		frame->quantization_range = rgb_quant_range;

	else

drivers/gpu/drm/i915/intel_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -1057,7 +1057,6 @@ struct intel_hdmi { 
	} dp_dual_mode;

	bool has_hdmi_sink;

	bool has_audio;

	bool rgb_quant_range_selectable;

	struct intel_connector *attached_connector;

	struct cec_notifier *cec_notifier;

};

drivers/gpu/drm/i915/intel_hdmi.c

+1 −7
Original line number Diff line number Diff line
@@ -462,7 +462,6 @@ static void intel_hdmi_set_avi_infoframe(struct intel_encoder *encoder, 
					 const struct intel_crtc_state *crtc_state,

					 const struct drm_connector_state *conn_state)

{

	struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base);

	const struct drm_display_mode *adjusted_mode =

		&crtc_state->base.adjusted_mode;

	union hdmi_infoframe frame;
@@ -488,8 +487,7 @@ static void intel_hdmi_set_avi_infoframe(struct intel_encoder *encoder, 
					   adjusted_mode,

					   crtc_state->limited_color_range ?

					   HDMI_QUANTIZATION_RANGE_LIMITED :

					   HDMI_QUANTIZATION_RANGE_FULL,

					   intel_hdmi->rgb_quant_range_selectable);

					   HDMI_QUANTIZATION_RANGE_FULL);



	drm_hdmi_avi_infoframe_content_type(&frame.avi,

					    conn_state);
@@ -1816,7 +1814,6 @@ intel_hdmi_unset_edid(struct drm_connector *connector) 


	intel_hdmi->has_hdmi_sink = false;

	intel_hdmi->has_audio = false;

	intel_hdmi->rgb_quant_range_selectable = false;



	intel_hdmi->dp_dual_mode.type = DRM_DP_DUAL_MODE_NONE;

	intel_hdmi->dp_dual_mode.max_tmds_clock = 0;
@@ -1900,9 +1897,6 @@ intel_hdmi_set_edid(struct drm_connector *connector) 


	to_intel_connector(connector)->detect_edid = edid;

	if (edid && edid->input & DRM_EDID_INPUT_DIGITAL) {

		intel_hdmi->rgb_quant_range_selectable =

			drm_rgb_quant_range_selectable(edid);



		intel_hdmi->has_audio = drm_detect_monitor_audio(edid);

		intel_hdmi->has_hdmi_sink = drm_detect_hdmi_monitor(edid);

drivers/gpu/drm/i915/intel_lspcon.c

+1 −2
Original line number Diff line number Diff line
@@ -492,8 +492,7 @@ void lspcon_set_infoframes(struct intel_encoder *encoder, 
					   adjusted_mode,

					   crtc_state->limited_color_range ?

					   HDMI_QUANTIZATION_RANGE_LIMITED :

					   HDMI_QUANTIZATION_RANGE_FULL,

					   false);

					   HDMI_QUANTIZATION_RANGE_FULL);



	ret = hdmi_infoframe_pack(&frame, buf, sizeof(buf));

	if (ret < 0) {

drivers/gpu/drm/i915/intel_sdvo.c

+1 −6
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ struct intel_sdvo { 


	bool has_hdmi_monitor;

	bool has_hdmi_audio;

	bool rgb_quant_range_selectable;



	/* DDC bus used by this SDVO encoder */

	uint8_t ddc_bus;
@@ -1004,8 +1003,7 @@ static bool intel_sdvo_set_avi_infoframe(struct intel_sdvo *intel_sdvo, 
					   adjusted_mode,

					   pipe_config->limited_color_range ?

					   HDMI_QUANTIZATION_RANGE_LIMITED :

					   HDMI_QUANTIZATION_RANGE_FULL,

					   intel_sdvo->rgb_quant_range_selectable);

					   HDMI_QUANTIZATION_RANGE_FULL);



	len = hdmi_infoframe_pack(&frame, sdvo_data, sizeof(sdvo_data));

	if (len < 0)
@@ -1805,8 +1803,6 @@ intel_sdvo_tmds_sink_detect(struct drm_connector *connector) 
			if (intel_sdvo_connector->is_hdmi) {

				intel_sdvo->has_hdmi_monitor = drm_detect_hdmi_monitor(edid);

				intel_sdvo->has_hdmi_audio = drm_detect_monitor_audio(edid);

				intel_sdvo->rgb_quant_range_selectable =

					drm_rgb_quant_range_selectable(edid);

			}

		} else

			status = connector_status_disconnected;
@@ -1855,7 +1851,6 @@ intel_sdvo_detect(struct drm_connector *connector, bool force) 


	intel_sdvo->has_hdmi_monitor = false;

	intel_sdvo->has_hdmi_audio = false;

	intel_sdvo->rgb_quant_range_selectable = false;



	if ((intel_sdvo_connector->output_flag & response) == 0)

		ret = connector_status_disconnected;

CRA Git | Maintained and supported by SUSTech CRA and CCSE