From 8e9d80e5ea9a158b3a13f02721caadad1c938e3f Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@vmware.com>
Date: Fri, 28 May 2010 11:22:05 +0200
Subject: [PATCH] --- yaml --- r: 199674 b: refs/heads/master c:
 316ab13ae2ad603fd5e3a909524e68d98db1b1b6 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c  | 4 ++++
 trunk/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ef2922895da8..dcf3ef9e2bca 100644
--- 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
index 06f431442e92..181f47222580 100644
--- 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
index 250282fee9c8..b78dcf001858 100644
--- 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;
 }