From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Hellstrom Subject: Re: [PATCH, FIXED] drm/vmwgfx: always use ttm_bo_is_reserved Date: Fri, 30 Nov 2012 09:53:20 +0100 Message-ID: <50B87400.3060209@vmware.com> References: <50B86BED.2050205@canonical.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: Received: from smtp-outbound-2.vmware.com (smtp-outbound-2.vmware.com [208.91.2.13]) by gabe.freedesktop.org (Postfix) with ESMTP id 1BD5CE670C for ; Fri, 30 Nov 2012 00:53:25 -0800 (PST) In-Reply-To: <50B86BED.2050205@canonical.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: Maarten Lankhorst Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org Reviewed-by: Thomas Hellstrom On 11/30/2012 09:18 AM, Maarten Lankhorst wrote: > This was missed during the initial conversion, most likely due to the refactoring here. > > Signed-off-by: Maarten Lankhorst > --- > Woops, forgot to stg refresh before sending, fixed. :-) > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c > index 93dffe3..ddc8db8 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c > @@ -939,13 +939,13 @@ void vmw_resource_unreserve(struct vmw_resource *res, > if (new_backup && new_backup != res->backup) { > > if (res->backup) { > - BUG_ON(atomic_read(&res->backup->base.reserved) == 0); > + BUG_ON(!ttm_bo_is_reserved(&res->backup->base)); > list_del_init(&res->mob_head); > vmw_dmabuf_unreference(&res->backup); > } > > res->backup = vmw_dmabuf_reference(new_backup); > - BUG_ON(atomic_read(&new_backup->base.reserved) == 0); > + BUG_ON(!ttm_bo_is_reserved(&new_backup->base)); > list_add_tail(&res->mob_head, &new_backup->res_list); > } > if (new_backup)