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

Commit 4f770a5b authored by Egbert Eich's avatar Egbert Eich Committed by Daniel Vetter
Browse files

DRM/i915: Get rid if the 'hotplug_supported_mask' in struct drm_i915_private. 



Now since we have replaced the bits to show interest in hotplug IRQs
we can go and nuke the 'hotplug_supported_mask'.

Signed-off-by: default avatarEgbert Eich <eich@suse.de>
Acked-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent bac56d5b

drivers/gpu/drm/i915/i915_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -922,7 +922,6 @@ typedef struct drm_i915_private { 
	u32 irq_mask;

	u32 gt_irq_mask;



	u32 hotplug_supported_mask;

	struct work_struct hotplug_work;

	bool enable_hotplug_processing;

drivers/gpu/drm/i915/intel_crt.c

+0 −2
Original line number Diff line number Diff line
@@ -799,8 +799,6 @@ void intel_crt_init(struct drm_device *dev) 
	 */

	crt->force_hotplug_required = 0;



	dev_priv->hotplug_supported_mask |= CRT_HOTPLUG_INT_STATUS;



	/*

	 * TODO: find a proper way to discover whether we need to set the the

	 * polarity and link reversal bits or not, instead of relying on the

drivers/gpu/drm/i915/intel_dp.c

+0 −3
Original line number Diff line number Diff line
@@ -2825,17 +2825,14 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, 
		name = "DPDDC-A";

		break;

	case PORT_B:

		dev_priv->hotplug_supported_mask |= PORTB_HOTPLUG_INT_STATUS;

		intel_encoder->hpd_pin = HPD_PORT_B;

		name = "DPDDC-B";

		break;

	case PORT_C:

		dev_priv->hotplug_supported_mask |= PORTC_HOTPLUG_INT_STATUS;

		intel_encoder->hpd_pin = HPD_PORT_C;

		name = "DPDDC-C";

		break;

	case PORT_D:

		dev_priv->hotplug_supported_mask |= PORTD_HOTPLUG_INT_STATUS;

		intel_encoder->hpd_pin = HPD_PORT_D;

		name = "DPDDC-D";

		break;

drivers/gpu/drm/i915/intel_hdmi.c

+0 −3
Original line number Diff line number Diff line
@@ -989,17 +989,14 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, 
	case PORT_B:

		intel_hdmi->ddc_bus = GMBUS_PORT_DPB;

		intel_encoder->hpd_pin = HPD_PORT_B;

		dev_priv->hotplug_supported_mask |= PORTB_HOTPLUG_INT_STATUS;

		break;

	case PORT_C:

		intel_hdmi->ddc_bus = GMBUS_PORT_DPC;

		intel_encoder->hpd_pin = HPD_PORT_C;

		dev_priv->hotplug_supported_mask |= PORTC_HOTPLUG_INT_STATUS;

		break;

	case PORT_D:

		intel_hdmi->ddc_bus = GMBUS_PORT_DPD;

		intel_encoder->hpd_pin = HPD_PORT_D;

		dev_priv->hotplug_supported_mask |= PORTD_HOTPLUG_INT_STATUS;

		break;

	case PORT_A:

		intel_encoder->hpd_pin = HPD_PORT_A;

drivers/gpu/drm/i915/intel_sdvo.c

+3 −6
Original line number Diff line number Diff line
@@ -2779,6 +2779,9 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob) 
			SDVOB_HOTPLUG_INT_STATUS_I915 : SDVOC_HOTPLUG_INT_STATUS_I915;

	}



	/* Only enable the hotplug irq if we need it, to work around noisy

	 * hotplug lines.

	 */

	if (intel_sdvo->hotplug_active)

		intel_encoder->hpd_pin = HPD_SDVO_B ? HPD_SDVO_B : HPD_SDVO_C;
@@ -2810,12 +2813,6 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob) 
	 */

	intel_sdvo->base.cloneable = false;



	/* Only enable the hotplug irq if we need it, to work around noisy

	 * hotplug lines.

	 */

	if (intel_sdvo->hotplug_active)

		dev_priv->hotplug_supported_mask |= hotplug_mask;



	intel_sdvo_select_ddc_bus(dev_priv, intel_sdvo, sdvo_reg);



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