rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

i915: remove pm_qos request on error (rhbz 1057533)

This commit is contained in:
Justin M. Forbes 2014-01-27 09:14:09 -06:00
parent 221c35da49
commit 910ba4c0fa
2 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
i915-remove-pm_qos-request-on-error.patch Normal file
View File

@ -0,0 +1,45 @@
From 22accca01713b13dac386ca90b787aadf88f6551 Mon Sep 17 00:00:00 2001
From: Stanislaw Gruszka <sgruszka@redhat.com>
Date: Sat, 25 Jan 2014 09:13:37 +0000
Subject: i915: remove pm_qos request on error
Not removing pm qos request and free memory for it can cause crash,
when some other driver use pm qos. For example, this oops:
BUG: unable to handle kernel paging request at fffffffffffffff8
IP: [<ffffffff81307a6b>] plist_add+0x5b/0xd0
Call Trace:
[<ffffffff810acf25>] pm_qos_update_target+0x125/0x1e0
[<ffffffff810ad071>] pm_qos_add_request+0x91/0x100
[<ffffffffa053ec14>] e1000_open+0xe4/0x5b0 [e1000e]
was caused by earlier i915 probe failure:
[drm:i915_report_and_clear_eir] *ERROR* EIR stuck: 0x00000010, masking
[drm:init_ring_common] *ERROR* render ring initialization failed ctl 0001f001 head 00003004 tail 00000000 start 00003000
[drm:i915_driver_load] *ERROR* failed to init modeset
i915: probe of 0000:00:02.0 failed with error -5
Bug report:
http://bugzilla.redhat.com/show_bug.cgi?id=1057533
Reported-by: Giandomenico De Tullio <ghisha@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
[danvet: Drop unnecessary code movement.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index e177d02..15a74f9 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1685,6 +1685,7 @@ out_gem_unload:
intel_teardown_gmbus(dev);
intel_teardown_mchbar(dev);
+ pm_qos_remove_request(&dev_priv->pm_qos);
destroy_workqueue(dev_priv->wq);
out_mtrrfree:
arch_phys_wc_del(dev_priv->gtt.mtrr);
--
cgit v0.9.0.2-2-gbebe

7
kernel.spec
View File

@ -757,6 +757,9 @@ Patch25182: Input-ALPS-add-support-for-Dolphin-devices.patch
#rhbz 1056711
Patch25183: ipv6-introduce-IFA_F_NOPREFIXROUTE-and-IFA_F_MANAGETEMPADDR-flags.patch
#rhbz 1057533
Patch25184: i915-remove-pm_qos-request-on-error.patch
# END OF PATCH DEFINITIONS
%endif
@ -1469,6 +1472,9 @@ ApplyPatch Input-ALPS-add-support-for-Dolphin-devices.patch
#rhbz 1056711
ApplyPatch ipv6-introduce-IFA_F_NOPREFIXROUTE-and-IFA_F_MANAGETEMPADDR-flags.patch
#rhbz 1057533
ApplyPatch i915-remove-pm_qos-request-on-error.patch
# END OF PATCH APPLICATIONS
%endif
@ -2274,6 +2280,7 @@ fi
* Mon Jan 27 2014 Justin M. Forbes <jforbes@fedoraproject.org> - 3.12.9-300
- Backport new IPv6 address flag IFA_F_NOPREFIXROUTE and IFA_F_MANAGETEMPADDR (rhbz 1056711)
- Linux v3.12.9
- i915: remove pm_qos request on error (rhbz 1057533)
* Sun Jan 26 2014 Peter Robinson <pbrobinson@fedoraproject.org>
- Minor ARM config updates