Skip to content

L
linux
Commit efdf4ee7 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files
Options

staging: xgifb: replace XGINew_SetReg3() with outb() 

Replace XGINew_SetReg3() with outb().
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f5b571fa
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 42 deletions
drivers/staging/xgifb/vb_init.c
View file @ efdf4ee7
...@@ -1313,7 +1313,7 @@ unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension) ...@@ -1313,7 +1313,7 @@ unsigned char XGIInitNew(struct xgi_hw_device_info *HwDeviceExtension)
} }
printk("2"); printk("2");
XGINew_SetReg3((pVBInfo->BaseAddr + 0x12), 0x67); /* 3c2 <- 67 ,ynlai */ outb(0x67, (pVBInfo->BaseAddr + 0x12)); /* 3c2 <- 67 ,ynlai */
pVBInfo->ISXPDOS = 0; pVBInfo->ISXPDOS = 0;
printk("3"); printk("3");
......
drivers/staging/xgifb/vb_setmode.c
View file @ efdf4ee7
...@@ -265,7 +265,7 @@ static void XGI_SetMiscRegs(unsigned short StandTableIndex, ...@@ -265,7 +265,7 @@ static void XGI_SetMiscRegs(unsigned short StandTableIndex,
} }
*/ */
XGINew_SetReg3(pVBInfo->P3c2, Miscdata); /* Set Misc(3c2) */ outb(Miscdata, pVBInfo->P3c2); /* Set Misc(3c2) */
} }
static void XGI_SetCRTCRegs(struct xgi_hw_device_info *HwDeviceExtension, static void XGI_SetCRTCRegs(struct xgi_hw_device_info *HwDeviceExtension,
...@@ -322,15 +322,15 @@ static void XGI_SetATTRegs(unsigned short ModeNo, unsigned short StandTableIndex ...@@ -322,15 +322,15 @@ static void XGI_SetATTRegs(unsigned short ModeNo, unsigned short StandTableIndex
} }
inb(pVBInfo->P3da); /* reset 3da */ inb(pVBInfo->P3da); /* reset 3da */
XGINew_SetReg3(pVBInfo->P3c0, i); /* set index */ outb(i, pVBInfo->P3c0); /* set index */
XGINew_SetReg3(pVBInfo->P3c0, ARdata); /* set data */ outb(ARdata, pVBInfo->P3c0); /* set data */
} }
inb(pVBInfo->P3da); /* reset 3da */ inb(pVBInfo->P3da); /* reset 3da */
XGINew_SetReg3(pVBInfo->P3c0, 0x14); /* set index */ outb(0x14, pVBInfo->P3c0); /* set index */
XGINew_SetReg3(pVBInfo->P3c0, 0x00); /* set data */ outb(0x00, pVBInfo->P3c0); /* set data */
inb(pVBInfo->P3da); /* Enable Attribute */ inb(pVBInfo->P3da); /* Enable Attribute */
XGINew_SetReg3(pVBInfo->P3c0, 0x20); outb(0x20, pVBInfo->P3c0);
} }
static void XGI_SetGRCRegs(unsigned short StandTableIndex, static void XGI_SetGRCRegs(unsigned short StandTableIndex,
...@@ -525,7 +525,7 @@ static void XGI_SetSync(unsigned short RefreshRateTableIndex, ...@@ -525,7 +525,7 @@ static void XGI_SetSync(unsigned short RefreshRateTableIndex,
sync &= 0xC0; sync &= 0xC0;
temp = 0x2F; temp = 0x2F;
temp |= sync; temp |= sync;
XGINew_SetReg3(pVBInfo->P3c2, temp); /* Set Misc(3c2) */ outb(temp, pVBInfo->P3c2); /* Set Misc(3c2) */
} }
static void XGI_SetCRT1Timing_H(struct vb_device_info *pVBInfo, static void XGI_SetCRT1Timing_H(struct vb_device_info *pVBInfo,
...@@ -1734,9 +1734,9 @@ static void XGI_WriteDAC(unsigned short dl, unsigned short ah, unsigned short al ...@@ -1734,9 +1734,9 @@ static void XGI_WriteDAC(unsigned short dl, unsigned short ah, unsigned short al
bh = temp; bh = temp;
} }
} }
XGINew_SetReg3(pVBInfo->P3c9, (unsigned short) dh); outb((unsigned short) dh, pVBInfo->P3c9);
XGINew_SetReg3(pVBInfo->P3c9, (unsigned short) bh); outb((unsigned short) bh, pVBInfo->P3c9);
XGINew_SetReg3(pVBInfo->P3c9, (unsigned short) bl); outb((unsigned short) bl, pVBInfo->P3c9);
} }
static void XGI_LoadDAC(unsigned short ModeNo, unsigned short ModeIdIndex, static void XGI_LoadDAC(unsigned short ModeNo, unsigned short ModeIdIndex,
...@@ -1769,8 +1769,8 @@ static void XGI_LoadDAC(unsigned short ModeNo, unsigned short ModeIdIndex, ...@@ -1769,8 +1769,8 @@ static void XGI_LoadDAC(unsigned short ModeNo, unsigned short ModeIdIndex,
else else
j = time; j = time;
XGINew_SetReg3(pVBInfo->P3c6, 0xFF); outb(0xFF, pVBInfo->P3c6);
XGINew_SetReg3(pVBInfo->P3c8, 0x00); outb(0x00, pVBInfo->P3c8);
for (i = 0; i < j; i++) { for (i = 0; i < j; i++) {
data = table[i]; data = table[i];
...@@ -1784,7 +1784,7 @@ static void XGI_LoadDAC(unsigned short ModeNo, unsigned short ModeIdIndex, ...@@ -1784,7 +1784,7 @@ static void XGI_LoadDAC(unsigned short ModeNo, unsigned short ModeIdIndex,
if (data & 0x02) if (data & 0x02)
data2 += 0x15; data2 += 0x15;
XGINew_SetReg3(pVBInfo->P3c9, data2); outb(data2, pVBInfo->P3c9);
data = data >> 2; data = data >> 2;
} }
} }
...@@ -1794,7 +1794,7 @@ static void XGI_LoadDAC(unsigned short ModeNo, unsigned short ModeIdIndex, ...@@ -1794,7 +1794,7 @@ static void XGI_LoadDAC(unsigned short ModeNo, unsigned short ModeIdIndex,
data = table[i]; data = table[i];
for (k = 0; k < 3; k++) for (k = 0; k < 3; k++)
XGINew_SetReg3(pVBInfo->P3c9, data); outb(data, pVBInfo->P3c9);
} }
si = 32; si = 32;
...@@ -6471,7 +6471,7 @@ static void XGI_SetXG21LVDSPara(unsigned short ModeNo, unsigned short ModeIdInde ...@@ -6471,7 +6471,7 @@ static void XGI_SetXG21LVDSPara(unsigned short ModeNo, unsigned short ModeIdInde
temp &= LCDPolarity; temp &= LCDPolarity;
Miscdata = (unsigned char) inb(pVBInfo->P3cc); Miscdata = (unsigned char) inb(pVBInfo->P3cc);
XGINew_SetReg3(pVBInfo->P3c2, (Miscdata & 0x3F) | temp); outb((Miscdata & 0x3F) | temp, pVBInfo->P3c2);
temp = (unsigned char) (pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDS_Capability temp = (unsigned char) (pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDS_Capability
& LCDPolarity); & LCDPolarity);
...@@ -6629,11 +6629,11 @@ static void XGI_SetXG21LVDSPara(unsigned short ModeNo, unsigned short ModeIdInde ...@@ -6629,11 +6629,11 @@ static void XGI_SetXG21LVDSPara(unsigned short ModeNo, unsigned short ModeIdInde
if (!(modeflag & Charx8Dot)) { if (!(modeflag & Charx8Dot)) {
inb(pVBInfo->P3da); /* reset 3da */ inb(pVBInfo->P3da); /* reset 3da */
XGINew_SetReg3(pVBInfo->P3c0, 0x13); /* set index */ outb(0x13, pVBInfo->P3c0); /* set index */
XGINew_SetReg3(pVBInfo->P3c0, 0x00); /* set data, panning = 0, shift left 1 dot*/ outb(0x00, pVBInfo->P3c0); /* set data, panning = 0, shift left 1 dot*/
inb(pVBInfo->P3da); /* Enable Attribute */ inb(pVBInfo->P3da); /* Enable Attribute */
XGINew_SetReg3(pVBInfo->P3c0, 0x20); outb(0x20, pVBInfo->P3c0);
inb(pVBInfo->P3da); /* reset 3da */ inb(pVBInfo->P3da); /* reset 3da */
} }
...@@ -6656,7 +6656,7 @@ static void XGI_SetXG27LVDSPara(unsigned short ModeNo, unsigned short ModeIdInde ...@@ -6656,7 +6656,7 @@ static void XGI_SetXG27LVDSPara(unsigned short ModeNo, unsigned short ModeIdInde
temp &= LCDPolarity; temp &= LCDPolarity;
Miscdata = (unsigned char) inb(pVBInfo->P3cc); Miscdata = (unsigned char) inb(pVBInfo->P3cc);
XGINew_SetReg3(pVBInfo->P3c2, (Miscdata & 0x3F) | temp); outb((Miscdata & 0x3F) | temp, pVBInfo->P3c2);
temp = (unsigned char) (pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDS_Capability temp = (unsigned char) (pVBInfo->XG21_LVDSCapList[lvdstableindex].LVDS_Capability
& LCDPolarity); & LCDPolarity);
...@@ -6813,11 +6813,11 @@ static void XGI_SetXG27LVDSPara(unsigned short ModeNo, unsigned short ModeIdInde ...@@ -6813,11 +6813,11 @@ static void XGI_SetXG27LVDSPara(unsigned short ModeNo, unsigned short ModeIdInde
if (!(modeflag & Charx8Dot)) { if (!(modeflag & Charx8Dot)) {
inb(pVBInfo->P3da); /* reset 3da */ inb(pVBInfo->P3da); /* reset 3da */
XGINew_SetReg3(pVBInfo->P3c0, 0x13); /* set index */ outb(0x13, pVBInfo->P3c0); /* set index */
XGINew_SetReg3(pVBInfo->P3c0, 0x00); /* set data, panning = 0, shift left 1 dot*/ outb(0x00, pVBInfo->P3c0); /* set data, panning = 0, shift left 1 dot*/
inb(pVBInfo->P3da); /* Enable Attribute */ inb(pVBInfo->P3da); /* Enable Attribute */
XGINew_SetReg3(pVBInfo->P3c0, 0x20); outb(0x20, pVBInfo->P3c0);
inb(pVBInfo->P3da); /* reset 3da */ inb(pVBInfo->P3da); /* reset 3da */
} }
...@@ -7995,15 +7995,12 @@ void XGI_SenseCRT1(struct vb_device_info *pVBInfo) ...@@ -7995,15 +7995,12 @@ void XGI_SenseCRT1(struct vb_device_info *pVBInfo)
XGINew_SetReg1(pVBInfo->P3c4, 0x2B, 0x1B); XGINew_SetReg1(pVBInfo->P3c4, 0x2B, 0x1B);
XGINew_SetReg1(pVBInfo->P3c4, 0x2C, 0xE1); XGINew_SetReg1(pVBInfo->P3c4, 0x2C, 0xE1);
XGINew_SetReg3(pVBInfo->P3c8, 0x00); outb(0x00, pVBInfo->P3c8);
for (i = 0; i < 256; i++) { for (i = 0; i < 256; i++) {
XGINew_SetReg3((pVBInfo->P3c8 + 1), outb((unsigned char) DAC_TEST_PARMS[0], (pVBInfo->P3c8 + 1));
(unsigned char) DAC_TEST_PARMS[0]); outb((unsigned char) DAC_TEST_PARMS[1], (pVBInfo->P3c8 + 1));
XGINew_SetReg3((pVBInfo->P3c8 + 1), outb((unsigned char) DAC_TEST_PARMS[2], (pVBInfo->P3c8 + 1));
(unsigned char) DAC_TEST_PARMS[1]);
XGINew_SetReg3((pVBInfo->P3c8 + 1),
(unsigned char) DAC_TEST_PARMS[2]);
} }
XGI_VBLongWait(pVBInfo); XGI_VBLongWait(pVBInfo);
...@@ -8021,12 +8018,12 @@ void XGI_SenseCRT1(struct vb_device_info *pVBInfo) ...@@ -8021,12 +8018,12 @@ void XGI_SenseCRT1(struct vb_device_info *pVBInfo)
XGINew_SetRegANDOR(pVBInfo->P3d4, 0x32, 0xDF, 0x00); XGINew_SetRegANDOR(pVBInfo->P3d4, 0x32, 0xDF, 0x00);
/* alan, avoid display something, set BLACK DAC if not restore DAC */ /* alan, avoid display something, set BLACK DAC if not restore DAC */
XGINew_SetReg3(pVBInfo->P3c8, 0x00); outb(0x00, pVBInfo->P3c8);
for (i = 0; i < 256; i++) { for (i = 0; i < 256; i++) {
XGINew_SetReg3((pVBInfo->P3c8 + 1), 0); outb(0, (pVBInfo->P3c8 + 1));
XGINew_SetReg3((pVBInfo->P3c8 + 1), 0); outb(0, (pVBInfo->P3c8 + 1));
XGINew_SetReg3((pVBInfo->P3c8 + 1), 0); outb(0, (pVBInfo->P3c8 + 1));
} }
XGINew_SetReg1(pVBInfo->P3c4, 0x01, SR01); XGINew_SetReg1(pVBInfo->P3c4, 0x01, SR01);
...@@ -8231,13 +8228,13 @@ static void XGI_SetCRT1Group(struct xgi_hw_device_info *HwDeviceExtension, ...@@ -8231,13 +8228,13 @@ static void XGI_SetCRT1Group(struct xgi_hw_device_info *HwDeviceExtension,
XGINew_SetReg1(pVBInfo->P3c4, 0x2B, 0x4E); XGINew_SetReg1(pVBInfo->P3c4, 0x2B, 0x4E);
XGINew_SetReg1(pVBInfo->P3c4, 0x2C, 0xE9); XGINew_SetReg1(pVBInfo->P3c4, 0x2C, 0xE9);
b3CC = (unsigned char) inb(XGINew_P3cc); b3CC = (unsigned char) inb(XGINew_P3cc);
XGINew_SetReg3(XGINew_P3cc, (b3CC |= 0x0C)); outb((b3CC |= 0x0C), XGINew_P3cc);
} else if ((ModeNo == 0x04) | (ModeNo == 0x05) | (ModeNo } else if ((ModeNo == 0x04) | (ModeNo == 0x05) | (ModeNo
== 0x0D)) { == 0x0D)) {
XGINew_SetReg1(pVBInfo->P3c4, 0x2B, 0x1B); XGINew_SetReg1(pVBInfo->P3c4, 0x2B, 0x1B);
XGINew_SetReg1(pVBInfo->P3c4, 0x2C, 0xE3); XGINew_SetReg1(pVBInfo->P3c4, 0x2C, 0xE3);
b3CC = (unsigned char) inb(XGINew_P3cc); b3CC = (unsigned char) inb(XGINew_P3cc);
XGINew_SetReg3(XGINew_P3cc, (b3CC |= 0x0C)); outb((b3CC |= 0x0C), XGINew_P3cc);
} }
} }
......
drivers/staging/xgifb/vb_util.c
View file @ efdf4ee7
...@@ -21,11 +21,6 @@ void XGINew_SetReg1(unsigned long port, unsigned short index, ...@@ -21,11 +21,6 @@ void XGINew_SetReg1(unsigned long port, unsigned short index,
outb(data, port + 1); outb(data, port + 1);
} }
void XGINew_SetReg3(unsigned long port, unsigned short data)
{
outb(data, port);
}
void XGINew_SetReg4(unsigned long port, unsigned long data) void XGINew_SetReg4(unsigned long port, unsigned long data)
{ {
outl(data, port); outl(data, port);
......
drivers/staging/xgifb/vb_util.h
View file @ efdf4ee7
#ifndef _VBUTIL_ #ifndef _VBUTIL_
#define _VBUTIL_ #define _VBUTIL_
extern void XGINew_SetReg1(unsigned long, unsigned short, unsigned short); extern void XGINew_SetReg1(unsigned long, unsigned short, unsigned short);
extern void XGINew_SetReg3(unsigned long, unsigned short);
extern unsigned char XGINew_GetReg1(unsigned long, unsigned short); extern unsigned char XGINew_GetReg1(unsigned long, unsigned short);
extern void XGINew_SetReg4(unsigned long, unsigned long); extern void XGINew_SetReg4(unsigned long, unsigned long);
extern void XGINew_SetRegOR(unsigned long Port,unsigned short Index,unsigned short DataOR); extern void XGINew_SetRegOR(unsigned long Port,unsigned short Index,unsigned short DataOR);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7