aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/nva3_pm.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2012-01-27 13:26:52 +1000
committerBen Skeggs <bskeggs@redhat.com>2012-05-24 16:31:18 +1000
commit30e533900ea74a3499dad5c4660ebaf80b50d152 (patch)
treeecacddf07fc3e3df6ab19960a5e2f293ef90d1c1 /drivers/gpu/drm/nouveau/nva3_pm.c
parent27740383dde9e1f309a74cf39d96f3223dbf281c (diff)
drm/nva3/pm: more random unknown PFB regs
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nva3_pm.c')
-rw-r--r--drivers/gpu/drm/nouveau/nva3_pm.c24
1 files changed, 23 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nva3_pm.c b/drivers/gpu/drm/nouveau/nva3_pm.c
index 86d0de084784..98588292c802 100644
--- a/drivers/gpu/drm/nouveau/nva3_pm.c
+++ b/drivers/gpu/drm/nouveau/nva3_pm.c
@@ -393,12 +393,34 @@ mclk_clock_set(struct nouveau_mem_exec_func *exec)
static void
mclk_timing_set(struct nouveau_mem_exec_func *exec)
{
+ struct drm_device *dev = exec->dev;
struct nva3_pm_state *info = exec->priv;
struct nouveau_pm_level *perflvl = info->perflvl;
+ u8 *ramcfg, ver, len;
int i;
for (i = 0; i < 9; i++)
- nv_wr32(exec->dev, 0x100220 + (i * 4), perflvl->timing.reg[i]);
+ nv_wr32(dev, 0x100220 + (i * 4), perflvl->timing.reg[i]);
+
+ ramcfg = nouveau_perf_ramcfg(dev, perflvl->memory, &ver, &len);
+ if (ramcfg) {
+ u32 unk714 = nv_rd32(dev, 0x100714) & ~0xf0000010;
+ u32 unk718 = nv_rd32(dev, 0x100718) & ~0x00000100;
+ u32 unk71c = nv_rd32(dev, 0x10071c) & ~0x00000100;
+ if ( (ramcfg[2] & 0x20))
+ unk714 |= 0xf0000000;
+ if (!(ramcfg[2] & 0x04))
+ unk714 |= 0x00000010;
+ nv_wr32(dev, 0x100714, unk714);
+
+ if (ramcfg[2] & 0x01)
+ unk71c |= 0x00000100;
+ nv_wr32(dev, 0x10071c, unk71c);
+
+ if (ramcfg[2] & 0x02)
+ unk718 |= 0x00000100;
+ nv_wr32(dev, 0x100718, unk718);
+ }
}
static void