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

Commit afcc87aa authored by Thomas Hellstrom's avatar Thomas Hellstrom Committed by Dave Airlie
Browse files

drm/vmwgfx: Fix a case where the code would BUG when trying to pin GMR memory 



Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: default avatarBrian Paul <brianp@vmware.com>
Reviewed-by: default avatarDmitry Torokhov <dtor@vmware.com>
Cc: stable@vger.kernel.org
Cc: linux-graphics-maintainer@vmware.com
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 95e8f6a2

drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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)