Attachment 855421 Details for Bug 1057533 – i915-remove-pm-qos-on-error.patch

i915-remove-pm-qos-on-error.patch

i915-remove-pm-qos-on-error.patch (text/plain), 1.66 KB, created by Stanislaw Gruszka on 2014-01-25 16:21:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stanislaw Gruszka

Created: 2014-01-25 16:21:39 UTC

Size: 1.66 KB

patch

obsolete

>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

Actions: View

Attachments on bug 1057533: 854869 | 855221 | 855323 | 855421