projects
/
platform
/
kernel
/
kernel-mfld-blackbay.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c2e0eb1
)
drm/i915: Fix unintended recursion in ironlake_disable_rc6
author
Chris Wilson
<chris@chris-wilson.co.uk>
Thu, 24 Feb 2011 09:42:52 +0000
(09:42 +0000)
committer
Chris Wilson
<chris@chris-wilson.co.uk>
Thu, 24 Feb 2011 17:16:43 +0000
(17:16 +0000)
After disabling, we're meant to teardown the bo used for the contexts,
not recurse into ourselves again and preventing module unload.
Reported-and-tested-by: Ben Widawsky <bwidawsk@gmail.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
drivers/gpu/drm/i915/intel_display.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/intel_display.c
b/drivers/gpu/drm/i915/intel_display.c
index
9ca1bb2
..
e79b25b
100644
(file)
--- a/
drivers/gpu/drm/i915/intel_display.c
+++ b/
drivers/gpu/drm/i915/intel_display.c
@@
-6575,7
+6575,7
@@
static void ironlake_disable_rc6(struct drm_device *dev)
POSTING_READ(RSTDBYCTL);
}
- ironlake_
disable
_rc6(dev);
+ ironlake_
teardown
_rc6(dev);
}
static int ironlake_setup_rc6(struct drm_device *dev)