diff options
author | Eric Anholt <eric@anholt.net> | 2009-09-06 18:18:53 -0400 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2009-09-06 18:18:53 -0400 |
commit | 01dfba93d9dfcf6d7abfc55ff5d9d6e76fa01ba0 (patch) | |
tree | df8fe0fba80b54492084025ffcda480bc810990f /drivers/gpu/drm/i915/intel_display.c | |
parent | 0ef82af7253c1929a3995f271b8b0db462d1a0c3 (diff) |
drm/i915: Put the idle reclocking work on our private workqueue as well.
Fixes (again) whole-system lockups due to GPU lockups.
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 9aa1d2de8a84..f6741032c608 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -3201,7 +3201,7 @@ static void intel_gpu_idle_timer(unsigned long arg) | |||
3201 | 3201 | ||
3202 | dev_priv->busy = false; | 3202 | dev_priv->busy = false; |
3203 | 3203 | ||
3204 | schedule_work(&dev_priv->idle_work); | 3204 | queue_work(dev_priv->wq, &dev_priv->idle_work); |
3205 | } | 3205 | } |
3206 | 3206 | ||
3207 | void intel_increase_renderclock(struct drm_device *dev, bool schedule) | 3207 | void intel_increase_renderclock(struct drm_device *dev, bool schedule) |
@@ -3335,7 +3335,7 @@ static void intel_crtc_idle_timer(unsigned long arg) | |||
3335 | 3335 | ||
3336 | intel_crtc->busy = false; | 3336 | intel_crtc->busy = false; |
3337 | 3337 | ||
3338 | schedule_work(&dev_priv->idle_work); | 3338 | queue_work(dev_priv->wq, &dev_priv->idle_work); |
3339 | } | 3339 | } |
3340 | 3340 | ||
3341 | static void intel_increase_pllclock(struct drm_crtc *crtc, bool schedule) | 3341 | static void intel_increase_pllclock(struct drm_crtc *crtc, bool schedule) |