drm/nva3/pm: initial attempt at more magic PFB regs

The reg calculation may get moved elsewhere at some point, but lets
figure out what exactly we need to do first.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nouveau_perf.c b/drivers/gpu/drm/nouveau/nouveau_perf.c
index 69a528d106e6e7e7f3960b039eaf99d065072a9c..ea6acf1c4a78f036f9c0a841f8850da7ecd66165 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_perf.c
+++ b/drivers/gpu/drm/nouveau/nouveau_perf.c
@@ -83,7 +83,7 @@ nouveau_perf_entry(struct drm_device *dev, int idx,
        return NULL;
 }
 
-static u8 *
+u8 *
 nouveau_perf_rammap(struct drm_device *dev, u32 freq,
                    u8 *ver, u8 *hdr, u8 *cnt, u8 *len)
 {

diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.h b/drivers/gpu/drm/nouveau/nouveau_pm.h
index 3f82dfea61dd77ed2b543269d6b31624de5ddfba..07cac72c72b468f193b4b4b97e7d6ac5a3606751 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_pm.h
+++ b/drivers/gpu/drm/nouveau/nouveau_pm.h
@@ -61,8 +61,10 @@ int  nouveau_voltage_gpio_set(struct drm_device *, int voltage);
 /* nouveau_perf.c */
 void nouveau_perf_init(struct drm_device *);
 void nouveau_perf_fini(struct drm_device *);
-u8 *nouveau_perf_timing(struct drm_device *, u32 freq, u8 *ver, u8 *len);
+u8 *nouveau_perf_rammap(struct drm_device *, u32 freq, u8 *ver,
+                       u8 *hdr, u8 *cnt, u8 *len);
 u8 *nouveau_perf_ramcfg(struct drm_device *, u32 freq, u8 *ver, u8 *len);
+u8 *nouveau_perf_timing(struct drm_device *, u32 freq, u8 *ver, u8 *len);
 
 /* nouveau_mem.c */
 void nouveau_mem_timing_init(struct drm_device *);

diff --git a/drivers/gpu/drm/nouveau/nva3_pm.c b/drivers/gpu/drm/nouveau/nva3_pm.c
index 3d397845dca969b8572514e995f91f95a5e536c9..86d0de0847845ec246e9ee4b023f282a69923516 100644 (file)
--- a/drivers/gpu/drm/nouveau/nva3_pm.c
+++ b/drivers/gpu/drm/nouveau/nva3_pm.c
@@ -354,8 +354,11 @@ mclk_mrs(struct nouveau_mem_exec_func *exec, int mr, u32 data)
 static void
 mclk_clock_set(struct nouveau_mem_exec_func *exec)
 {
-       struct nva3_pm_state *info = exec->priv;
        struct drm_device *dev = exec->dev;
+       struct nva3_pm_state *info = exec->priv;
+       struct nouveau_pm_level *perflvl = info->perflvl;
+       u32 freq = perflvl->memory;
+       u8 *rammap, *ramcfg, ver, hdr, cnt, len;
 
        nv_wr32(dev, 0x004018, 0x00001000);
 
@@ -365,6 +368,26 @@ mclk_clock_set(struct nouveau_mem_exec_func *exec)
                nv_wr32(dev, 0x004018, 0x1000d000);
        else
                nv_wr32(dev, 0x004018, 0x10005000);
+
+       rammap = nouveau_perf_rammap(dev, freq, &ver, &hdr, &cnt, &len);
+       if (rammap && ver == 0x10 && hdr >= 5) {
+               ramcfg = nouveau_perf_ramcfg(dev, freq, &ver, &len);
+               if (ramcfg && (rammap[4] & 0x08)) {
+                       u32 unk5a0 = (ROM16(ramcfg[5]) << 8) | ramcfg[5];
+                       u32 unk5a4 = ROM16(ramcfg[7]);
+                       u32 unk804 = (ramcfg[9] & 0xf0) << 16 |
+                                    (ramcfg[3] & 0x0f) << 16 |
+                                    (ramcfg[9] & 0x0f) |
+                                    0x80000000;
+                       nv_wr32(dev, 0x1005a0, unk5a0);
+                       nv_wr32(dev, 0x1005a4, unk5a4);
+                       nv_wr32(dev, 0x10f804, unk804);
+                       nv_mask(dev, 0x10053c, 0x00001000, 0x00000000);
+               } else {
+                       nv_mask(dev, 0x10053c, 0x00001000, 0x00001000);
+                       nv_mask(dev, 0x10f804, 0x80000000, 0x00000000);
+               }
+       }
 }
 
 static void