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

Commit d6671620 authored by Jani Nikula's avatar Jani Nikula Committed by Daniel Vetter
Browse files

drm/i915: remove useless DP and DDI encoder ->hot_plug hooks 



The hotplug callbacks for DP and DDI effectively did nothing. Remove
them.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 5fcece80

drivers/gpu/drm/i915/intel_ddi.c

+0 −15
Original line number Diff line number Diff line
@@ -2618,20 +2618,6 @@ void intel_ddi_fdi_disable(struct drm_crtc *crtc) 
	I915_WRITE(_FDI_RXA_CTL, val);

}



static void intel_ddi_hot_plug(struct intel_encoder *intel_encoder)

{

	struct intel_digital_port *intel_dig_port = enc_to_dig_port(&intel_encoder->base);

	int type = intel_dig_port->base.type;



	if (type != INTEL_OUTPUT_DISPLAYPORT &&

	    type != INTEL_OUTPUT_EDP &&

	    type != INTEL_OUTPUT_UNKNOWN) {

		return;

	}



	intel_dp_hot_plug(intel_encoder);

}



void intel_ddi_get_config(struct intel_encoder *encoder,

			  struct intel_crtc_state *pipe_config)

{
@@ -2825,7 +2811,6 @@ void intel_ddi_init(struct drm_device *dev, enum port port) 
	intel_encoder->type = INTEL_OUTPUT_UNKNOWN;

	intel_encoder->crtc_mask = (1 << 0) | (1 << 1) | (1 << 2);

	intel_encoder->cloneable = 0;

	intel_encoder->hot_plug = intel_ddi_hot_plug;



	if (init_dp) {

		if (!intel_ddi_init_dp_connector(intel_dig_port))

drivers/gpu/drm/i915/intel_dp.c

+0 −7
Original line number Diff line number Diff line
@@ -4920,12 +4920,6 @@ static const struct drm_encoder_funcs intel_dp_enc_funcs = { 
	.destroy = intel_dp_encoder_destroy,

};



void

intel_dp_hot_plug(struct intel_encoder *intel_encoder)

{

	return;

}



enum irqreturn

intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd)

{
@@ -5937,7 +5931,6 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port) 
		intel_encoder->crtc_mask = (1 << 0) | (1 << 1) | (1 << 2);

	}

	intel_encoder->cloneable = 0;

	intel_encoder->hot_plug = intel_dp_hot_plug;



	intel_dig_port->hpd_pulse = intel_dp_hpd_pulse;

	dev_priv->hotplug.irq_port[port] = intel_dig_port;