diff options
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c')
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c index d4e54fcc0acd..a75840211b3c 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c | |||
@@ -290,8 +290,7 @@ void vmw_bo_get_guest_ptr(const struct ttm_buffer_object *bo, | |||
290 | /** | 290 | /** |
291 | * vmw_bo_pin - Pin or unpin a buffer object without moving it. | 291 | * vmw_bo_pin - Pin or unpin a buffer object without moving it. |
292 | * | 292 | * |
293 | * @bo: The buffer object. Must be reserved, and present either in VRAM | 293 | * @bo: The buffer object. Must be reserved. |
294 | * or GMR memory. | ||
295 | * @pin: Whether to pin or unpin. | 294 | * @pin: Whether to pin or unpin. |
296 | * | 295 | * |
297 | */ | 296 | */ |
@@ -303,10 +302,9 @@ void vmw_bo_pin(struct ttm_buffer_object *bo, bool pin) | |||
303 | int ret; | 302 | int ret; |
304 | 303 | ||
305 | lockdep_assert_held(&bo->resv->lock.base); | 304 | lockdep_assert_held(&bo->resv->lock.base); |
306 | BUG_ON(old_mem_type != TTM_PL_VRAM && | ||
307 | old_mem_type != VMW_PL_GMR); | ||
308 | 305 | ||
309 | pl_flags = TTM_PL_FLAG_VRAM | VMW_PL_FLAG_GMR | TTM_PL_FLAG_CACHED; | 306 | pl_flags = TTM_PL_FLAG_VRAM | VMW_PL_FLAG_GMR | VMW_PL_FLAG_MOB |
307 | | TTM_PL_FLAG_SYSTEM | TTM_PL_FLAG_CACHED; | ||
310 | if (pin) | 308 | if (pin) |
311 | pl_flags |= TTM_PL_FLAG_NO_EVICT; | 309 | pl_flags |= TTM_PL_FLAG_NO_EVICT; |
312 | 310 | ||