---

yaml --- r: 199674 b: refs/heads/master c: 316ab13 h: refs/heads/master v: v3
git-mirror · May 31, 2010 · 8e9d80e · 8e9d80e
1 parent c0363a6
commit 8e9d80e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 792778e8e058471e1909b78d7c5e6ab94962ff8e
+refs/heads/master: 316ab13ae2ad603fd5e3a909524e68d98db1b1b6
diff --git a/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
@@ -630,6 +630,10 @@ int vmw_dmabuf_to_start_of_vram(struct vmw_private *vmw_priv,
 		goto err_unlock;
 
 	ret = ttm_bo_validate(bo, &ne_placement, false, false, false);
+
+	/* Could probably bug on */
+	WARN_ON(bo->offset != 0);
+
 	ttm_bo_unreserve(bo);
 err_unlock:
 	ttm_write_unlock(&vmw_priv->active_master->lock);

diff --git a/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@ -640,6 +640,8 @@ static int vmw_framebuffer_dmabuf_pin(struct vmw_framebuffer *vfb)
 
 	vmw_overlay_resume_all(dev_priv);
 
+	WARN_ON(ret != 0);
+
 	return 0;
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     	vmw_overlay_resume_all(dev_priv);
+    	WARN_ON(ret != 0);
     	return 0;
     }
@@ Expand Down @@