diff --git a/[refs] b/[refs]
index 067e7be6797d..6bd14c9c9f63 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95d67bb1ca82dc8bd75304bda891e7ad81ecd935
+refs/heads/master: 6cf059e1bb3c7aa56f2a4468136934863184ef51
diff --git a/trunk/drivers/video/nvidia/nv_setup.c b/trunk/drivers/video/nvidia/nv_setup.c
index eab3e282a4de..336ddb0d10b8 100644
--- a/trunk/drivers/video/nvidia/nv_setup.c
+++ b/trunk/drivers/video/nvidia/nv_setup.c
@@ -656,7 +656,7 @@ int NVCommonSetup(struct fb_info *info)
 	par->LVDS = 0;
 	if (par->FlatPanel && par->twoHeads) {
 		NV_WR32(par->PRAMDAC0, 0x08B0, 0x00010004);
-		if (par->PRAMDAC0[0x08b4] & 1)
+		if (NV_RD32(par->PRAMDAC0, 0x08b4) & 1)
 			par->LVDS = 1;
 		printk("nvidiafb: Panel is %s\n", par->LVDS ? "LVDS" : "TMDS");
 	}