drm/nouveau/bios: parse older ramcfg/timing data like we do newer ones

Done after discussion with Roy.

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

diff --git a/drivers/gpu/drm/nouveau/core/include/subdev/bios/ramcfg.h b/drivers/gpu/drm/nouveau/core/include/subdev/bios/ramcfg.h
index 7e5b0673314355f36ef2431a7df8df479b0d2f99..a685bbd045680529e33d6d54e78a0359ab61c0cb 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/include/subdev/bios/ramcfg.h
+++ b/drivers/gpu/drm/nouveau/core/include/subdev/bios/ramcfg.h
@@ -8,76 +8,114 @@ struct nvbios_ramcfg {
        unsigned rammap_hdr;
        unsigned rammap_min;
        unsigned rammap_max;
-       unsigned rammap_11_08_01:1;
-       unsigned rammap_11_08_0c:2;
-       unsigned rammap_11_08_10:1;
-       unsigned rammap_11_09_01ff:9;
-       unsigned rammap_11_0a_03fe:9;
-       unsigned rammap_11_0a_0400:1;
-       unsigned rammap_11_0a_0800:1;
-       unsigned rammap_11_0b_01f0:5;
-       unsigned rammap_11_0b_0200:1;
-       unsigned rammap_11_0b_0400:1;
-       unsigned rammap_11_0b_0800:1;
-       unsigned rammap_11_0d:8;
-       unsigned rammap_11_0e:8;
-       unsigned rammap_11_0f:8;
-       unsigned rammap_11_11_0c:2;
+       union {
+               struct {
+                       unsigned rammap_10_04_02:1;
+                       unsigned rammap_10_04_08:1;
+               };
+               struct {
+                       unsigned rammap_11_08_01:1;
+                       unsigned rammap_11_08_0c:2;
+                       unsigned rammap_11_08_10:1;
+                       unsigned rammap_11_09_01ff:9;
+                       unsigned rammap_11_0a_03fe:9;
+                       unsigned rammap_11_0a_0400:1;
+                       unsigned rammap_11_0a_0800:1;
+                       unsigned rammap_11_0b_01f0:5;
+                       unsigned rammap_11_0b_0200:1;
+                       unsigned rammap_11_0b_0400:1;
+                       unsigned rammap_11_0b_0800:1;
+                       unsigned rammap_11_0d:8;
+                       unsigned rammap_11_0e:8;
+                       unsigned rammap_11_0f:8;
+                       unsigned rammap_11_11_0c:2;
+               };
+       };
 
        unsigned ramcfg_ver;
        unsigned ramcfg_hdr;
        unsigned ramcfg_timing;
-       unsigned ramcfg_11_01_01:1;
-       unsigned ramcfg_11_01_02:1;
-       unsigned ramcfg_11_01_04:1;
-       unsigned ramcfg_11_01_08:1;
-       unsigned ramcfg_11_01_10:1;
-       unsigned ramcfg_11_01_20:1;
-       unsigned ramcfg_11_01_40:1;
-       unsigned ramcfg_11_01_80:1;
-       unsigned ramcfg_11_02_03:2;
-       unsigned ramcfg_11_02_04:1;
-       unsigned ramcfg_11_02_08:1;
-       unsigned ramcfg_11_02_10:1;
-       unsigned ramcfg_11_02_40:1;
-       unsigned ramcfg_11_02_80:1;
-       unsigned ramcfg_11_03_0f:4;
-       unsigned ramcfg_11_03_30:2;
-       unsigned ramcfg_11_03_c0:2;
-       unsigned ramcfg_11_03_f0:4;
-       unsigned ramcfg_11_04:8;
-       unsigned ramcfg_11_06:8;
-       unsigned ramcfg_11_07_02:1;
-       unsigned ramcfg_11_07_04:1;
-       unsigned ramcfg_11_07_08:1;
-       unsigned ramcfg_11_07_10:1;
-       unsigned ramcfg_11_07_40:1;
-       unsigned ramcfg_11_07_80:1;
-       unsigned ramcfg_11_08_01:1;
-       unsigned ramcfg_11_08_02:1;
-       unsigned ramcfg_11_08_04:1;
-       unsigned ramcfg_11_08_08:1;
-       unsigned ramcfg_11_08_10:1;
-       unsigned ramcfg_11_08_20:1;
-       unsigned ramcfg_11_09:8;
+       union {
+               struct {
+                       unsigned ramcfg_10_02_01:1;
+                       unsigned ramcfg_10_02_02:1;
+                       unsigned ramcfg_10_02_04:1;
+                       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_03_0f:4;
+                       unsigned ramcfg_10_05:8;
+                       unsigned ramcfg_10_06:8;
+                       unsigned ramcfg_10_07:8;
+                       unsigned ramcfg_10_08:8;
+                       unsigned ramcfg_10_09_0f:4;
+                       unsigned ramcfg_10_09_f0:4;
+               };
+               struct {
+                       unsigned ramcfg_11_01_01:1;
+                       unsigned ramcfg_11_01_02:1;
+                       unsigned ramcfg_11_01_04:1;
+                       unsigned ramcfg_11_01_08:1;
+                       unsigned ramcfg_11_01_10:1;
+                       unsigned ramcfg_11_01_20:1;
+                       unsigned ramcfg_11_01_40:1;
+                       unsigned ramcfg_11_01_80:1;
+                       unsigned ramcfg_11_02_03:2;
+                       unsigned ramcfg_11_02_04:1;
+                       unsigned ramcfg_11_02_08:1;
+                       unsigned ramcfg_11_02_10:1;
+                       unsigned ramcfg_11_02_40:1;
+                       unsigned ramcfg_11_02_80:1;
+                       unsigned ramcfg_11_03_0f:4;
+                       unsigned ramcfg_11_03_30:2;
+                       unsigned ramcfg_11_03_c0:2;
+                       unsigned ramcfg_11_03_f0:4;
+                       unsigned ramcfg_11_04:8;
+                       unsigned ramcfg_11_06:8;
+                       unsigned ramcfg_11_07_02:1;
+                       unsigned ramcfg_11_07_04:1;
+                       unsigned ramcfg_11_07_08:1;
+                       unsigned ramcfg_11_07_10:1;
+                       unsigned ramcfg_11_07_40:1;
+                       unsigned ramcfg_11_07_80:1;
+                       unsigned ramcfg_11_08_01:1;
+                       unsigned ramcfg_11_08_02:1;
+                       unsigned ramcfg_11_08_04:1;
+                       unsigned ramcfg_11_08_08:1;
+                       unsigned ramcfg_11_08_10:1;
+                       unsigned ramcfg_11_08_20:1;
+                       unsigned ramcfg_11_09:8;
+               };
+       };
 
        unsigned timing_ver;
        unsigned timing_hdr;
        unsigned timing[11];
-       unsigned timing_20_2e_03:2;
-       unsigned timing_20_2e_30:2;
-       unsigned timing_20_2e_c0:2;
-       unsigned timing_20_2f_03:2;
-       unsigned timing_20_2c_003f:6;
-       unsigned timing_20_2c_1fc0:7;
-       unsigned timing_20_30_f8:5;
-       unsigned timing_20_30_07:3;
-       unsigned timing_20_31_0007:3;
-       unsigned timing_20_31_0078:4;
-       unsigned timing_20_31_0780:4;
-       unsigned timing_20_31_0800:1;
-       unsigned timing_20_31_7000:3;
-       unsigned timing_20_31_8000:1;
+       union {
+               struct {
+                       unsigned timing_10_WR:8;
+                       unsigned timing_10_CL:8;
+                       unsigned timing_10_ODT:3;
+                       unsigned timing_10_CWL:8;
+               };
+               struct {
+                       unsigned timing_20_2e_03:2;
+                       unsigned timing_20_2e_30:2;
+                       unsigned timing_20_2e_c0:2;
+                       unsigned timing_20_2f_03:2;
+                       unsigned timing_20_2c_003f:6;
+                       unsigned timing_20_2c_1fc0:7;
+                       unsigned timing_20_30_f8:5;
+                       unsigned timing_20_30_07:3;
+                       unsigned timing_20_31_0007:3;
+                       unsigned timing_20_31_0078:4;
+                       unsigned timing_20_31_0780:4;
+                       unsigned timing_20_31_0800:1;
+                       unsigned timing_20_31_7000:3;
+                       unsigned timing_20_31_8000:1;
+               };
+       };
 };
 
 u8 nvbios_ramcfg_count(struct nouveau_bios *);

