Skip to content

Commit

Permalink
drm/i915: Fix unintended recursion in ironlake_disable_rc6
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Chris Wilson committed Feb 24, 2011
1 parent c2e0eb1 commit 9950730
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 9950730

Please sign in to comment.