drm/nv50/pm: only touch 0x611200 on nv92-
authorBen Skeggs <bskeggs@redhat.com>
Mon, 31 Oct 2011 02:14:10 +0000 (12:14 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Wed, 21 Dec 2011 09:01:29 +0000 (19:01 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nv50_pm.c

index 961d8f20d27f359cf4b5cedd3dc37612dd472c6d..e7ff5acce65ff8038958afbafe7acfdc52711220 100644 (file)
@@ -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: