aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/ttm/ttm_bo.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-12-24 09:59:06 -0500
committerTejun Heo <tj@kernel.org>2010-12-24 09:59:06 -0500
commitf094cfc6c382cec7b2c77dd7798576684153acbb (patch)
treead64b194f52302e7db6941769d19211340570c1c /drivers/gpu/drm/ttm/ttm_bo.c
parent404437efc713b6c6fc8e2dc02978624bf4586e2d (diff)
drm/ttm: use cancel_delayed_work_sync() in ttm_bo
Make ttm_bo::ttm_bo_device_release call cancel_delayed_work_sync() instead of calling cancel_delayed_work() followed by flush_scheduled_work(). This is to prepare for the deprecation and removal of flush_scheduled_work(). Signed-off-by: Tejun Heo <tj@kernel.org> Cc:: Thomas Hellstrom <thellstrom@vmware.com> Cc:: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/ttm/ttm_bo.c')
-rw-r--r--drivers/gpu/drm/ttm/ttm_bo.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 148a322d8f5d..934a96a78540 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -1472,8 +1472,7 @@ int ttm_bo_device_release(struct ttm_bo_device *bdev)
1472 list_del(&bdev->device_list); 1472 list_del(&bdev->device_list);
1473 mutex_unlock(&glob->device_list_mutex); 1473 mutex_unlock(&glob->device_list_mutex);
1474 1474
1475 if (!cancel_delayed_work(&bdev->wq)) 1475 cancel_delayed_work_sync(&bdev->wq);
1476 flush_scheduled_work();
1477 1476
1478 while (ttm_bo_delayed_delete(bdev, true)) 1477 while (ttm_bo_delayed_delete(bdev, true))
1479 ; 1478 ;