Linux v3.12.11
This commit is contained in:
Justin M. Forbes
parent
f9e0ff0ada
commit
ae8c1997c9
|
|
@ -1,48 +0,0 @@
|
|||
Bugzilla: 1057533
|
||||
Upstream-status: Submitted for 3.14 and CC'd to stable
|
||||
|
||||
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
|
||||
|
|
@ -74,7 +74,7 @@ Summary: The Linux kernel
|
|||
%if 0%{?released_kernel}
|
||||
|
||||
# Do we have a -stable update to apply?
|
||||
%define stable_update 10
|
||||
%define stable_update 11
|
||||
# Is it a -stable RC?
|
||||
%define stable_rc 0
|
||||
# Set rpm version accordingly
|
||||
|
|
@ -761,7 +761,6 @@ Patch25182: Input-ALPS-add-support-for-Dolphin-devices.patch
|
|||
Patch25183: ipv6-introduce-IFA_F_NOPREFIXROUTE-and-IFA_F_MANAGETEMPADDR-flags.patch
|
||||
|
||||
#rhbz 1057533
|
||||
Patch25184: i915-remove-pm_qos-request-on-error.patch
|
||||
Patch25155: ipv6-addrconf-revert-if_inet6ifa_flag-format.patch
|
||||
|
||||
#rhbz 990955
|
||||
|
|
@ -1482,9 +1481,6 @@ ApplyPatch Input-ALPS-add-support-for-Dolphin-devices.patch
|
|||
ApplyPatch ipv6-introduce-IFA_F_NOPREFIXROUTE-and-IFA_F_MANAGETEMPADDR-flags.patch
|
||||
ApplyPatch ipv6-addrconf-revert-if_inet6ifa_flag-format.patch
|
||||
|
||||
#rhbz 1057533
|
||||
ApplyPatch i915-remove-pm_qos-request-on-error.patch
|
||||
|
||||
#rhbz 990955
|
||||
ApplyPatch ath9k_htc-make-sta_rc_update-atomic-for-most-calls.patch
|
||||
|
||||
|
|
@ -2316,6 +2312,9 @@ fi
|
|||
# and build.
|
||||
|
||||
%changelog
|
||||
* Thu Feb 13 2014 Justin M. Forbes <jforbes@fedoraproject.org> - 3.12.11-200
|
||||
- Linux v3.12.11
|
||||
|
||||
* Wed Feb 12 2014 Josh Boyer <jwboyer@fedoraproject.org>
|
||||
- Add patch to fix list corruption from pinctrl (rhbz 1051918)
|
||||
- Fix cgroup destroy oops (rhbz 1045755)
|
||||
|
|
|
|||
Loading…
Reference in New Issue