summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@canonical.com>2012-07-30 12:03:30 +0200
committerBen Skeggs <bskeggs@redhat.com>2012-08-14 09:36:51 +1000
commit44b9f44e111c1e4a50bff66a642cc7c5cb59af4e (patch)
treeda12db1c87decdf3ef40a553cf85819a86a636fd
parent3d7a1da2c2bddb916450b1a124a9bcd9c507bdce (diff)
downloadlinux-44b9f44e111c1e4a50bff66a642cc7c5cb59af4e.tar.gz
linux-44b9f44e111c1e4a50bff66a642cc7c5cb59af4e.tar.bz2
linux-44b9f44e111c1e4a50bff66a642cc7c5cb59af4e.zip
nouveau: fixup scanout enable in nvc0_pm
Fixes screen being black after changing performance level. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com> Cc: stable@vger.kernel.org [3.5+] Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nvc0_pm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvc0_pm.c b/drivers/gpu/drm/nouveau/nvc0_pm.c
index 7c95c44e2887..4e712b10ebdb 100644
--- a/drivers/gpu/drm/nouveau/nvc0_pm.c
+++ b/drivers/gpu/drm/nouveau/nvc0_pm.c
@@ -557,7 +557,7 @@ prog_mem(struct drm_device *dev, struct nvc0_pm_state *info)
nouveau_mem_exec(&exec, info->perflvl);
if (dev_priv->chipset < 0xd0)
- nv_wr32(dev, 0x611200, 0x00003300);
+ nv_wr32(dev, 0x611200, 0x00003330);
else
nv_wr32(dev, 0x62c000, 0x03030300);
}