diff options
| author | Jakob Bornecrantz <jakob@vmware.com> | 2011-11-09 10:25:26 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-11-11 10:57:29 +0000 |
| commit | c0d18316ae99e1f19738f9cb5e0a2a9dc57dd8cd (patch) | |
| tree | 270877b23a9f3cb785ff7074be6fc7f8a7a8e171 /drivers | |
| parent | 14660ccd599dc7bd6ecef17408bd76dc853f9b77 (diff) | |
| download | linux-c0d18316ae99e1f19738f9cb5e0a2a9dc57dd8cd.tar.bz2 | |
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')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 5 |
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) * 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; } |