From: Ben Skeggs <bskeggs@redhat.com>
Date: Tue, 3 Dec 2013 00:44:43 +0000 (+1000)
Subject: drm/nve0/fb/gddr5: 10f698/69c
X-Git-Tag: v3.14-rc1~47^2~8^2~22
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a8ccbb7701d41a772d839acb3d81d7f9ac84c678;p=karo-tx-linux.git

drm/nve0/fb/gddr5: 10f698/69c

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

diff --git a/drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c b/drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c
index 91c1a8f6408a..c0bc7a916249 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c
@@ -400,9 +400,13 @@ nve0_ram_calc_gddr5(struct nouveau_fb *pfb, u32 freq)
 	ram_wr32(fuc, 0x10f6b8, 0x01010101 * next->bios.ramcfg_11_09);
 	ram_wr32(fuc, 0x10f6bc, 0x01010101 * next->bios.ramcfg_11_09);
 
-	if (!next->bios.ramcfg_11_07_08) {
+	if (!next->bios.ramcfg_11_07_08 && !next->bios.ramcfg_11_07_04) {
 		ram_wr32(fuc, 0x10f698, 0x01010101 * next->bios.ramcfg_11_04);
 		ram_wr32(fuc, 0x10f69c, 0x01010101 * next->bios.ramcfg_11_04);
+	} else
+	if (!next->bios.ramcfg_11_07_08) {
+		ram_wr32(fuc, 0x10f698, 0x00000000);
+		ram_wr32(fuc, 0x10f69c, 0x00000000);
 	}
 
 	if (ram->mode != 2) {