From 6ae9b37a1428f4202a79926ec48aaa084c0db8ff Mon Sep 17 00:00:00 2001
From: Francisco Jerez <currojerez@riseup.net>
Date: Thu, 11 Feb 2010 12:47:40 +0100
Subject: [PATCH] --- yaml --- r: 180642 b: refs/heads/master c:
 bf929efa56ac174bf6d4f54cd6fe811181a51ae5 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 38842c9ba33b..301429d8ec27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9184fa97b6f48d399636e5e2669bc8419f9369e
+refs/heads/master: bf929efa56ac174bf6d4f54cd6fe811181a51ae5
diff --git a/trunk/drivers/gpu/drm/nouveau/nv17_tv.c b/trunk/drivers/gpu/drm/nouveau/nv17_tv.c
index 58b917c3341b..21ac6e49b6ee 100644
--- a/trunk/drivers/gpu/drm/nouveau/nv17_tv.c
+++ b/trunk/drivers/gpu/drm/nouveau/nv17_tv.c
@@ -579,6 +579,8 @@ static void nv17_tv_restore(struct drm_encoder *encoder)
 				nouveau_encoder(encoder)->restore.output);
 
 	nv17_tv_state_load(dev, &to_tv_enc(encoder)->saved_state);
+
+	nouveau_encoder(encoder)->last_dpms = NV_DPMS_CLEARED;
 }
 
 static int nv17_tv_create_resources(struct drm_encoder *encoder,