From 571b994980d79a4d5c686d78b77ca2aff39c509d Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thellstrom@vmware.com>
Date: Tue, 5 Oct 2010 12:43:05 +0200
Subject: [PATCH] --- yaml --- r: 218152 b: refs/heads/master c:
 09e2601b5a7bb817fb07df6f430289484a9a2cad h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4476bfcf3432..2277faeb9857 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e133e7371231e49c3e7d626e2251cb6f7c3ca1ad
+refs/heads/master: 09e2601b5a7bb817fb07df6f430289484a9a2cad
diff --git a/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
index 086ef0490263..b27a9f2887d2 100644
--- a/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
+++ b/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c
@@ -212,6 +212,9 @@ static void vmw_fb_dirty_flush(struct vmw_fb_par *par)
 		SVGAFifoCmdUpdate body;
 	} *cmd;
 
+	if (vmw_priv->suspended)
+		return;
+
 	spin_lock_irqsave(&par->dirty.lock, flags);
 	if (!par->dirty.active) {
 		spin_unlock_irqrestore(&par->dirty.lock, flags);