lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm/nouveau/pm: track mr2 for gddr3

Browse Source 
There's some "extended" GDDR3 chipsets out there with EMRS2 settings that
change the layout of MRS/EMRS1 bitmaps.. Sigh.. Still need to track down
how exactly we're supposed to handle this.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Martin Peres <martin.peres@labri.fr>
This commit is contained in:
Ben Skeggs
2012-01-24 10:24:05 +10:00
parent c57ebf5ef3
commit 1a7287ea6f
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/nouveau/nouveau_mem.c
View File

@@ -766,8 +766,10 @@ nouveau_mem_gddr3_mr(struct drm_device *dev, u32 freq,
t->mr[1] = (boot->mr[1] & 0x100f40) | t->drive_strength | t->mr[1] = (boot->mr[1] & 0x100f40) | t->drive_strength |
(t->odt << 2) | (t->odt << 2) |
(nv_mem_wr_lut_gddr3[e->tWR] & 0xf) << 4; (nv_mem_wr_lut_gddr3[e->tWR] & 0xf) << 4;
t->mr[2] = boot->mr[2];
NV_DEBUG(dev, "(%u) MR: %08x %08x", t->id, t->mr[0], t->mr[1]); NV_DEBUG(dev, "(%u) MR: %08x %08x %08x", t->id,
t->mr[0], t->mr[1], t->mr[2]);
return 0; return 0;
} }
@@ -963,6 +965,7 @@ nouveau_mem_exec(struct nouveau_mem_exec_func *exec,
/* fetch current MRs */ /* fetch current MRs */
switch (dev_priv->vram_type) { switch (dev_priv->vram_type) {
case NV_MEM_TYPE_GDDR3:
case NV_MEM_TYPE_DDR3: case NV_MEM_TYPE_DDR3:
mr[2] = exec->mrg(exec, 2); mr[2] = exec->mrg(exec, 2);
default: default: