summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2010-02-11 12:47:40 +0100
committerBen Skeggs <bskeggs@redhat.com>2010-02-16 02:15:07 +0100
commitbf929efa56ac174bf6d4f54cd6fe811181a51ae5 (patch)
tree85e909d19012d141d88a7306bc3fa228b7ad9d67
parentdrm/nouveau: use mutex for vbios lock (diff)
downloadlinux-bf929efa56ac174bf6d4f54cd6fe811181a51ae5.tar.xz
linux-bf929efa56ac174bf6d4f54cd6fe811181a51ae5.zip
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>
-rw-r--r--drivers/gpu/drm/nouveau/nv17_tv.c2
1 files changed, 2 insertions, 0 deletions
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,