From: Ben Skeggs Date: Mon, 2 Dec 2013 23:00:47 +0000 (+1000) Subject: drm/nve0/fb: it's now safe to obey the memory voltage setting properly X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=cfe176083877756b3247c609cb48ed95d8392064;p=deliverable%2Flinux.git drm/nve0/fb: it's now safe to obey the memory voltage setting properly Signed-off-by: Ben Skeggs --- 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) struct nve0_ramfuc *fuc = &ram->fuc; struct nouveau_ram_data *next = ram->base.next; int vc = !(next->bios.ramcfg_11_02_08); - int mv = 1; /*XXX: !(next->bios.ramcfg_11_02_04); */ + int mv = !(next->bios.ramcfg_11_02_04); u32 mask, data; ram_mask(fuc, 0x10f808, 0x40000000, 0x40000000); @@ -673,7 +673,7 @@ nve0_ram_calc_sddr3(struct nouveau_fb *pfb, u32 freq) const u32 runk1 = ram->fN1; struct nouveau_ram_data *next = ram->base.next; int vc = !(next->bios.ramcfg_11_02_08); - int mv = 1; /*XXX: !(next->bios.ramcfg_11_02_04); */ + int mv = !(next->bios.ramcfg_11_02_04); u32 mask, data; ram_mask(fuc, 0x10f808, 0x40000000, 0x40000000);