diff --git a/drivers/gpu/drm/nouveau/core/include/subdev/fb.h b/drivers/gpu/drm/nouveau/core/include/subdev/fb.h
index 507c3b44e560fa405c5683d5c657d1ab4130ac4a..8d0032f152054f57dbe0b0e4f35e784b50171e56 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/include/subdev/fb.h
+++ b/drivers/gpu/drm/nouveau/core/include/subdev/fb.h
@@ -146,11 +146,6 @@ struct nouveau_ram {
        int  (*calc)(struct nouveau_fb *, u32 freq);
        int  (*prog)(struct nouveau_fb *);
        void (*tidy)(struct nouveau_fb *);
-       struct {
-               u8  version;
-               u32 data;
-               u8  size;
-       } rammap, ramcfg, timing;
        u32 freq;
        u32 mr[16];
        u32 mr1_nuts;

diff --git a/drivers/gpu/drm/nouveau/core/subdev/bios/rammap.c b/drivers/gpu/drm/nouveau/core/subdev/bios/rammap.c
index ae3d956aec997e61c56e0df1477d460b890f5256..585e69331ccce91ac3bc694e7fc09942a06ba993 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/bios/rammap.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/bios/rammap.c
@@ -87,6 +87,8 @@ nvbios_rammapEp(struct nouveau_bios *bios, int idx,
        case 0x10:
                p->rammap_min      =  nv_ro16(bios, data + 0x00);
                p->rammap_max      =  nv_ro16(bios, data + 0x02);
+               p->rammap_10_04_02 = (nv_ro08(bios, data + 0x04) & 0x02) >> 1;
+               p->rammap_10_04_08 = (nv_ro08(bios, data + 0x04) & 0x08) >> 3;
                break;
        case 0x11:
                p->rammap_min      =  nv_ro16(bios, data + 0x00);
@@ -152,6 +154,23 @@ nvbios_rammapSp(struct nouveau_bios *bios, u32 data,
        p->ramcfg_ver = *ver;
        p->ramcfg_hdr = *hdr;
        switch (!!data * *ver) {
+       case 0x10:
+               p->ramcfg_timing   =  nv_ro08(bios, data + 0x01);
+               p->ramcfg_10_02_01 = (nv_ro08(bios, data + 0x02) & 0x01) >> 0;
+               p->ramcfg_10_02_02 = (nv_ro08(bios, data + 0x02) & 0x02) >> 1;
+               p->ramcfg_10_02_04 = (nv_ro08(bios, data + 0x02) & 0x04) >> 2;
+               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_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;
+               p->ramcfg_10_07    = (nv_ro08(bios, data + 0x07) & 0xff) >> 0;
+               p->ramcfg_10_08    = (nv_ro08(bios, data + 0x08) & 0xff) >> 0;
+               p->ramcfg_10_09_0f = (nv_ro08(bios, data + 0x09) & 0x0f) >> 0;
+               p->ramcfg_10_09_f0 = (nv_ro08(bios, data + 0x09) & 0xf0) >> 4;
+               break;
        case 0x11:
                p->ramcfg_timing   =  nv_ro08(bios, data + 0x00);
                p->ramcfg_11_01_01 = (nv_ro08(bios, data + 0x01) & 0x01) >> 0;

diff --git a/drivers/gpu/drm/nouveau/core/subdev/bios/timing.c b/drivers/gpu/drm/nouveau/core/subdev/bios/timing.c
index c320bfdd1102a946b24bb5937822aacfb07bb88f..46d955eb51eba6f956b238d0134fb2043fec7bd4 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/bios/timing.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/bios/timing.c
@@ -92,6 +92,12 @@ nvbios_timingEp(struct nouveau_bios *bios, int idx,
        p->timing_ver = *ver;
        p->timing_hdr = *hdr;
        switch (!!data * *ver) {
+       case 0x10:
+               p->timing_10_WR = nv_ro08(bios, data + 0x00);
+               p->timing_10_CL = nv_ro08(bios, data + 0x02);
+               p->timing_10_ODT = nv_ro08(bios, data + 0x0e) & 0x07;
+               p->timing_10_CWL = nv_ro08(bios, data + 0x13);
+               break;
        case 0x20:
                p->timing[0] = nv_ro32(bios, data + 0x00);
                p->timing[1] = nv_ro32(bios, data + 0x04);

diff --git a/drivers/gpu/drm/nouveau/core/subdev/fb/ramnva3.c b/drivers/gpu/drm/nouveau/core/subdev/fb/ramnva3.c
index c2037b943d00a03159860294ae2f00905a910426..3601deca0bd5d01dd81920fc789aa5a96e148950 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/fb/ramnva3.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/fb/ramnva3.c
@@ -79,21 +79,27 @@ nva3_ram_calc(struct nouveau_fb *pfb, u32 freq)
        struct nva3_ram *ram = (void *)pfb->ram;
        struct nva3_ramfuc *fuc = &ram->fuc;
        struct nva3_clock_info mclk;
-       struct nvbios_ramcfg cfg;
-       u8  ver, cnt, len, strap;
+       struct nouveau_ram_data *next;
+       u8  ver, hdr, cnt, len, strap;
        u32 data;
-       struct {
-               u32 data;
-               u8  size;
-       } rammap, ramcfg, timing;
        u32 r004018, r100760, ctrl;
        u32 unk714, unk718, unk71c;
-       int ret;
+       int ret, i;
+
+       next = &ram->base.target;
+       next->freq = freq;
+       ram->base.next = next;
 
        /* lookup memory config data relevant to the target frequency */
-       rammap.data = nvbios_rammapEm(bios, freq / 1000, &ver, &rammap.size,
-                                    &cnt, &ramcfg.size, &cfg);
-       if (!rammap.data || ver != 0x10 || rammap.size < 0x0e) {
+       i = 0;
+       while ((data = nvbios_rammapEp(bios, i++, &ver, &hdr, &cnt, &len,
+                                     &next->bios))) {
+               if (freq / 1000 >= next->bios.rammap_min &&
+                   freq / 1000 <= next->bios.rammap_max)
+                       break;
+       }
+
+       if (!data || ver != 0x10 || hdr < 0x0e) {
                nv_error(pfb, "invalid/missing rammap entry\n");
                return -EINVAL;
        }
@@ -105,23 +111,22 @@ nva3_ram_calc(struct nouveau_fb *pfb, u32 freq)
                return -EINVAL;
        }
 
-       ramcfg.data = rammap.data + rammap.size + (strap * ramcfg.size);
-       if (!ramcfg.data || ver != 0x10 || ramcfg.size < 0x0e) {
+       data = nvbios_rammapSp(bios, data, ver, hdr, cnt, len, strap,
+                              &ver, &hdr, &next->bios);
+       if (!data || ver != 0x10 || hdr < 0x0e) {
                nv_error(pfb, "invalid/missing ramcfg entry\n");
                return -EINVAL;
        }
 
        /* lookup memory timings, if bios says they're present */
-       strap = nv_ro08(bios, ramcfg.data + 0x01);
-       if (strap != 0xff) {
-               timing.data = nvbios_timingEe(bios, strap, &ver, &timing.size,
-                                            &cnt, &len);
-               if (!timing.data || ver != 0x10 || timing.size < 0x19) {
+       if (next->bios.ramcfg_timing != 0xff) {
+               data = nvbios_timingEp(bios, next->bios.ramcfg_timing,
+                                      &ver, &hdr, &cnt, &len,
+                                      &next->bios);
+               if (!data || ver != 0x10 || hdr < 0x19) {
                        nv_error(pfb, "invalid/missing timing entry\n");
                        return -EINVAL;
                }
-       } else {
-               timing.data = 0;
        }
 
        ret = nva3_pll_info(nouveau_clock(pfb), 0x12, 0x4000, freq, &mclk);
@@ -164,17 +169,17 @@ nva3_ram_calc(struct nouveau_fb *pfb, u32 freq)
                ram_mask(fuc, 0x004168, 0x003f3141, ctrl);
        }
 
-       if ( (nv_ro08(bios, ramcfg.data + 0x02) & 0x10)) {
+       if (next->bios.ramcfg_10_02_10) {
                ram_mask(fuc, 0x111104, 0x00000600, 0x00000000);
        } else {
                ram_mask(fuc, 0x111100, 0x40000000, 0x40000000);
                ram_mask(fuc, 0x111104, 0x00000180, 0x00000000);
        }
 
-       if (!(nv_ro08(bios, rammap.data + 0x04) & 0x02))
+       if (!next->bios.rammap_10_04_02)
                ram_mask(fuc, 0x100200, 0x00000800, 0x00000000);
        ram_wr32(fuc, 0x611200, 0x00003300);
-       if (!(nv_ro08(bios, ramcfg.data + 0x02) & 0x10))
+       if (!next->bios.ramcfg_10_02_10)
                ram_wr32(fuc, 0x111100, 0x4c020000); /*XXX*/
 
        ram_wr32(fuc, 0x1002d4, 0x00000001);
@@ -203,17 +208,16 @@ nva3_ram_calc(struct nouveau_fb *pfb, u32 freq)
                ram_wr32(fuc, 0x004018, 0x0000d000 | r004018);
        }
 
-       if ( (nv_ro08(bios, rammap.data + 0x04) & 0x08)) {
-               u32 unk5a0 = (nv_ro16(bios, ramcfg.data + 0x05) << 8) |
-                             nv_ro08(bios, ramcfg.data + 0x05);
-               u32 unk5a4 = (nv_ro16(bios, ramcfg.data + 0x07));
-               u32 unk804 = (nv_ro08(bios, ramcfg.data + 0x09) & 0xf0) << 16 |
-                            (nv_ro08(bios, ramcfg.data + 0x03) & 0x0f) << 16 |
-                            (nv_ro08(bios, ramcfg.data + 0x09) & 0x0f) |
-                            0x80000000;
-               ram_wr32(fuc, 0x1005a0, unk5a0);
-               ram_wr32(fuc, 0x1005a4, unk5a4);
-               ram_wr32(fuc, 0x10f804, unk804);
+       if (next->bios.rammap_10_04_08) {
+               ram_wr32(fuc, 0x1005a0, next->bios.ramcfg_10_06 << 16 |
+                                       next->bios.ramcfg_10_05 << 8 |
+                                       next->bios.ramcfg_10_05);
+               ram_wr32(fuc, 0x1005a4, next->bios.ramcfg_10_08 << 8 |
+                                       next->bios.ramcfg_10_07);
+               ram_wr32(fuc, 0x10f804, next->bios.ramcfg_10_09_f0 << 20 |
+                                       next->bios.ramcfg_10_03_0f << 16 |
+                                       next->bios.ramcfg_10_09_0f |
+                                       0x80000000);
                ram_mask(fuc, 0x10053c, 0x00001000, 0x00000000);
        } else {
                ram_mask(fuc, 0x10053c, 0x00001000, 0x00001000);
@@ -251,27 +255,26 @@ nva3_ram_calc(struct nouveau_fb *pfb, u32 freq)
        ram_mask(fuc, 0x100220[0], 0x00000000, 0x00000000);
        ram_mask(fuc, 0x100220[8], 0x00000000, 0x00000000);
 
-       data = (nv_ro08(bios, ramcfg.data + 0x02) & 0x08) ? 0x00000000 : 0x00001000;
-       ram_mask(fuc, 0x100200, 0x00001000, data);
+       ram_mask(fuc, 0x100200, 0x00001000, !next->bios.ramcfg_10_02_08 << 12);
 
        unk714 = ram_rd32(fuc, 0x100714) & ~0xf0000010;
        unk718 = ram_rd32(fuc, 0x100718) & ~0x00000100;
        unk71c = ram_rd32(fuc, 0x10071c) & ~0x00000100;
-       if ( (nv_ro08(bios, ramcfg.data + 0x02) & 0x20))
+       if (next->bios.ramcfg_10_02_20)
                unk714 |= 0xf0000000;
-       if (!(nv_ro08(bios, ramcfg.data + 0x02) & 0x04))
+       if (!next->bios.ramcfg_10_02_04)
                unk714 |= 0x00000010;
        ram_wr32(fuc, 0x100714, unk714);
 
-       if (nv_ro08(bios, ramcfg.data + 0x02) & 0x01)
+       if (next->bios.ramcfg_10_02_01)
                unk71c |= 0x00000100;
        ram_wr32(fuc, 0x10071c, unk71c);
 
-       if (nv_ro08(bios, ramcfg.data + 0x02) & 0x02)
+       if (next->bios.ramcfg_10_02_02)
                unk718 |= 0x00000100;
        ram_wr32(fuc, 0x100718, unk718);
 
-       if (nv_ro08(bios, ramcfg.data + 0x02) & 0x10)
+       if (next->bios.ramcfg_10_02_10)
                ram_wr32(fuc, 0x111100, 0x48000000); /*XXX*/
 
        ram_mask(fuc, mr[0], 0x100, 0x100);
@@ -283,9 +286,9 @@ nva3_ram_calc(struct nouveau_fb *pfb, u32 freq)
        ram_nsec(fuc, 12000);
 
        ram_wr32(fuc, 0x611200, 0x00003330);
-       if ( (nv_ro08(bios, rammap.data + 0x04) & 0x02))
+       if (next->bios.rammap_10_04_02)
                ram_mask(fuc, 0x100200, 0x00000800, 0x00000800);
-       if ( (nv_ro08(bios, ramcfg.data + 0x02) & 0x10)) {
+       if (next->bios.ramcfg_10_02_10) {
                ram_mask(fuc, 0x111104, 0x00000180, 0x00000180);
                ram_mask(fuc, 0x111100, 0x40000000, 0x00000000);
        } else {

diff --git a/drivers/gpu/drm/nouveau/core/subdev/fb/sddr2.c b/drivers/gpu/drm/nouveau/core/subdev/fb/sddr2.c
index b5b043238e6cad1a8a7bd58fa0705be1b26ad8df..bb1eb8f3e63918bdbcc82c5eb0b97af3370b7879 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/fb/sddr2.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/fb/sddr2.c
@@ -23,7 +23,6 @@
  *          Ben Skeggs
  */
 
-#include <subdev/bios.h>
 #include "priv.h"
 
 struct ramxlat {
@@ -61,19 +60,18 @@ ramddr2_wr[] = {
 int
 nouveau_sddr2_calc(struct nouveau_ram *ram)
 {
-       struct nouveau_bios *bios = nouveau_bios(ram);
        int CL, WR, DLL = 0, ODT = 0;
 
-       switch (!!ram->timing.data * ram->timing.version) {
+       switch (ram->next->bios.timing_ver) {
        case 0x10:
-               CL  =   nv_ro08(bios, ram->timing.data + 0x02);
-               WR  =   nv_ro08(bios, ram->timing.data + 0x00);
-               DLL = !(nv_ro08(bios, ram->ramcfg.data + 0x02) & 0x40);
-               ODT =   nv_ro08(bios, ram->timing.data + 0x0e) & 0x03;
+               CL  = ram->next->bios.timing_10_CL;
+               WR  = ram->next->bios.timing_10_WR;
+               DLL = !ram->next->bios.ramcfg_10_02_40;
+               ODT = ram->next->bios.timing_10_ODT & 3;
                break;
        case 0x20:
-               CL  =  nv_ro08(bios, ram->timing.data + 0x04) & 0x1f;
-               WR  =  nv_ro08(bios, ram->timing.data + 0x0a) & 0x7f;
+               CL  = (ram->next->bios.timing[1] & 0x0000001f);
+               WR  = (ram->next->bios.timing[2] & 0x007f0000) >> 16;
                break;
        default:
                return -ENOSYS;

diff --git a/drivers/gpu/drm/nouveau/core/subdev/fb/sddr3.c b/drivers/gpu/drm/nouveau/core/subdev/fb/sddr3.c
index 3d77fc5add77c9e555fee3bf7595f1bd8ee0c359..83949b11833af46ca1537904691ca7d13112133a 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/fb/sddr3.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/fb/sddr3.c
@@ -23,7 +23,6 @@
  *         Roy Spliet <rspliet@eclipso.eu>
  */
 
-#include <subdev/bios.h>
 #include "priv.h"
 
 struct ramxlat {
@@ -70,25 +69,19 @@ ramddr3_cwl[] = {
 int
 nouveau_sddr3_calc(struct nouveau_ram *ram)
 {
-       struct nouveau_bios *bios = nouveau_bios(ram);
        int CWL, CL, WR, DLL = 0, ODT = 0;
-       u8 ver;
 
-       ver = !!ram->timing.data * ram->timing.version;
-       if (ram->next)
-               ver = ram->next->bios.timing_ver;
-
-       switch (ver) {
+       switch (ram->next->bios.timing_ver) {
        case 0x10:
-               if (ram->timing.size < 0x17) {
+               if (ram->next->bios.timing_hdr < 0x17) {
                        /* XXX: NV50: Get CWL from the timing register */
                        return -ENOSYS;
                }
-               CWL =   nv_ro08(bios, ram->timing.data + 0x13);
-               CL  =   nv_ro08(bios, ram->timing.data + 0x02);
-               WR  =   nv_ro08(bios, ram->timing.data + 0x00);
-               DLL = !(nv_ro08(bios, ram->ramcfg.data + 0x02) & 0x40);
-               ODT =   nv_ro08(bios, ram->timing.data + 0x0e) & 0x07;
+               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;
+               ODT = ram->next->bios.timing_10_ODT;
                break;
        case 0x20:
                CWL = (ram->next->bios.timing[1] & 0x00000f80) >> 7;