linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2.6.36-rc7] drm/ttm: use cancel_delayed_work_sync() in ttm_bo
@ 2010-10-15 12:12 Tejun Heo
  2010-10-15 14:44 ` Thomas Hellstrom
  0 siblings, 1 reply; 2+ messages in thread
From: Tejun Heo @ 2010-10-15 12:12 UTC (permalink / raw)
  To: Dave Airlie, Jerome Glisse, Thomas Hellstrom, lkml

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>
---
 drivers/gpu/drm/ttm/ttm_bo.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: work/drivers/gpu/drm/ttm/ttm_bo.c
===================================================================
--- work.orig/drivers/gpu/drm/ttm/ttm_bo.c
+++ work/drivers/gpu/drm/ttm/ttm_bo.c
@@ -1480,8 +1480,7 @@ int ttm_bo_device_release(struct ttm_bo_
 	list_del(&bdev->device_list);
 	mutex_unlock(&glob->device_list_mutex);

-	if (!cancel_delayed_work(&bdev->wq))
-		flush_scheduled_work();
+	cancel_delayed_work_sync(&bdev->wq);

 	while (ttm_bo_delayed_delete(bdev, true))
 		;

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH v2.6.36-rc7] drm/ttm: use cancel_delayed_work_sync() in ttm_bo
  2010-10-15 12:12 [PATCH v2.6.36-rc7] drm/ttm: use cancel_delayed_work_sync() in ttm_bo Tejun Heo
@ 2010-10-15 14:44 ` Thomas Hellstrom
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Hellstrom @ 2010-10-15 14:44 UTC (permalink / raw)
  To: Tejun Heo; +Cc: Dave Airlie, Jerome Glisse, lkml

On 10/15/2010 02:12 PM, Tejun Heo wrote:
> 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>
>    
Acked-by: Thomas Hellstrom <thellstrom@vmware.com>

Thanks,
Thomas


> ---
>   drivers/gpu/drm/ttm/ttm_bo.c |    3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
>
> Index: work/drivers/gpu/drm/ttm/ttm_bo.c
> ===================================================================
> --- work.orig/drivers/gpu/drm/ttm/ttm_bo.c
> +++ work/drivers/gpu/drm/ttm/ttm_bo.c
> @@ -1480,8 +1480,7 @@ int ttm_bo_device_release(struct ttm_bo_
>   	list_del(&bdev->device_list);
>   	mutex_unlock(&glob->device_list_mutex);
>
> -	if (!cancel_delayed_work(&bdev->wq))
> -		flush_scheduled_work();
> +	cancel_delayed_work_sync(&bdev->wq);
>
>   	while (ttm_bo_delayed_delete(bdev, true))
>   		;
>    


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-10-15 14:44 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-15 12:12 [PATCH v2.6.36-rc7] drm/ttm: use cancel_delayed_work_sync() in ttm_bo Tejun Heo
2010-10-15 14:44 ` Thomas Hellstrom

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).