Attachment 84069 Details for Bug 67813 – Fix for the bug

[patch] Fix for the bug

0001-drm-i915-enable-the-power-well-before-module-unload.patch (text/plain), 1.76 KB, created by Paulo Zanoni on 2013-08-14 17:33:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paulo Zanoni

Created: 2013-08-14 17:33:50 UTC

Size: 1.76 KB

patch

obsolete

>From 48369df193124943b10d95e371de8e0e163b388b Mon Sep 17 00:00:00 2001
>From: Paulo Zanoni <paulo.r.zanoni@intel.com>
>Date: Wed, 14 Aug 2013 14:06:28 -0300
>Subject: [PATCH] drm/i915: enable the power well before module unload
>
>Our driver initialization doesn't seem to be ready to load when the
>power well is disabled: we hit a few "Unclaimed register" messages. So
>do just like we already do for the suspend/resume path: enable the
>power well before unloading.
>
>At some point we'll want to be able to survive suspend/resume and
>load/unload with the power well disabled, but for now let's just fix
>the regression.
>
>Regression introduced by the following commit:
>
>commit bf51d5e2cda5d36d98e4b46ac7fca9461e512c41
>Author: Paulo Zanoni <paulo.r.zanoni@intel.com>
>Date:   Wed Jul 3 17:12:13 2013 -0300
>    drm/i915: switch disable_power_well default value to 1
>
>Bug can be reproduced by running the "module_reload" script from
>intel-gpu-tools.
>
>Cc: stable@vger.kernel.org
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=67813
>Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
>---
> drivers/gpu/drm/i915/i915_dma.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
>index b30404d..d2dc02b 100644
>--- a/drivers/gpu/drm/i915/i915_dma.c
>+++ b/drivers/gpu/drm/i915/i915_dma.c
>@@ -1688,8 +1688,13 @@ int i915_driver_unload(struct drm_device *dev)
> 
> 	intel_gpu_ips_teardown();
> 
>-	if (HAS_POWER_WELL(dev))
>+	if (HAS_POWER_WELL(dev)) {
>+		/* The i915.ko module is still not prepared to be loaded when
>+		 * the power well is not enabled, so just enable it in case
>+		 * we're going to unload/reload. */
>+		intel_set_power_well(dev, true);
> 		i915_remove_power_well(dev);
>+	}
> 
> 	i915_teardown_sysfs(dev);
> 
>-- 
>1.8.1.2
>

Actions: View | Splinter Review

Attachments on bug 67813: 83695 | 83705 | 84069 | 84128 | 99372

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.