drm/i915: Don't reinit hpd interrupts after gpu reset
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 8 Sep 2014 16:17:18 +0000 (18:17 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 19 Sep 2014 12:41:16 +0000 (14:41 +0200)
Somehow I've overlooked this when simplifying the irq reinit
scheme on gen4.5+ in

commit 78ad455fd229c6f6cc2f390ccbe0d8f1a62d55a9
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Thu May 22 22:18:21 2014 +0200

    drm/i915: Improve irq handling after gpu resets

Since display interrups in general survive a gpu reset on those
platforms there's also no need to reinit the hotplug settings.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_drv.c

index 3870c7359a161c854ed90bcf4179e4fb051a70d4..055d5e7fbf12a14473c7b82f314630d1e5615b9c 100644 (file)
@@ -871,8 +871,6 @@ int i915_reset(struct drm_device *dev)
                 */
                if (INTEL_INFO(dev)->gen > 5)
                        intel_reset_gt_powersave(dev);
-
-               intel_hpd_init(dev);
        } else {
                mutex_unlock(&dev->struct_mutex);
        }