Re: [PATCH] drm/vgem: Switch to reservation_object_lock() helpers

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Mon, Jan 23, 2017 at 09:53:57AM +0000, Chris Wilson wrote:
> For the convenience of encapsulation the reservation object's ww_mutex
> was wrapped in pair of lock/unlock helpers.
> 
> Signed-off-by: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>

Applied to drm-misc, thx.
-Daniel

> ---
>  drivers/gpu/drm/vgem/vgem_fence.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/vgem/vgem_fence.c b/drivers/gpu/drm/vgem/vgem_fence.c
> index da25dfe7b80e..3109c8308eb5 100644
> --- a/drivers/gpu/drm/vgem/vgem_fence.c
> +++ b/drivers/gpu/drm/vgem/vgem_fence.c
> @@ -190,12 +190,12 @@ int vgem_fence_attach_ioctl(struct drm_device *dev,
>  
>  	/* Expose the fence via the dma-buf */
>  	ret = 0;
> -	ww_mutex_lock(&resv->lock, NULL);
> +	reservation_object_lock(resv, NULL);
>  	if (arg->flags & VGEM_FENCE_WRITE)
>  		reservation_object_add_excl_fence(resv, fence);
>  	else if ((ret = reservation_object_reserve_shared(resv)) == 0)
>  		reservation_object_add_shared_fence(resv, fence);
> -	ww_mutex_unlock(&resv->lock);
> +	reservation_object_unlock(resv);
>  
>  	/* Record the fence in our idr for later signaling */
>  	if (ret == 0) {
> -- 
> 2.11.0
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel




[Index of Archives]     [Linux DRI Users]     [Linux Intel Graphics]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux