aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nv50_pm.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2011-10-30 22:14:10 -0400
committerBen Skeggs <bskeggs@redhat.com>2011-12-21 04:01:29 -0500
commitd2491567cdbcb87b2682e0948a69d73c4dd8987e (patch)
tree2497d3f8c69b6906e6fc003153e72071db10485e /drivers/gpu/drm/nouveau/nv50_pm.c
parent8b5f4d0def9caa16527c95e7a4ba47bb8a4d9e1e (diff)
drm/nv50/pm: only touch 0x611200 on nv92-
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_pm.c')
-rw-r--r--drivers/gpu/drm/nouveau/nv50_pm.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_pm.c b/drivers/gpu/drm/nouveau/nv50_pm.c
index 961d8f20d27f..e7ff5acce65f 100644
--- a/drivers/gpu/drm/nouveau/nv50_pm.c
+++ b/drivers/gpu/drm/nouveau/nv50_pm.c
@@ -594,8 +594,10 @@ nv50_pm_clocks_set(struct drm_device *dev, void *data)
594 } 594 }
595 595
596 /* disable display */ 596 /* disable display */
597 nv_wr32(dev, 0x611200, 0x00003300); 597 if (dev_priv->chipset >= 0x92) {
598 udelay(100); 598 nv_wr32(dev, 0x611200, 0x00003300);
599 udelay(100);
600 }
599 601
600 /* prepare ram for reclocking */ 602 /* prepare ram for reclocking */
601 nv_wr32(dev, 0x1002d4, 0x00000001); /* precharge */ 603 nv_wr32(dev, 0x1002d4, 0x00000001); /* precharge */
@@ -617,7 +619,8 @@ nv50_pm_clocks_set(struct drm_device *dev, void *data)
617 udelay(100); 619 udelay(100);
618 620
619 /* re-enable display */ 621 /* re-enable display */
620 nv_wr32(dev, 0x611200, 0x00003330); 622 if (dev_priv->chipset >= 0x92)
623 nv_wr32(dev, 0x611200, 0x00003330);
621 624
622 goto resume; 625 goto resume;
623error: 626error: