---

yaml --- r: 211215 b: refs/heads/master c: abb295f h: refs/heads/master i: 211213: b2cf9ac 211211: 31b8c31 211207: 7719823 211199: c08a8cb v: v3
git-mirror · Oct 1, 2010 · c2fa944 · c2fa944
1 parent 88a0118
commit c2fa944
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1a28ee238bddfa48c5233543926af65a4445bf6
+refs/heads/master: abb295f3b3db602f91accf58b526b30b48673af1
diff --git a/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
@@ -615,6 +615,11 @@ int vmw_dmabuf_to_start_of_vram(struct vmw_private *vmw_priv,
 	if (unlikely(ret != 0))
 		goto err_unlock;
 
+	if (bo->mem.mem_type == TTM_PL_VRAM &&
+	    bo->mem.mm_node->start < bo->num_pages)
+		(void) ttm_bo_validate(bo, &vmw_sys_placement, false,
+				       false, false);
+
 	ret = ttm_bo_validate(bo, &ne_placement, false, false, false);
 
 	/* Could probably bug on */