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

Commit 9f04003e authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915/sdvo: use config->has_hdmi_sink 



This way we can rely on the state cross-checker to have a bit
assurance that we'll get it right.

Reviewed-by: default avatarNaresh Kumar Kachhi <naresh.kumar.kachhi@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent b5a9fa09

drivers/gpu/drm/i915/intel_sdvo.c

+11 −3
Original line number Diff line number Diff line
@@ -1153,15 +1153,17 @@ static bool intel_sdvo_compute_config(struct intel_encoder *encoder, 
	pipe_config->pixel_multiplier =

		intel_sdvo_get_pixel_multiplier(adjusted_mode);



	pipe_config->has_hdmi_sink = intel_sdvo->has_hdmi_monitor;



	if (intel_sdvo->color_range_auto) {

		/* See CEA-861-E - 5.1 Default Encoding Parameters */

		/* FIXME: This bit is only valid when using TMDS encoding and 8

		 * bit per color mode. */

		if (intel_sdvo->has_hdmi_monitor &&

		if (pipe_config->has_hdmi_sink &&

		    drm_match_cea_mode(adjusted_mode) > 1)

			pipe_config->limited_color_range = true;

	} else {

		if (intel_sdvo->has_hdmi_monitor &&

		if (pipe_config->has_hdmi_sink &&

		    intel_sdvo->color_range == HDMI_COLOR_RANGE_16_235)

			pipe_config->limited_color_range = true;

	}
@@ -1222,7 +1224,7 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder) 
	if (!intel_sdvo_set_target_input(intel_sdvo))

		return;



	if (intel_sdvo->has_hdmi_monitor) {

	if (crtc->config.has_hdmi_sink) {

		intel_sdvo_set_encode(intel_sdvo, SDVO_ENCODE_HDMI);

		intel_sdvo_set_colorimetry(intel_sdvo,

					   SDVO_COLORIMETRY_RGB256);
@@ -1409,6 +1411,12 @@ static void intel_sdvo_get_config(struct intel_encoder *encoder, 
	if (sdvox & HDMI_COLOR_RANGE_16_235)

		pipe_config->limited_color_range = true;



	if (intel_sdvo_get_value(intel_sdvo, SDVO_CMD_GET_ENCODE,

				 &val, 1)) {

		if (val == SDVO_ENCODE_HDMI)

			pipe_config->has_hdmi_sink = true;

	}



	WARN(encoder_pixel_multiplier != pipe_config->pixel_multiplier,

	     "SDVO pixel multiplier mismatch, port: %i, encoder: %i\n",

	     pipe_config->pixel_multiplier, encoder_pixel_multiplier);