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

Commit 1b2cb026 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Lyude Paul
Browse files

drm/i915: Convert intel_hpd_irq_event() into an encoder hotplug hook 



Allow encoders to customize their hotplug processing by moving the
intel_hpd_irq_event() code into an encoder hotplug vfunc. Currently
only SDVO needs this to re-enable hotplug signalling in the SDVO
chip. We'll use this same hook for DP/HDMI link management later.

Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180117192149.17760-1-ville.syrjala@linux.intel.com
parent 470e7c61

drivers/gpu/drm/i915/intel_sdvo.c

+10 −2
Original line number Diff line number Diff line
@@ -1708,6 +1708,14 @@ static void intel_sdvo_enable_hotplug(struct intel_encoder *encoder) 
			     &intel_sdvo->hotplug_active, 2);

}



static bool intel_sdvo_hotplug(struct intel_encoder *encoder,

			       struct intel_connector *connector)

{

	intel_sdvo_enable_hotplug(encoder);



	return intel_encoder_hotplug(encoder, connector);

}



static bool

intel_sdvo_multifunc_encoder(struct intel_sdvo *intel_sdvo)

{
@@ -2516,7 +2524,7 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device) 
		 * Some SDVO devices have one-shot hotplug interrupts.

		 * Ensure that they get re-enabled when an interrupt happens.

		 */

		intel_encoder->hot_plug = intel_sdvo_enable_hotplug;

		intel_encoder->hotplug = intel_sdvo_hotplug;

		intel_sdvo_enable_hotplug(intel_encoder);

	} else {

		intel_connector->polled = DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_DISCONNECT;