diff options
| author | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2013-01-15 14:53:18 +0100 | 
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2013-01-15 14:53:18 +0100 | 
| commit | 42f6e3da974dc8ad81775110c8d06835acdf375e (patch) | |
| tree | 10fdb68223608d1f2599f410a728f2e78c54cebd /drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | |
| parent | 7b4cf994e4c6ba48872bb25253cc393b7fb74c82 (diff) | |
| download | olio-linux-3.10-42f6e3da974dc8ad81775110c8d06835acdf375e.tar.xz olio-linux-3.10-42f6e3da974dc8ad81775110c8d06835acdf375e.zip  | |
drm/vmwgfx: always use ttm_bo_is_reserved
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_resource.c')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c index e01a17b407b..16556170fb3 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c @@ -959,13 +959,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)  |