Commit 2e6d8b46 authored Dec 21, 2013 by Thomas Hellstrom Committed by Dave Airlie Dec 23, 2013

drm/ttm: Fix swapin regression



Commit "drm/ttm: Don't move non-existing data" didn't take the
swapped-out corner case into account. This patch corrects that.
Fixes blank screen after attempted suspend / hibernate on vmwgfx.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

parent 488574db

drivers/gpu/drm/ttm/ttm_bo_util.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -353,7 +353,8 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo,
		* Don't move nonexistent data. Clear destination instead.
		*/
		if (old_iomap == NULL &&
		(ttm == NULL \|\| ttm->state == tt_unpopulated)) {
		(ttm == NULL \|\| (ttm->state == tt_unpopulated &&
		!(ttm->page_flags & TTM_PAGE_FLAG_SWAPPED)))) {
		memset_io(new_iomap, 0, new_mem->num_pages*PAGE_SIZE);
		goto out2;
		}