drm/vmwgfx: Fix a case where the code would BUG when trying to pin GMR memory
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Dmitry Torokhov <dtor@vmware.com> Cc: stable@vger.kernel.org Cc: linux-graphics-maintainer@vmware.com Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
parent
95e8f6a219
commit
afcc87aa6a
|
@ -306,7 +306,7 @@ void vmw_bo_pin(struct ttm_buffer_object *bo, bool pin)
|
||||||
|
|
||||||
BUG_ON(!atomic_read(&bo->reserved));
|
BUG_ON(!atomic_read(&bo->reserved));
|
||||||
BUG_ON(old_mem_type != TTM_PL_VRAM &&
|
BUG_ON(old_mem_type != TTM_PL_VRAM &&
|
||||||
old_mem_type != VMW_PL_FLAG_GMR);
|
old_mem_type != VMW_PL_GMR);
|
||||||
|
|
||||||
pl_flags = TTM_PL_FLAG_VRAM | VMW_PL_FLAG_GMR | TTM_PL_FLAG_CACHED;
|
pl_flags = TTM_PL_FLAG_VRAM | VMW_PL_FLAG_GMR | TTM_PL_FLAG_CACHED;
|
||||||
if (pin)
|
if (pin)
|
||||||
|
|
Loading…
Reference in a new issue