diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2013-12-01 18:25:54 -0500 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2014-01-22 22:38:56 -0500 |
commit | 971372eac18294ad31c137503881426b8094550b (patch) | |
tree | 473f0541246e1c7b63eae773b92edd867bfd4d05 | |
parent | db6735cab2b0f12a824f04b1d8fb4da2ea978c8d (diff) |
drm/nve0/fb: note the memory voltage toggle, not using it yet
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/fb/gddr5.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/fb/gddr5.c b/drivers/gpu/drm/nouveau/core/subdev/fb/gddr5.c index ee8ac5ba22c8..1427ae3828d1 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/fb/gddr5.c +++ b/drivers/gpu/drm/nouveau/core/subdev/fb/gddr5.c | |||
@@ -101,8 +101,8 @@ nouveau_gddr5_calc(struct nouveau_ram *ram, bool nuts) | |||
101 | 101 | ||
102 | if (!(ram->mr[7] & 0x100)) | 102 | if (!(ram->mr[7] & 0x100)) |
103 | vr = 0; /* binary driver does this.. bug? */ | 103 | vr = 0; /* binary driver does this.. bug? */ |
104 | ram->mr[7] &= ~0x188; | 104 | ram->mr[7] &= ~0x388; |
105 | ram->mr[7] |= (vr & 0x01) << 8; | 105 | ram->mr[7] |= (vr & 0x03) << 8; |
106 | ram->mr[7] |= (vh & 0x01) << 7; | 106 | ram->mr[7] |= (vh & 0x01) << 7; |
107 | ram->mr[7] |= (lf & 0x01) << 3; | 107 | ram->mr[7] |= (lf & 0x01) << 3; |
108 | 108 | ||
diff --git a/drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c b/drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c index a4c84d6f50e5..e0d63af19107 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c +++ b/drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c | |||
@@ -266,7 +266,7 @@ nve0_ram_calc_gddr5(struct nouveau_fb *pfb, u32 freq) | |||
266 | const u32 ramcfg = ram->base.ramcfg.data; | 266 | const u32 ramcfg = ram->base.ramcfg.data; |
267 | const u32 timing = ram->base.timing.data; | 267 | const u32 timing = ram->base.timing.data; |
268 | int vc = !(nv_ro08(bios, ramcfg + 0x02) & 0x08); | 268 | int vc = !(nv_ro08(bios, ramcfg + 0x02) & 0x08); |
269 | int mv = 1; /*XXX*/ | 269 | int mv = 1; /*XXX: !(nv_ro08(bios, ramcfg + 0x02) & 0x04); */ |
270 | u32 mask, data, i; | 270 | u32 mask, data, i; |
271 | 271 | ||
272 | ram_mask(fuc, 0x10f808, 0x40000000, 0x40000000); | 272 | ram_mask(fuc, 0x10f808, 0x40000000, 0x40000000); |
@@ -685,7 +685,7 @@ nve0_ram_calc_sddr3(struct nouveau_fb *pfb, u32 freq) | |||
685 | const u32 ramcfg = ram->base.ramcfg.data; | 685 | const u32 ramcfg = ram->base.ramcfg.data; |
686 | const u32 timing = ram->base.timing.data; | 686 | const u32 timing = ram->base.timing.data; |
687 | int vc = !(nv_ro08(bios, ramcfg + 0x02) & 0x08); | 687 | int vc = !(nv_ro08(bios, ramcfg + 0x02) & 0x08); |
688 | int mv = 1; /*XXX*/ | 688 | int mv = 1; /*XXX: !(nv_ro08(bios, ramcfg + 0x02) & 0x04); */ |
689 | u32 mask, data; | 689 | u32 mask, data; |
690 | 690 | ||
691 | ram_mask(fuc, 0x10f808, 0x40000000, 0x40000000); | 691 | ram_mask(fuc, 0x10f808, 0x40000000, 0x40000000); |