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

Commit 97aaf910 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915/sdvo: Defer detection of output capabilities until probing 



Alex Fiestas reported an issue with his HDMI connector being misdetected
as DVI unless he had something connected upon boot. By moving the
decision as to whether to use HDMI or DVI encoding for the HDMI capable
output until we probe the monitor means that we should avoid sending a
HDMI signal to a DVI monitor and also correctly detect hardware like
Alex's.

However, to really determine what connector is soldered onto the wire we
need to inspect the VBT sdvo child devices - but can we trust it?

Reported-by: default avatarAlex Fiestas <alex@eyeos.org>
Tested-by: default avatarAlex Fiestas <alex@eyeos.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=32828


Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: stable@kernel.org
parent 3c5a62b5

drivers/gpu/drm/i915/intel_sdvo.c

+11 −22
Original line number Diff line number Diff line
@@ -1024,9 +1024,13 @@ static void intel_sdvo_mode_set(struct drm_encoder *encoder, 
	if (!intel_sdvo_set_target_input(intel_sdvo))

		return;



	if (intel_sdvo->has_hdmi_monitor &&

	    !intel_sdvo_set_avi_infoframe(intel_sdvo))

		return;

	if (intel_sdvo->has_hdmi_monitor) {

		intel_sdvo_set_encode(intel_sdvo, SDVO_ENCODE_HDMI);

		intel_sdvo_set_colorimetry(intel_sdvo,

					   SDVO_COLORIMETRY_RGB256);

		intel_sdvo_set_avi_infoframe(intel_sdvo);

	} else

		intel_sdvo_set_encode(intel_sdvo, SDVO_ENCODE_DVI);



	if (intel_sdvo->is_tv &&

	    !intel_sdvo_set_tv_format(intel_sdvo))
@@ -1398,6 +1402,9 @@ intel_sdvo_detect(struct drm_connector *connector, bool force) 


	intel_sdvo->attached_output = response;



	intel_sdvo->has_hdmi_monitor = false;

	intel_sdvo->has_hdmi_audio = false;



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

		ret = connector_status_disconnected;

	else if (response & SDVO_TMDS_MASK)
@@ -1922,20 +1929,7 @@ intel_sdvo_select_i2c_bus(struct drm_i915_private *dev_priv, 
static bool

intel_sdvo_is_hdmi_connector(struct intel_sdvo *intel_sdvo, int device)

{

	int is_hdmi;



	if (!intel_sdvo_check_supp_encode(intel_sdvo))

		return false;



	if (!intel_sdvo_set_target_output(intel_sdvo,

					  device == 0 ? SDVO_OUTPUT_TMDS0 : SDVO_OUTPUT_TMDS1))

		return false;



	is_hdmi = 0;

	if (!intel_sdvo_get_value(intel_sdvo, SDVO_CMD_GET_ENCODE, &is_hdmi, 1))

		return false;



	return !!is_hdmi;

	return intel_sdvo_check_supp_encode(intel_sdvo);

}



static u8
@@ -2037,12 +2031,7 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device) 
	connector->connector_type = DRM_MODE_CONNECTOR_DVID;



	if (intel_sdvo_is_hdmi_connector(intel_sdvo, device)) {

		/* enable hdmi encoding mode if supported */

		intel_sdvo_set_encode(intel_sdvo, SDVO_ENCODE_HDMI);

		intel_sdvo_set_colorimetry(intel_sdvo,

					   SDVO_COLORIMETRY_RGB256);

		connector->connector_type = DRM_MODE_CONNECTOR_HDMIA;



		intel_sdvo->is_hdmi = true;

	}

	intel_sdvo->base.clone_mask = ((1 << INTEL_SDVO_NON_TV_CLONE_BIT) |