Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee139...

[~andy/linux] / drivers / staging / xgifb / vb_init.c

diff --git a/drivers/staging/xgifb/vb_init.c b/drivers/staging/xgifb/vb_init.c
index 8f6090b6ffd8b3663d659ed7f9e2136de41476df..2b791c10eb15b2dc622c27d42b5b9ad95e2bcbd2 100644 (file)
--- a/drivers/staging/xgifb/vb_init.c
+++ b/drivers/staging/xgifb/vb_init.c
@@ -94,8 +94,8 @@ static void XGINew_DDR1x_MRS_340(unsigned long P3c4,
                      0x18,
                      pVBInfo->SR15[2][pVBInfo->ram_type]); /* SR18 */
        xgifb_reg_set(P3c4, 0x19, 0x01);
-       xgifb_reg_set(P3c4, 0x16, pVBInfo->SR16[0]);
-       xgifb_reg_set(P3c4, 0x16, pVBInfo->SR16[1]);
+       xgifb_reg_set(P3c4, 0x16, 0x03);
+       xgifb_reg_set(P3c4, 0x16, 0x83);
        mdelay(1);
        xgifb_reg_set(P3c4, 0x1B, 0x03);
        udelay(500);
@@ -103,8 +103,8 @@ static void XGINew_DDR1x_MRS_340(unsigned long P3c4,
                      0x18,
                      pVBInfo->SR15[2][pVBInfo->ram_type]); /* SR18 */
        xgifb_reg_set(P3c4, 0x19, 0x00);
-       xgifb_reg_set(P3c4, 0x16, pVBInfo->SR16[2]);
-       xgifb_reg_set(P3c4, 0x16, pVBInfo->SR16[3]);
+       xgifb_reg_set(P3c4, 0x16, 0x03);
+       xgifb_reg_set(P3c4, 0x16, 0x83);
        xgifb_reg_set(P3c4, 0x1B, 0x00);
 }
 
@@ -429,7 +429,7 @@ static void XGINew_SetDRAMDefaultRegister340(
        temp2 = 0;
        for (i = 0; i < 4; i++) {
                /* CR6B DQS fine tune delay */
-               temp = pVBInfo->CR6B[pVBInfo->ram_type][i];
+               temp = XGI340_CR6B[pVBInfo->ram_type][i];
                for (j = 0; j < 4; j++) {
                        temp1 = ((temp >> (2 * j)) & 0x03) << 2;
                        temp2 |= temp1;
@@ -1378,17 +1378,17 @@ unsigned char XGIInitNew(struct pci_dev *pdev)
                for (i = 0x47; i <= 0x4C; i++)
                        xgifb_reg_set(pVBInfo->P3d4,
                                      i,
-                                     pVBInfo->AGPReg[i - 0x47]);
+                                     XGI340_AGPReg[i - 0x47]);
 
                for (i = 0x70; i <= 0x71; i++)
                        xgifb_reg_set(pVBInfo->P3d4,
                                      i,
-                                     pVBInfo->AGPReg[6 + i - 0x70]);
+                                     XGI340_AGPReg[6 + i - 0x70]);
 
                for (i = 0x74; i <= 0x77; i++)
                        xgifb_reg_set(pVBInfo->P3d4,
                                      i,
-                                     pVBInfo->AGPReg[8 + i - 0x74]);
+                                     XGI340_AGPReg[8 + i - 0x74]);
 
                pci_read_config_dword(pdev, 0x50, &Temp);
                Temp >>= 20;