diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-10-31 12:14:10 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-12-21 19:01:29 +1000 |
| commit | d2491567cdbcb87b2682e0948a69d73c4dd8987e (patch) | |
| tree | 2497d3f8c69b6906e6fc003153e72071db10485e /drivers/gpu/drm/nouveau/nv50_pm.c | |
| parent | 8b5f4d0def9caa16527c95e7a4ba47bb8a4d9e1e (diff) | |
| download | blackbird-op-linux-d2491567cdbcb87b2682e0948a69d73c4dd8987e.tar.gz blackbird-op-linux-d2491567cdbcb87b2682e0948a69d73c4dd8987e.zip | |
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.c | 9 |
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) } /* disable display */ - nv_wr32(dev, 0x611200, 0x00003300); - udelay(100); + if (dev_priv->chipset >= 0x92) { + nv_wr32(dev, 0x611200, 0x00003300); + udelay(100); + } /* prepare ram for reclocking */ nv_wr32(dev, 0x1002d4, 0x00000001); /* precharge */ @@ -617,7 +619,8 @@ nv50_pm_clocks_set(struct drm_device *dev, void *data) udelay(100); /* re-enable display */ - nv_wr32(dev, 0x611200, 0x00003330); + if (dev_priv->chipset >= 0x92) + nv_wr32(dev, 0x611200, 0x00003330); goto resume; error: |
