From: Thomas Hellstrom <thellstrom@vmware.com>
Date: Thu, 25 Jun 2015 17:10:36 +0000 (-0700)
Subject: drm/vmwgfx: Fix an fb unlocking bug
X-Git-Tag: v3.16.35~380
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ced18efa45a7d65f98a1336751322f7e5c2a3deb;p=thirdparty%2Fkernel%2Fstable.git

drm/vmwgfx: Fix an fb unlocking bug

commit 12617971c443c50750a12a77ea0e08319d161975 upstream.

A regression introduced when the master ttm lock was split into two.

Reported-and-tested-by: Brian Paul <brianp@vmware.com>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
index b031b48dbb3cd..21a6ed819401a 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
@@ -396,12 +396,12 @@ static int vmw_fb_create_bo(struct vmw_private *vmw_priv,
 
 	*out = vmw_bo;
 
-	ttm_write_unlock(&vmw_priv->fbdev_master.lock);
+	ttm_write_unlock(&vmw_priv->reservation_sem);
 
 	return 0;
 
 err_unlock:
-	ttm_write_unlock(&vmw_priv->fbdev_master.lock);
+	ttm_write_unlock(&vmw_priv->reservation_sem);
 	return ret;
 }