aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2011-02-24 04:42:52 -0500
committerChris Wilson <chris@chris-wilson.co.uk>2011-02-24 12:16:43 -0500
commit995073072c2ae72255b595b192cc63f43fd386ef (patch)
treefd96c7638bf675b7f8c37c6d517ad2b20479082e /drivers/gpu
parentc2e0eb167070a6e9dcb49c84c13c79a30d672431 (diff)
drm/i915: Fix unintended recursion in ironlake_disable_rc6
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>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 9ca1bb2554fc..e79b25bbee6c 100644
--- 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)
6575 POSTING_READ(RSTDBYCTL); 6575 POSTING_READ(RSTDBYCTL);
6576 } 6576 }
6577 6577
6578 ironlake_disable_rc6(dev); 6578 ironlake_teardown_rc6(dev);
6579} 6579}
6580 6580
6581static int ironlake_setup_rc6(struct drm_device *dev) 6581static int ironlake_setup_rc6(struct drm_device *dev)