---

yaml --- r: 180642 b: refs/heads/master c: bf929ef h: refs/heads/master v: v3
git-mirror · Feb 16, 2010 · 6ae9b37 · 6ae9b37
1 parent 499c0bc
commit 6ae9b37
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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,