| From eeb26a49896e9fd80098af7ae380518af425022a Mon Sep 17 00:00:00 2001 |
| From: Paulo Zanoni <paulo.r.zanoni@intel.com> |
| Date: Wed, 14 Aug 2013 14:40:37 -0300 |
| Subject: 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. |
| |
| Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=67813 |
| Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> |
| Reviewed-by: Damien Lespiau <damien.lespiau@intel.com> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit 79f8dea13391f8220470997f9a5213ab5aa9f1c7) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/i915_dma.c | 7 ++++++- |
| 1 file changed, 6 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/gpu/drm/i915/i915_dma.c |
| +++ b/drivers/gpu/drm/i915/i915_dma.c |
| @@ -1697,8 +1697,13 @@ int i915_driver_unload(struct drm_device |
| |
| 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); |
| |
