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

Commit f3269058 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915/crt: Force the initial probe after reset 



Upon resume, like after a cold boot, we need to forcibly probe the
analog connector and cannot rely on the hotplug status.

Based on a patch by Takashi Iwai.

Reported-by: default avatarStefan Dirsch <sndirsch@suse.de>
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=26952


Tested-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 500f7147

drivers/gpu/drm/i915/intel_crt.c

+10 −0
Original line number Diff line number Diff line
@@ -535,6 +535,15 @@ static int intel_crt_set_property(struct drm_connector *connector, 
	return 0;

}



static void intel_crt_reset(struct drm_connector *connector)

{

	struct drm_device *dev = connector->dev;

	struct intel_crt *crt = intel_attached_crt(connector);



	if (HAS_PCH_SPLIT(dev))

		crt->force_hotplug_required = 1;

}



/*

 * Routines for controlling stuff on the analog port

 */
@@ -548,6 +557,7 @@ static const struct drm_encoder_helper_funcs intel_crt_helper_funcs = { 
};



static const struct drm_connector_funcs intel_crt_connector_funcs = {

	.reset = intel_crt_reset,

	.dpms = drm_helper_connector_dpms,

	.detect = intel_crt_detect,

	.fill_modes = drm_helper_probe_single_connector_modes,