diff options
author | Eric Anholt <eric@anholt.net> | 2009-08-03 19:09:16 -0400 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2009-08-05 14:20:53 -0400 |
commit | 9c9fe1f841745184bbc5460c6f3909fded3b929b (patch) | |
tree | 7633580a02803cbe32e5ebda4a834f436ebba5c0 /drivers/gpu/drm/i915/i915_gem.c | |
parent | 0c2e39525b3b53a97a0202c5f35058147e53977e (diff) |
drm/i915: Use our own workqueue to avoid wedging the system along with the GPU.
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 5bf420378b6d..140bee142fc2 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
@@ -1570,7 +1570,7 @@ i915_add_request(struct drm_device *dev, struct drm_file *file_priv, | |||
1570 | } | 1570 | } |
1571 | 1571 | ||
1572 | if (was_empty && !dev_priv->mm.suspended) | 1572 | if (was_empty && !dev_priv->mm.suspended) |
1573 | schedule_delayed_work(&dev_priv->mm.retire_work, HZ); | 1573 | queue_delayed_work(dev_priv->wq, &dev_priv->mm.retire_work, HZ); |
1574 | return seqno; | 1574 | return seqno; |
1575 | } | 1575 | } |
1576 | 1576 | ||
@@ -1719,7 +1719,7 @@ i915_gem_retire_work_handler(struct work_struct *work) | |||
1719 | i915_gem_retire_requests(dev); | 1719 | i915_gem_retire_requests(dev); |
1720 | if (!dev_priv->mm.suspended && | 1720 | if (!dev_priv->mm.suspended && |
1721 | !list_empty(&dev_priv->mm.request_list)) | 1721 | !list_empty(&dev_priv->mm.request_list)) |
1722 | schedule_delayed_work(&dev_priv->mm.retire_work, HZ); | 1722 | queue_delayed_work(dev_priv->wq, &dev_priv->mm.retire_work, HZ); |
1723 | mutex_unlock(&dev->struct_mutex); | 1723 | mutex_unlock(&dev->struct_mutex); |
1724 | } | 1724 | } |
1725 | 1725 | ||