diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-05-21 06:41:59 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-05-21 06:41:59 +1000 |
| commit | fc7fedc20b7c819b9ef003afa16a64dc9e5ac30e (patch) | |
| tree | 060d0ad8c242388c88415ba5f24067f0c9822d18 /drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | |
| parent | d5fa33f28401414959b68591075c8053e8276547 (diff) | |
| parent | f921791314811afa00bb7fbbd40f51bd3b8eff01 (diff) | |
| download | linux-fc7fedc20b7c819b9ef003afa16a64dc9e5ac30e.tar.gz linux-fc7fedc20b7c819b9ef003afa16a64dc9e5ac30e.tar.bz2 linux-fc7fedc20b7c819b9ef003afa16a64dc9e5ac30e.zip | |
Merge tag 'vmwgfx-next-160520' of git://people.freedesktop.org/~thomash/linux into drm-next
Pull request of 2016-05-20
* tag 'vmwgfx-next-160520' of git://people.freedesktop.org/~thomash/linux:
drm/vmwgfx: Report vmwgfx version to vmware.log
drm/vmwgfx: Add VMWare host messaging capability
drm/vmwgfx: Kill some lockdep warnings
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c index 0ea22fd112c9..b74eae2b8594 100644 --- 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; |