diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-09-08 12:17:18 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-09-19 08:41:16 -0400 |
commit | a1e470d421f68d69bf35c1ed316a861625010eab (patch) | |
tree | f466013e657f6c8461273703f74c9babc4396cbf /drivers/gpu | |
parent | f0d3dad3ad618dbe4f65453c456c781c4568de29 (diff) |
drm/i915: Don't reinit hpd interrupts after gpu reset
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>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 3870c7359a16..055d5e7fbf12 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c | |||
@@ -871,8 +871,6 @@ int i915_reset(struct drm_device *dev) | |||
871 | */ | 871 | */ |
872 | if (INTEL_INFO(dev)->gen > 5) | 872 | if (INTEL_INFO(dev)->gen > 5) |
873 | intel_reset_gt_powersave(dev); | 873 | intel_reset_gt_powersave(dev); |
874 | |||
875 | intel_hpd_init(dev); | ||
876 | } else { | 874 | } else { |
877 | mutex_unlock(&dev->struct_mutex); | 875 | mutex_unlock(&dev->struct_mutex); |
878 | } | 876 | } |