Skip to contentSkip to conversation

drm/i915: remove the IRQs enabled WARN from intel_disable_gt_powersave

PATCH In review Imre Deak 4 participants 5 messages Nov 20, 2014 – Nov 24, 2014

Subsystems (2)
lore
Share & tools
lore

Imre Deak

author
#0 lore raw

PATCH 1/1 drm/i915: remove the IRQs enabled WARN from intel_disable_gt_powersave

This function can be called now with i915 interrupts enabled, so the corresponding WARN is incorrect, remove it. I think this was spotted by Paulo during his review, but since I already removed the same WARN from intel_suspend_gt_powersave() I missed then his point.

---
 drivers/gpu/drm/i915/intel_pm.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/gpu/drm/i915/intel_pm.c +0 -3
index f103fff..e361014 100644
@@ -6223,9 +6223,6 @@ void intel_disable_gt_powersave(struct drm_device *dev)
 {
 	struct drm_i915_private *dev_priv = dev->dev_private;
 
-	/* Interrupts should be disabled already to avoid re-arming. */
-	WARN_ON(intel_irqs_enabled(dev_priv));
-
 	if (IS_IRONLAKE_M(dev)) {
 		ironlake_disable_drps(dev);
 		ironlake_disable_rc6(dev);
Signature · 6 lines
1.8.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw
Quoted 7 lines · Imre Deak

This function can be called now with i915 interrupts enabled, so the corresponding WARN is incorrect, remove it. I think this was spotted by Paulo during his review, but since I already removed the same WARN from intel_suspend_gt_powersave() I missed then his point.

I think I've just noticed that in the module reload test too. Queued for -next, thanks for the patch.
-Daniel

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tested-by on v1 1/1
#2 lore raw

Re: [PATCH] drm/i915: remove the IRQs enabled WARN from

In reply to Imre Deak

-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 367/367 367/367
ILK -5 373/375 368/375
SNB 450/450 450/450
IVB -1 502/503 501/503
BYT 289/289 289/289
HSW -3 567/567 564/567
BDW 417/417 417/417
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied

ILK  igt_kms_flip_absolute-wf_vblank      DMESG_WARN(1, M26)PASS(2, M37)      DMESG_WARN(1, M26)
ILK  igt_kms_flip_plain-flip      DMESG_WARN(1, M26)PASS(1, M37)      DMESG_WARN(1, M26)
ILK  igt_kms_flip_wf_vblank-ts-check      PASS(2, M37M26)      DMESG_WARN(1, M26)
ILK  igt_kms_flip_wf_vblank-ts-check-interruptible      PASS(2, M37M26)      DMESG_WARN(1, M26)
ILK  igt_kms_flip_wf_vblank-vs-modeset-interruptible      PASS(2, M37M26)      DMESG_WARN(1, M26)
IVB  igt_gem_bad_reloc_negative-reloc-lut      NSPT(2, M21M34)PASS(1, M21)      NSPT(2, M21)
HSW  igt_gem_bad_reloc_negative-reloc-lut      NSPT(1, M40)PASS(1, M20)      NSPT(2, M20)
HSW  igt_kms_rotation_crc_primary-rotation      PASS(2, M20M40)      DMESG_WARN(1, M20)PASS(1, M20)
HSW  igt_pm_rc6_residency_rc6-accuracy      PASS(2, M20M40)      FAIL(1, M20)PASS(1, M20)

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

Re: [PATCH] drm/i915: remove the IRQs enabled WARN from

Hi He Shuang,

I've just noticed that PRTS occasionally drops the end of the subject when replying on intel-gfx, like here. Unfortunately this breaks threading in some mail clients like gmail. Do we already have a JIRA for this or should I make one?

Thanks, Daniel

Quoted 25 lines · On Sat, Nov 22, 2014 at 06:13:26AM -0800, [email protected] wrote:

-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 367/367 367/367
ILK -5 373/375 368/375
SNB 450/450 450/450
IVB -1 502/503 501/503
BYT 289/289 289/289
HSW -3 567/567 564/567
BDW 417/417 417/417
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied

ILK  igt_kms_flip_absolute-wf_vblank      DMESG_WARN(1, M26)PASS(2, M37)      DMESG_WARN(1, M26)
ILK  igt_kms_flip_plain-flip      DMESG_WARN(1, M26)PASS(1, M37)      DMESG_WARN(1, M26)
ILK  igt_kms_flip_wf_vblank-ts-check      PASS(2, M37M26)      DMESG_WARN(1, M26)
ILK  igt_kms_flip_wf_vblank-ts-check-interruptible      PASS(2, M37M26)      DMESG_WARN(1, M26)
ILK  igt_kms_flip_wf_vblank-vs-modeset-interruptible      PASS(2, M37M26)      DMESG_WARN(1, M26)
IVB  igt_gem_bad_reloc_negative-reloc-lut      NSPT(2, M21M34)PASS(1, M21)      NSPT(2, M21)
HSW  igt_gem_bad_reloc_negative-reloc-lut      NSPT(1, M40)PASS(1, M20)      NSPT(2, M20)
HSW  igt_kms_rotation_crc_primary-rotation      PASS(2, M20M40)      DMESG_WARN(1, M20)PASS(1, M20)
HSW  igt_pm_rc6_residency_rc6-accuracy      PASS(2, M20M40)      FAIL(1, M20)PASS(1, M20)

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
maintainer
#4 lore raw

Re: [PATCH] drm/i915: remove the IRQs enabled WARN from

Quoted 4 lines · Daniel Vetter

I've just noticed that PRTS occasionally drops the end of the subject when replying on intel-gfx, like here. Unfortunately this breaks threading in some mail clients like gmail. Do we already have a JIRA for this or should I make one?

Seems like PRTS does not do proper header unfolding for headers folded to multiple lines.

BR,
Jani.

Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx