diff options
| author | Thomas Hellstrom <thellstrom@vmware.com> | 2015-06-25 10:10:36 -0700 |
|---|---|---|
| committer | Thomas Hellstrom <thellstrom@vmware.com> | 2015-08-05 14:01:03 +0200 |
| commit | 12617971c443c50750a12a77ea0e08319d161975 (patch) | |
| tree | c8858f8d0271b0f4ca8e8d64ccb2e8efbfb72963 /drivers/gpu/drm/vmwgfx | |
| parent | dcd14dd957f02ef679c61325a2221a0574bdcab3 (diff) | |
| download | linux-12617971c443c50750a12a77ea0e08319d161975.tar.gz linux-12617971c443c50750a12a77ea0e08319d161975.tar.bz2 linux-12617971c443c50750a12a77ea0e08319d161975.zip | |
drm/vmwgfx: Fix an fb unlocking bug
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>
Diffstat (limited to 'drivers/gpu/drm/vmwgfx')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c index 0a474f391fad..e2d40ebd5455 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c @@ -402,12 +402,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; } |