diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2013-12-02 18:00:47 -0500 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-01-22 22:39:00 -0500 |
| commit | cfe176083877756b3247c609cb48ed95d8392064 (patch) | |
| tree | 644f7bba0d1d092981db5714b0d40fdb71a80723 | |
| parent | 46bf1c389f7fb4f3d1bba1543088d66523670cac (diff) | |
drm/nve0/fb: it's now safe to obey the memory voltage setting properly
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c b/drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c index 8b3e528e4ca1..91c1a8f6408a 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c +++ b/drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c | |||
| @@ -263,7 +263,7 @@ nve0_ram_calc_gddr5(struct nouveau_fb *pfb, u32 freq) | |||
| 263 | struct nve0_ramfuc *fuc = &ram->fuc; | 263 | struct nve0_ramfuc *fuc = &ram->fuc; |
| 264 | struct nouveau_ram_data *next = ram->base.next; | 264 | struct nouveau_ram_data *next = ram->base.next; |
| 265 | int vc = !(next->bios.ramcfg_11_02_08); | 265 | int vc = !(next->bios.ramcfg_11_02_08); |
| 266 | int mv = 1; /*XXX: !(next->bios.ramcfg_11_02_04); */ | 266 | int mv = !(next->bios.ramcfg_11_02_04); |
| 267 | u32 mask, data; | 267 | u32 mask, data; |
| 268 | 268 | ||
| 269 | ram_mask(fuc, 0x10f808, 0x40000000, 0x40000000); | 269 | ram_mask(fuc, 0x10f808, 0x40000000, 0x40000000); |
| @@ -673,7 +673,7 @@ nve0_ram_calc_sddr3(struct nouveau_fb *pfb, u32 freq) | |||
| 673 | const u32 runk1 = ram->fN1; | 673 | const u32 runk1 = ram->fN1; |
| 674 | struct nouveau_ram_data *next = ram->base.next; | 674 | struct nouveau_ram_data *next = ram->base.next; |
| 675 | int vc = !(next->bios.ramcfg_11_02_08); | 675 | int vc = !(next->bios.ramcfg_11_02_08); |
| 676 | int mv = 1; /*XXX: !(next->bios.ramcfg_11_02_04); */ | 676 | int mv = !(next->bios.ramcfg_11_02_04); |
| 677 | u32 mask, data; | 677 | u32 mask, data; |
| 678 | 678 | ||
| 679 | ram_mask(fuc, 0x10f808, 0x40000000, 0x40000000); | 679 | ram_mask(fuc, 0x10f808, 0x40000000, 0x40000000); |