---

yaml --- r: 275251 b: refs/heads/master c: c0d1831 h: refs/heads/master i: 275249: f755509 275247: 4514f04 v: v3
git-mirror · Nov 11, 2011 · 9a332e2 · 9a332e2
1 parent 92c3806
commit 9a332e2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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;
 }