Skip to contentSkip to conversation

drm/i915: Don't reinit hpd interrupts after gpu reset

PATCH Applied Daniel Vetter 3 participants 3 messages Sep 8, 2014 – Sep 9, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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 <[email protected]>
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ä <[email protected]>
---
 drivers/gpu/drm/i915/i915_drv.c | 2 --
 1 file changed, 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +0 -2
index 8ff375538b5d..70cc38924040 100644
@@ -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);
 	}
Signature · 6 lines
2.0.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Daniel Vetter

Somehow I've overlooked this when simplifying the irq reinit scheme on gen4.5+ in

commit 78ad455fd229c6f6cc2f390ccbe0d8f1a62d55a9

Author: Daniel Vetter <[email protected]>
Date:   Thu May 22 22:18:21 2014 +0200
Quoted 7 lines

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ä <[email protected]>

This matches my observations on actual hardware. IIRC I looked at the reset vs. interrupt registers at least on ILK and IVB and the registers retained their current values on both.

Quoted 19 lines
---
 drivers/gpu/drm/i915/i915_drv.c | 2 --
 1 file changed, 2 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +0 -2
index 8ff375538b5d..70cc38924040 100644
@@ -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);
 	}
Signature · 1 line
2.0.1
Signature · 2 lines
Ville Syrjälä
Intel OTC
#2 lore raw
Quoted 13 lines · Ville Syrjälä
Quoted 12 lines · Daniel Vetter

Somehow I've overlooked this when simplifying the irq reinit scheme on gen4.5+ in

commit 78ad455fd229c6f6cc2f390ccbe0d8f1a62d55a9

Author: Daniel Vetter <[email protected]>
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.

Quoted 8 lines
Quoted 2 lines
Cc Ville Syrjälä <[email protected]>

This matches my observations on actual hardware. IIRC I looked at the reset vs. interrupt registers at least on ILK and IVB and the registers retained their current values on both.

Queued for -next, thanks for the patch.
-Daniel

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch