diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2013-11-27 21:45:02 -0500 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2014-01-22 22:38:53 -0500 |
commit | 09692e5b4efb1ed1d91b4e9e4c7a31b7dbe06f03 (patch) | |
tree | 0718b79427bda858d1a4177990ee2f316d38433e | |
parent | 1e1d6b4c530350802a3aacd2a702631cef66fcaa (diff) |
drm/nve0/fb/gddr5: note another semi-unknown
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c b/drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c index b0b9939c2098..abaace7bcc74 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c +++ b/drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c | |||
@@ -466,20 +466,23 @@ nve0_ram_calc_gddr5(struct nouveau_fb *pfb, u32 freq) | |||
466 | ram_mask(fuc, 0x10f2cc, 0xffffffff, nv_ro32(bios, timing + 0x20)); | 466 | ram_mask(fuc, 0x10f2cc, 0xffffffff, nv_ro32(bios, timing + 0x20)); |
467 | ram_mask(fuc, 0x10f2e8, 0xffffffff, nv_ro32(bios, timing + 0x24)); | 467 | ram_mask(fuc, 0x10f2e8, 0xffffffff, nv_ro32(bios, timing + 0x24)); |
468 | 468 | ||
469 | data = (nv_ro08(bios, ramcfg + 0x02) & 0x03) << 8; | 469 | /*XXX: what's the condition here? */ |
470 | if (nv_ro08(bios, ramcfg + 0x01) & 0x10) | 470 | if (1) { |
471 | data |= 0x70000000; | 471 | data = (nv_ro08(bios, ramcfg + 0x02) & 0x03) << 8; |
472 | ram_mask(fuc, 0x10f604, 0x70000300, data); | 472 | if (nv_ro08(bios, ramcfg + 0x01) & 0x10) |
473 | 473 | data |= 0x70000000; | |
474 | data = (nv_ro08(bios, timing + 0x30) & 0x07) << 28; | 474 | ram_mask(fuc, 0x10f604, 0x70000300, data); |
475 | if (nv_ro08(bios, ramcfg + 0x01) & 0x01) | 475 | |
476 | data |= 0x00000100; | 476 | data = (nv_ro08(bios, timing + 0x30) & 0x07) << 28; |
477 | ram_mask(fuc, 0x10f614, 0x70000000, data); | 477 | if (nv_ro08(bios, ramcfg + 0x01) & 0x01) |
478 | 478 | data |= 0x00000100; | |
479 | data = (nv_ro08(bios, timing + 0x30) & 0x07) << 28; | 479 | ram_mask(fuc, 0x10f614, 0x70000000, data); |
480 | if (nv_ro08(bios, ramcfg + 0x01) & 0x02) | 480 | |
481 | data |= 0x00000100; | 481 | data = (nv_ro08(bios, timing + 0x30) & 0x07) << 28; |
482 | ram_mask(fuc, 0x10f610, 0x70000000, data); | 482 | if (nv_ro08(bios, ramcfg + 0x01) & 0x02) |
483 | data |= 0x00000100; | ||
484 | ram_mask(fuc, 0x10f610, 0x70000000, data); | ||
485 | } | ||
483 | 486 | ||
484 | mask = 0x33f00000; | 487 | mask = 0x33f00000; |
485 | data = 0x00000000; | 488 | data = 0x00000000; |