From: Francisco Jerez <currojerez@riseup.net>
Date: Thu, 11 Feb 2010 11:47:40 +0000 (+0100)
Subject: drm/nouveau: Force TV encoder DPMS reinit after resume.
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=bf929efa56ac174bf6d4f54cd6fe811181a51ae5;p=openwrt%2Fstaging%2Fblogic.git

drm/nouveau: Force TV encoder DPMS reinit after resume.

Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nv17_tv.c b/drivers/gpu/drm/nouveau/nv17_tv.c
index 58b917c3341b..21ac6e49b6ee 100644
--- a/drivers/gpu/drm/nouveau/nv17_tv.c
+++ b/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,