From 910ba4c0fa4a7f8ad76f7ff4801874f87cb1aabb Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 27 Jan 2014 09:14:09 -0600 Subject: [PATCH] i915: remove pm_qos request on error (rhbz 1057533) --- i915-remove-pm_qos-request-on-error.patch | 45 +++++++++++++++++++++++ kernel.spec | 7 ++++ 2 files changed, 52 insertions(+) create mode 100644 i915-remove-pm_qos-request-on-error.patch diff --git a/i915-remove-pm_qos-request-on-error.patch b/i915-remove-pm_qos-request-on-error.patch new file mode 100644 index 000000000..c3748d5bd --- /dev/null +++ b/i915-remove-pm_qos-request-on-error.patch @@ -0,0 +1,45 @@ +From 22accca01713b13dac386ca90b787aadf88f6551 Mon Sep 17 00:00:00 2001 +From: Stanislaw Gruszka +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: [] plist_add+0x5b/0xd0 +Call Trace: + [] pm_qos_update_target+0x125/0x1e0 + [] pm_qos_add_request+0x91/0x100 + [] 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 +Cc: stable@vger.kernel.org +Signed-off-by: Stanislaw Gruszka +[danvet: Drop unnecessary code movement.] +Signed-off-by: Daniel Vetter +--- +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 diff --git a/kernel.spec b/kernel.spec index cbabe75d3..0bb382bcb 100644 --- a/kernel.spec +++ b/kernel.spec @@ -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 - 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 - Minor ARM config updates