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

Commit e596a02c authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm/i915: Remove dead code from SDVO initialisation 



The hotplug_mask is no longer used as the hpd interrupt setup is now
handled in the core.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 22e407d7

drivers/gpu/drm/i915/intel_sdvo.c

+0 −13
Original line number Original line Diff line number Diff line
@@ -2850,7 +2850,6 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob) 
	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_encoder *intel_encoder;

	struct intel_encoder *intel_encoder;

	struct intel_sdvo *intel_sdvo;

	struct intel_sdvo *intel_sdvo;

	u32 hotplug_mask;

	int i;

	int i;

	intel_sdvo = kzalloc(sizeof(struct intel_sdvo), GFP_KERNEL);

	intel_sdvo = kzalloc(sizeof(struct intel_sdvo), GFP_KERNEL);

	if (!intel_sdvo)

	if (!intel_sdvo)
@@ -2879,18 +2878,6 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob) 
		}

		}

	}

	}





	hotplug_mask = 0;

	if (IS_G4X(dev)) {

		hotplug_mask = intel_sdvo->is_sdvob ?

			SDVOB_HOTPLUG_INT_STATUS_G4X : SDVOC_HOTPLUG_INT_STATUS_G4X;

	} else if (IS_GEN4(dev)) {

		hotplug_mask = intel_sdvo->is_sdvob ?

			SDVOB_HOTPLUG_INT_STATUS_I965 : SDVOC_HOTPLUG_INT_STATUS_I965;

	} else {

		hotplug_mask = intel_sdvo->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

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

	 * hotplug lines.

	 * hotplug lines.

	 */

	 */