Merge branch 'for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[deliverable/linux.git] / drivers / gpu / drm / vmwgfx / vmwgfx_scrn.c

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
index 0ea22fd112c9ccb892bf4e7367b6fcd41c5d323e..b74eae2b8594d54a6083311fae8dd9fd8854e2d9 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
@@ -285,14 +285,17 @@ static int vmw_sou_crtc_set_config(struct drm_mode_set *set)
        }
 
        /* Only one active implicit frame-buffer at a time. */
+       mutex_lock(&dev_priv->global_kms_state_mutex);
        if (sou->base.is_implicit &&
            dev_priv->implicit_fb && vfb &&
            !(dev_priv->num_implicit == 1 &&
              sou->base.active_implicit) &&
            dev_priv->implicit_fb != vfb) {
+               mutex_unlock(&dev_priv->global_kms_state_mutex);
                DRM_ERROR("Multiple implicit framebuffers not supported.\n");
                return -EINVAL;
        }
+       mutex_unlock(&dev_priv->global_kms_state_mutex);
 
        /* since they always map one to one these are safe */
        connector = &sou->base.connector;