From 9a332e2e50b595398118332258a53006b65a2e7d Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz Date: Wed, 9 Nov 2011 10:25:26 +0100 Subject: [PATCH] --- yaml --- r: 275251 b: refs/heads/master c: c0d18316ae99e1f19738f9cb5e0a2a9dc57dd8cd h: refs/heads/master i: 275249: f7555093b8ea8eb589c335a31674bcd3300c9424 275247: 4514f041a2d4f63841f60702390c613bf8931149 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ef67f489d24a..0224f6cda363 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 14660ccd599dc7bd6ecef17408bd76dc853f9b77 +refs/heads/master: c0d18316ae99e1f19738f9cb5e0a2a9dc57dd8cd diff --git a/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index 03daefa73397..f3ab1fee60e1 100644 --- a/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c @@ -1323,7 +1323,10 @@ int vmw_kms_close(struct vmw_private *dev_priv) * drm_encoder_cleanup which takes the lock we deadlock. */ drm_mode_config_cleanup(dev_priv->dev); - vmw_kms_close_legacy_display_system(dev_priv); + if (dev_priv->sou_priv) + vmw_kms_close_screen_object_display(dev_priv); + else + vmw_kms_close_legacy_display_system(dev_priv); return 0; }