evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging/xgifb: Consolidate XGINew_SetDRAMSize{,20}Reg

Browse source 
This patch consolidates the almost identical functions
XGINew_SetDRAMSizeReg and XGINew_SetDRAMSize20Reg as they are
implemented identically except one division factor.

The changed factor is now reflected in the input data.

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peter Huewe 2012-06-14 00:21:43 +02:00 • committed by Greg Kroah-Hartman
parent f3ca589baf
commit 391f695b90
1 changed files with 5 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
drivers/staging/xgifb/vb_init.c
View file

@ -7,10 +7,10 @@
#include "vb_setmode.h" #include "vb_setmode.h"
static const unsigned short XGINew_DDRDRAM_TYPE340[4][5] = { static const unsigned short XGINew_DDRDRAM_TYPE340[4][5] = {
{ 2, 13, 9, 64, 0x45}, { 2, 13, 9, 16, 0x45},
{ 2, 12, 9, 32, 0x35}, { 2, 12, 9, 8, 0x35},
{ 2, 12, 8, 16, 0x31}, { 2, 12, 8, 4, 0x31},
{ 2, 11, 8, 8, 0x21} }; { 2, 11, 8, 2, 0x21} };
static const unsigned short XGINew_DDRDRAM_TYPE20[12][5] = { static const unsigned short XGINew_DDRDRAM_TYPE20[12][5] = {
{ 2, 14, 11, 128, 0x5D}, { 2, 14, 11, 128, 0x5D},
@ -591,50 +591,6 @@ static void XGINew_SetDRAMSizingType(int index,
/* should delay 50 ns */ /* should delay 50 ns */
} }
static unsigned short XGINew_SetDRAMSizeReg(int index,
const unsigned short DRAMTYPE_TABLE[][5],
struct vb_device_info *pVBInfo)
{
unsigned short data = 0, memsize = 0;
int RankSize;
unsigned char ChannelNo;
RankSize = DRAMTYPE_TABLE[index][3] * pVBInfo->ram_bus / 32;
data = xgifb_reg_get(pVBInfo->P3c4, 0x13);
data &= 0x80;
if (data == 0x80)
RankSize *= 2;
data = 0;
if (pVBInfo->ram_channel == 3)
ChannelNo = 4;
else
ChannelNo = pVBInfo->ram_channel;
if (ChannelNo * RankSize <= 256) {
while ((RankSize >>= 1) > 0)
data += 0x10;
memsize = data >> 4;
/* [2004/03/25] Vicent, Fix DRAM Sizing Error */
xgifb_reg_set(pVBInfo->P3c4,
0x14,
(xgifb_reg_get(pVBInfo->P3c4, 0x14) & 0x0F) |
(data & 0xF0));
/* data |= pVBInfo->ram_channel << 2; */
/* data |= (pVBInfo->ram_bus / 64) << 1; */
/* xgifb_reg_set(pVBInfo->P3c4, 0x14, data); */
/* should delay */
/* XGINew_SetDRAMModeRegister340(pVBInfo); */
}
return memsize;
}
static unsigned short XGINew_SetDRAMSize20Reg(int index, static unsigned short XGINew_SetDRAMSize20Reg(int index,
const unsigned short DRAMTYPE_TABLE[][5], const unsigned short DRAMTYPE_TABLE[][5],
struct vb_device_info *pVBInfo) struct vb_device_info *pVBInfo)
@ -968,7 +924,7 @@ static int XGINew_DDRSizing340(struct xgi_hw_device_info *HwDeviceExtension,
XGINew_SetDRAMSizingType(i, XGINew_SetDRAMSizingType(i,
XGINew_DDRDRAM_TYPE340, XGINew_DDRDRAM_TYPE340,
pVBInfo); pVBInfo);
memsize = XGINew_SetDRAMSizeReg(i, memsize = XGINew_SetDRAMSize20Reg(i,
XGINew_DDRDRAM_TYPE340, XGINew_DDRDRAM_TYPE340,
pVBInfo); pVBInfo);