Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bd4ce56 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Dave Airlie
Browse files

drm/vmwgfx: get rid of ttm_bo_is_reserved usage 



Use lockdep_assert_held instead.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 977c38d5

drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ void vmw_bo_pin(struct ttm_buffer_object *bo, bool pin) 
	uint32_t old_mem_type = bo->mem.mem_type;

	int ret;



	BUG_ON(!ttm_bo_is_reserved(bo));

	lockdep_assert_held(&bo->resv->lock.base);

	BUG_ON(old_mem_type != TTM_PL_VRAM &&

	       old_mem_type != VMW_PL_GMR);

drivers/gpu/drm/vmwgfx/vmwgfx_resource.c

+2 −2
Original line number Diff line number Diff line
@@ -958,13 +958,13 @@ void vmw_resource_unreserve(struct vmw_resource *res, 
	if (new_backup && new_backup != res->backup) {



		if (res->backup) {

			BUG_ON(!ttm_bo_is_reserved(&res->backup->base));

			lockdep_assert_held(&res->backup->base.resv->lock.base);

			list_del_init(&res->mob_head);

			vmw_dmabuf_unreference(&res->backup);

		}



		res->backup = vmw_dmabuf_reference(new_backup);

		BUG_ON(!ttm_bo_is_reserved(&new_backup->base));

		lockdep_assert_held(&new_backup->base.resv->lock.base);

		list_add_tail(&res->mob_head, &new_backup->res_list);

	}

	if (new_backup)