| From 8181e51dcbe56fc572c292e5e4aaed8a9aa4bdf3 Mon Sep 17 00:00:00 2001 |
| From: James Ausmus <james.ausmus@intel.com> |
| Date: Mon, 23 Sep 2013 16:53:57 -0700 |
| Subject: 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: Chris Wilson <chris@chris-wilson.co.uk> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit e596a02ccfc6503ae5c37b14c74b6b743eefe102) |
| |
| Conflicts: |
| drivers/gpu/drm/i915/intel_sdvo.c |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_sdvo.c | 13 ------------- |
| 1 file changed, 13 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c |
| index 1262fc4a1b34..5c53fc79977a 100644 |
| --- a/drivers/gpu/drm/i915/intel_sdvo.c |
| +++ b/drivers/gpu/drm/i915/intel_sdvo.c |
| @@ -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; |
| - } |
| - |
| intel_encoder->compute_config = intel_sdvo_compute_config; |
| intel_encoder->disable = intel_disable_sdvo; |
| intel_encoder->mode_set = intel_sdvo_mode_set; |
| -- |
| 1.8.5.rc3 |
| |
