From: Thomas Hellstrom <thellstrom@vmware.com>
To: airlied@gmail.com
Cc: dri-devel@lists.freedesktop.org
Subject: [PATCH 1/3] vmwgfx: Close screen object system
Date: Wed, 9 Nov 2011 10:25:26 +0100 [thread overview]
Message-ID: <1320830728-5345-2-git-send-email-thellstrom@vmware.com> (raw)
In-Reply-To: <1320830728-5345-1-git-send-email-thellstrom@vmware.com>
From: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
---
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 03daefa..f3ab1fe 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;
}
--
1.7.4.4
next prev parent reply other threads:[~2011-11-09 9:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-09 9:25 [PATCH -fixes 0/3] vmwgfx fixes Thomas Hellstrom
2011-11-09 9:25 ` Thomas Hellstrom [this message]
2011-11-09 9:25 ` [PATCH 2/3] vmwgfx: Initialize clip rect loop correctly in surface dirty Thomas Hellstrom
2011-11-09 9:25 ` [PATCH 3/3] vmwgfx: Only allow 64x64 cursors Thomas Hellstrom
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1320830728-5345-2-git-send-email-thellstrom@vmware.com \
--to=thellstrom@vmware.com \
--cc=airlied@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox