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

Commit a24bf3c3 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Greg Kroah-Hartman
Browse files

drm/i915/sdvo: Setup DDC fully before output init 

commit e79762512120f11c51317570519a1553c70805d8 upstream.

Call intel_sdvo_select_ddc_bus() before initializing any
of the outputs. And before that is functional (assuming no VBT)
we have to set up the controlled_outputs thing. Otherwise DDC
won't be functional during the output init but LVDS really
needs it for the fixed mode setup.

Note that the whole multi output support still looks very
bogus, and more work will be needed to make it correct.
But for now this should at least fix the LVDS EDID fixed mode
setup.

Cc: stable@vger.kernel.org
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/7301


Fixes: aa2b8807 ("drm/i915/sdvo: Fix multi function encoder stuff")
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221026101134.20865-3-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
(cherry picked from commit 64b7b557dc8a96d9cfed6aedbf81de2df80c025d)
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4dadd4b1

drivers/gpu/drm/i915/display/intel_sdvo.c

+12 −19
Original line number Diff line number Diff line
@@ -2693,13 +2693,10 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device) 
	if (!intel_sdvo_connector)

		return false;



	if (device == 0) {

		intel_sdvo->controlled_output |= SDVO_OUTPUT_TMDS0;

	if (device == 0)

		intel_sdvo_connector->output_flag = SDVO_OUTPUT_TMDS0;

	} else if (device == 1) {

		intel_sdvo->controlled_output |= SDVO_OUTPUT_TMDS1;

	else if (device == 1)

		intel_sdvo_connector->output_flag = SDVO_OUTPUT_TMDS1;

	}



	intel_connector = &intel_sdvo_connector->base;

	connector = &intel_connector->base;
@@ -2753,7 +2750,6 @@ intel_sdvo_tv_init(struct intel_sdvo *intel_sdvo, int type) 
	encoder->encoder_type = DRM_MODE_ENCODER_TVDAC;

	connector->connector_type = DRM_MODE_CONNECTOR_SVIDEO;



	intel_sdvo->controlled_output |= type;

	intel_sdvo_connector->output_flag = type;



	if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) {
@@ -2794,13 +2790,10 @@ intel_sdvo_analog_init(struct intel_sdvo *intel_sdvo, int device) 
	encoder->encoder_type = DRM_MODE_ENCODER_DAC;

	connector->connector_type = DRM_MODE_CONNECTOR_VGA;



	if (device == 0) {

		intel_sdvo->controlled_output |= SDVO_OUTPUT_RGB0;

	if (device == 0)

		intel_sdvo_connector->output_flag = SDVO_OUTPUT_RGB0;

	} else if (device == 1) {

		intel_sdvo->controlled_output |= SDVO_OUTPUT_RGB1;

	else if (device == 1)

		intel_sdvo_connector->output_flag = SDVO_OUTPUT_RGB1;

	}



	if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) {

		kfree(intel_sdvo_connector);
@@ -2830,13 +2823,10 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device) 
	encoder->encoder_type = DRM_MODE_ENCODER_LVDS;

	connector->connector_type = DRM_MODE_CONNECTOR_LVDS;



	if (device == 0) {

		intel_sdvo->controlled_output |= SDVO_OUTPUT_LVDS0;

	if (device == 0)

		intel_sdvo_connector->output_flag = SDVO_OUTPUT_LVDS0;

	} else if (device == 1) {

		intel_sdvo->controlled_output |= SDVO_OUTPUT_LVDS1;

	else if (device == 1)

		intel_sdvo_connector->output_flag = SDVO_OUTPUT_LVDS1;

	}



	if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) {

		kfree(intel_sdvo_connector);
@@ -2889,8 +2879,14 @@ static u16 intel_sdvo_filter_output_flags(u16 flags) 
static bool

intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags)

{

	struct drm_i915_private *i915 = to_i915(intel_sdvo->base.base.dev);



	flags = intel_sdvo_filter_output_flags(flags);



	intel_sdvo->controlled_output = flags;



	intel_sdvo_select_ddc_bus(i915, intel_sdvo);



	if (flags & SDVO_OUTPUT_TMDS0)

		if (!intel_sdvo_dvi_init(intel_sdvo, 0))

			return false;
@@ -2931,7 +2927,6 @@ intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags) 
	if (flags == 0) {

		unsigned char bytes[2];



		intel_sdvo->controlled_output = 0;

		memcpy(bytes, &intel_sdvo->caps.output_flags, 2);

		DRM_DEBUG_KMS("%s: Unknown SDVO output type (0x%02x%02x)\n",

			      SDVO_NAME(intel_sdvo),
@@ -3338,8 +3333,6 @@ bool intel_sdvo_init(struct drm_i915_private *dev_priv, 
	 */

	intel_sdvo->base.cloneable = 0;



	intel_sdvo_select_ddc_bus(dev_priv, intel_sdvo);



	/* Set the input timing to the screen. Assume always input 0. */

	if (!intel_sdvo_set_target_input(intel_sdvo))

		goto err_output;