mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
staging/xgifb: Move duplicated code for dram to helper function
XGINew_SetDRAMDefaultRegister340 uses the same code fragment 4 times with only a slight variation each time. -> Move this code to a helper function - this saves some lines and ~450bytes in the .o / .ko Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Peter Huewe <peterhuewe@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
227dc1156c
commit
0141bb2ed9
1 changed files with 17 additions and 41 deletions
|
@ -413,6 +413,19 @@ static void XGINew_DDR2_DefaultRegister(
|
|||
XGINew_DDR2_MRS_XG20(HwDeviceExtension, P3c4, pVBInfo);
|
||||
}
|
||||
|
||||
static void XGI_SetDRAM_Helper(unsigned long P3d4, u8 seed, u8 temp2, u8 reg,
|
||||
u8 shift_factor, u8 mask1, u8 mask2)
|
||||
{
|
||||
u8 j;
|
||||
for (j = 0; j < 4; j++) {
|
||||
temp2 |= (((seed >> (2 * j)) & 0x03) << shift_factor);
|
||||
xgifb_reg_set(P3d4, reg, temp2);
|
||||
xgifb_reg_get(P3d4, reg);
|
||||
temp2 &= mask1;
|
||||
temp2 += mask2;
|
||||
}
|
||||
}
|
||||
|
||||
static void XGINew_SetDRAMDefaultRegister340(
|
||||
struct xgi_hw_device_info *HwDeviceExtension,
|
||||
unsigned long Port, struct vb_device_info *pVBInfo)
|
||||
|
@ -426,53 +439,24 @@ static void XGINew_SetDRAMDefaultRegister340(
|
|||
xgifb_reg_set(P3d4, 0x69, pVBInfo->CR40[6][pVBInfo->ram_type]);
|
||||
xgifb_reg_set(P3d4, 0x6A, pVBInfo->CR40[7][pVBInfo->ram_type]);
|
||||
|
||||
temp2 = 0;
|
||||
for (i = 0; i < 4; i++) {
|
||||
/* CR6B DQS fine tune delay */
|
||||
temp = (pVBInfo->ram_type <= 2) ? 0xaa : 0x00;
|
||||
for (j = 0; j < 4; j++) {
|
||||
temp1 = ((temp >> (2 * j)) & 0x03) << 2;
|
||||
temp2 |= temp1;
|
||||
xgifb_reg_set(P3d4, 0x6B, temp2);
|
||||
/* Insert read command for delay */
|
||||
xgifb_reg_get(P3d4, 0x6B);
|
||||
temp2 &= 0xF0;
|
||||
temp2 += 0x10;
|
||||
}
|
||||
XGI_SetDRAM_Helper(P3d4, temp, 0, 0x6B, 2, 0xF0, 0x10);
|
||||
}
|
||||
|
||||
temp2 = 0;
|
||||
for (i = 0; i < 4; i++) {
|
||||
/* CR6E DQM fine tune delay */
|
||||
temp = 0;
|
||||
for (j = 0; j < 4; j++) {
|
||||
temp1 = ((temp >> (2 * j)) & 0x03) << 2;
|
||||
temp2 |= temp1;
|
||||
xgifb_reg_set(P3d4, 0x6E, temp2);
|
||||
/* Insert read command for delay */
|
||||
xgifb_reg_get(P3d4, 0x6E);
|
||||
temp2 &= 0xF0;
|
||||
temp2 += 0x10;
|
||||
}
|
||||
XGI_SetDRAM_Helper(P3d4, 0, 0, 0x6E, 2, 0xF0, 0x10);
|
||||
}
|
||||
|
||||
temp3 = 0;
|
||||
for (k = 0; k < 4; k++) {
|
||||
/* CR6E_D[1:0] select channel */
|
||||
xgifb_reg_and_or(P3d4, 0x6E, 0xFC, temp3);
|
||||
temp2 = 0;
|
||||
for (i = 0; i < 8; i++) {
|
||||
/* CR6F DQ fine tune delay */
|
||||
temp = 0;
|
||||
for (j = 0; j < 4; j++) {
|
||||
temp1 = (temp >> (2 * j)) & 0x03;
|
||||
temp2 |= temp1;
|
||||
xgifb_reg_set(P3d4, 0x6F, temp2);
|
||||
/* Insert read command for delay */
|
||||
xgifb_reg_get(P3d4, 0x6F);
|
||||
temp2 &= 0xF8;
|
||||
temp2 += 0x08;
|
||||
}
|
||||
XGI_SetDRAM_Helper(P3d4, 0, 0, 0x6F, 0, 0xF8, 0x08);
|
||||
}
|
||||
temp3 += 0x01;
|
||||
}
|
||||
|
@ -486,15 +470,7 @@ static void XGINew_SetDRAMDefaultRegister340(
|
|||
|
||||
temp2 = 0x80;
|
||||
/* CR89 terminator type select */
|
||||
temp = 0;
|
||||
for (j = 0; j < 4; j++) {
|
||||
temp1 = (temp >> (2 * j)) & 0x03;
|
||||
temp2 |= temp1;
|
||||
xgifb_reg_set(P3d4, 0x89, temp2);
|
||||
xgifb_reg_get(P3d4, 0x89); /* Insert read command for delay */
|
||||
temp2 &= 0xF0;
|
||||
temp2 += 0x10;
|
||||
}
|
||||
XGI_SetDRAM_Helper(P3d4, 0, temp2, 0x89, 0, 0xF0, 0x10);
|
||||
|
||||
temp = 0;
|
||||
temp1 = temp & 0x03;
|
||||
|
|
Loading…
Reference in a new issue