aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/vmwgfx
diff options
context:
space:
mode:
authorJakob Bornecrantz <jakob@vmware.com>2011-11-09 04:25:26 -0500
committerDave Airlie <airlied@redhat.com>2011-11-11 05:57:29 -0500
commitc0d18316ae99e1f19738f9cb5e0a2a9dc57dd8cd (patch)
tree270877b23a9f3cb785ff7074be6fc7f8a7a8e171 /drivers/gpu/drm/vmwgfx
parent14660ccd599dc7bd6ecef17408bd76dc853f9b77 (diff)
vmwgfx: Close screen object system
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com> Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/vmwgfx')
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_kms.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
index 03daefa73397..f3ab1fee60e1 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@ -1323,7 +1323,10 @@ int vmw_kms_close(struct vmw_private *dev_priv)
1323 * drm_encoder_cleanup which takes the lock we deadlock. 1323 * drm_encoder_cleanup which takes the lock we deadlock.
1324 */ 1324 */
1325 drm_mode_config_cleanup(dev_priv->dev); 1325 drm_mode_config_cleanup(dev_priv->dev);
1326 vmw_kms_close_legacy_display_system(dev_priv); 1326 if (dev_priv->sou_priv)
1327 vmw_kms_close_screen_object_display(dev_priv);
1328 else
1329 vmw_kms_close_legacy_display_system(dev_priv);
1327 return 0; 1330 return 0;
1328} 1331}
1329 1332