|
@@ -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 intel_encoder *intel_encoder;
|
|
|
struct intel_sdvo *intel_sdvo;
|
|
|
- u32 hotplug_mask;
|
|
|
int i;
|
|
|
intel_sdvo = kzalloc(sizeof(struct intel_sdvo), GFP_KERNEL);
|
|
|
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
|
|
|
* hotplug lines.
|
|
|
*/
|