A regression introduced when the master ttm lock was split into two. Reported-and-tested-by: Brian Paul <brianp@xxxxxxxxxx> Signed-off-by: Thomas Hellstrom <thellstrom@xxxxxxxxxx> Reviewed-by: Brian Paul <brianp@xxxxxxxxxx> Cc: <stable@xxxxxxxxxxxxxxx> # 3.15.x - 4.2.x --- The stable commit "drm/ttm: Fixed a read/write lock imbalance" exposes this bug on kernels 3.15 through 4.2, causing a hang on vmwgfx module load. Please apply this commit if and only if "drm/ttm: Fixed a read/write lock imbalance" has been applied. Upstream commit id: 12617971c443c50750a12a77ea0e08319d161975 --- drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c index 0a474f391fad0157d8a51e5aa2e50d6c4aec69ec..e2d40ebd545583af20c816e88dc4cd47ef306f3d 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; } -- 2.5.0 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html