diff options
| author | Roy Spliet <rspliet@eclipso.eu> | 2014-10-02 18:01:50 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-11-06 15:15:37 +1000 |
| commit | f1e1c6f6e6354b80ea3f3610da0d6ce56caf3420 (patch) | |
| tree | d4839f832ac805e4d7767585e025a9cec8b77fe5 | |
| parent | 0300a693f81769775c777259487de5c8993e2cee (diff) | |
| download | nouveau-f1e1c6f6e6354b80ea3f3610da0d6ce56caf3420.tar.gz | |
bios/ramcfg: 10_02_40 -> DLLoff
Signed-off-by: Roy Spliet <rspliet@eclipso.eu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | nvkm/include/subdev/bios/ramcfg.h | 2 | ||||
| -rw-r--r-- | nvkm/subdev/bios/rammap.c | 2 | ||||
| -rw-r--r-- | nvkm/subdev/fb/sddr2.c | 2 | ||||
| -rw-r--r-- | nvkm/subdev/fb/sddr3.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/nvkm/include/subdev/bios/ramcfg.h b/nvkm/include/subdev/bios/ramcfg.h index a685bbd04..ae3f17d95 100644 --- a/nvkm/include/subdev/bios/ramcfg.h +++ b/nvkm/include/subdev/bios/ramcfg.h @@ -43,7 +43,7 @@ struct nvbios_ramcfg { unsigned ramcfg_10_02_08:1; unsigned ramcfg_10_02_10:1; unsigned ramcfg_10_02_20:1; - unsigned ramcfg_10_02_40:1; + unsigned ramcfg_10_DLLoff:1; unsigned ramcfg_10_03_0f:4; unsigned ramcfg_10_05:8; unsigned ramcfg_10_06:8; diff --git a/nvkm/subdev/bios/rammap.c b/nvkm/subdev/bios/rammap.c index 585e69331..24dc9b3b8 100644 --- a/nvkm/subdev/bios/rammap.c +++ b/nvkm/subdev/bios/rammap.c @@ -162,7 +162,7 @@ nvbios_rammapSp(struct nouveau_bios *bios, u32 data, p->ramcfg_10_02_08 = (nv_ro08(bios, data + 0x02) & 0x08) >> 3; p->ramcfg_10_02_10 = (nv_ro08(bios, data + 0x02) & 0x10) >> 4; p->ramcfg_10_02_20 = (nv_ro08(bios, data + 0x02) & 0x20) >> 5; - p->ramcfg_10_02_40 = (nv_ro08(bios, data + 0x02) & 0x40) >> 6; + p->ramcfg_10_DLLoff = (nv_ro08(bios, data + 0x02) & 0x40) >> 6; p->ramcfg_10_03_0f = (nv_ro08(bios, data + 0x03) & 0x0f) >> 0; p->ramcfg_10_05 = (nv_ro08(bios, data + 0x05) & 0xff) >> 0; p->ramcfg_10_06 = (nv_ro08(bios, data + 0x06) & 0xff) >> 0; diff --git a/nvkm/subdev/fb/sddr2.c b/nvkm/subdev/fb/sddr2.c index bb1eb8f3e..252575f3a 100644 --- a/nvkm/subdev/fb/sddr2.c +++ b/nvkm/subdev/fb/sddr2.c @@ -66,7 +66,7 @@ nouveau_sddr2_calc(struct nouveau_ram *ram) case 0x10: CL = ram->next->bios.timing_10_CL; WR = ram->next->bios.timing_10_WR; - DLL = !ram->next->bios.ramcfg_10_02_40; + DLL = !ram->next->bios.ramcfg_10_DLLoff; ODT = ram->next->bios.timing_10_ODT & 3; break; case 0x20: diff --git a/nvkm/subdev/fb/sddr3.c b/nvkm/subdev/fb/sddr3.c index 83949b118..a2dca4869 100644 --- a/nvkm/subdev/fb/sddr3.c +++ b/nvkm/subdev/fb/sddr3.c @@ -80,7 +80,7 @@ nouveau_sddr3_calc(struct nouveau_ram *ram) CWL = ram->next->bios.timing_10_CWL; CL = ram->next->bios.timing_10_CL; WR = ram->next->bios.timing_10_WR; - DLL = !ram->next->bios.ramcfg_10_02_40; + DLL = !ram->next->bios.ramcfg_10_DLLoff; ODT = ram->next->bios.timing_10_ODT; break; case 0x20: |