From 9946f48cd69f5a58a93917e04dfc2ef5bf43e8a1 Mon Sep 17 00:00:00 2001 From: Peter Huewe Date: Tue, 5 Feb 2013 00:29:43 +0100 Subject: [PATCH] --- yaml --- r: 354367 b: refs/heads/master c: 227dc1156c103b7e073ee81e642e15d7927af828 h: refs/heads/master i: 354365: 1a4ff11ad3de7ce3837737f8124056989bcc9ebc 354363: eef216794c51c0aaab17655f78feb33f149f06d4 354359: 86bc8e284cf1a842e80a3a6269a92581ea4ed17e 354351: e7496253f261acf9766931cb31034e00f99af7ce 354335: 102c541c069da51cb915c880bd3babec6203f422 354303: b1d2044159cb213379827675f940654c0be5af94 v: v3 --- [refs] | 2 +- trunk/drivers/staging/xgifb/vb_init.c | 2 +- trunk/drivers/staging/xgifb/vb_table.h | 11 ----------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 59b6b6ead47b..5251cbfa47ee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5056d87a889d1bd7d998070b6827b384ccde487f +refs/heads/master: 227dc1156c103b7e073ee81e642e15d7927af828 diff --git a/trunk/drivers/staging/xgifb/vb_init.c b/trunk/drivers/staging/xgifb/vb_init.c index dd34570347aa..a778df6f7cc6 100644 --- a/trunk/drivers/staging/xgifb/vb_init.c +++ b/trunk/drivers/staging/xgifb/vb_init.c @@ -429,7 +429,7 @@ static void XGINew_SetDRAMDefaultRegister340( temp2 = 0; for (i = 0; i < 4; i++) { /* CR6B DQS fine tune delay */ - temp = XGI340_CR6B[pVBInfo->ram_type][i]; + temp = (pVBInfo->ram_type <= 2) ? 0xaa : 0x00; for (j = 0; j < 4; j++) { temp1 = ((temp >> (2 * j)) & 0x03) << 2; temp2 |= temp1; diff --git a/trunk/drivers/staging/xgifb/vb_table.h b/trunk/drivers/staging/xgifb/vb_table.h index fca1a1d63408..34e16569de3b 100644 --- a/trunk/drivers/staging/xgifb/vb_table.h +++ b/trunk/drivers/staging/xgifb/vb_table.h @@ -103,17 +103,6 @@ static const unsigned char XGI27_cr41[24][8] = { {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} /* 23 CRC5 */ }; -const unsigned char XGI340_CR6B[8][4] = { - {0xaa, 0xaa, 0xaa, 0xaa}, - {0xaa, 0xaa, 0xaa, 0xaa}, - {0xaa, 0xaa, 0xaa, 0xaa}, - {0x00, 0x00, 0x00, 0x00}, - {0x00, 0x00, 0x00, 0x00}, - {0x00, 0x00, 0x00, 0x00}, - {0x00, 0x00, 0x00, 0x00}, - {0x00, 0x00, 0x00, 0x00} -}; - /* CR47,CR48,CR49,CR4A,CR4B,CR4C,CR70,CR71,CR74,CR75,CR76,CR77 */ const unsigned char XGI340_AGPReg[12] = { 0x28, 0x23, 0x00, 0x20, 0x00, 0x20,