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 b031b48dbb3cdcbbd48824096ac82650aa08ec87..21a6ed819401a4bc690b1aface4d27b55ac1a057 100644 (file)
--- 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;
 }