|
@@ -1388,15 +1388,15 @@ sisfb_setcolreg(unsigned regno, unsigned red, unsigned green, unsigned blue,
|
|
|
|
|
|
switch(info->var.bits_per_pixel) {
|
|
switch(info->var.bits_per_pixel) {
|
|
case 8:
|
|
case 8:
|
|
- outSISREG(SISDACA, regno);
|
|
|
|
- outSISREG(SISDACD, (red >> 10));
|
|
|
|
- outSISREG(SISDACD, (green >> 10));
|
|
|
|
- outSISREG(SISDACD, (blue >> 10));
|
|
|
|
|
|
+ SiS_SetRegByte(SISDACA, regno);
|
|
|
|
+ SiS_SetRegByte(SISDACD, (red >> 10));
|
|
|
|
+ SiS_SetRegByte(SISDACD, (green >> 10));
|
|
|
|
+ SiS_SetRegByte(SISDACD, (blue >> 10));
|
|
if(ivideo->currentvbflags & VB_DISPTYPE_DISP2) {
|
|
if(ivideo->currentvbflags & VB_DISPTYPE_DISP2) {
|
|
- outSISREG(SISDAC2A, regno);
|
|
|
|
- outSISREG(SISDAC2D, (red >> 8));
|
|
|
|
- outSISREG(SISDAC2D, (green >> 8));
|
|
|
|
- outSISREG(SISDAC2D, (blue >> 8));
|
|
|
|
|
|
+ SiS_SetRegByte(SISDAC2A, regno);
|
|
|
|
+ SiS_SetRegByte(SISDAC2D, (red >> 8));
|
|
|
|
+ SiS_SetRegByte(SISDAC2D, (green >> 8));
|
|
|
|
+ SiS_SetRegByte(SISDAC2D, (blue >> 8));
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
case 16:
|
|
case 16:
|
|
@@ -4999,11 +4999,11 @@ sisfb_post_xgi(struct pci_dev *pdev)
|
|
|
|
|
|
/* VGA enable */
|
|
/* VGA enable */
|
|
reg = SiS_GetRegByte(SISVGAENABLE) | 0x01;
|
|
reg = SiS_GetRegByte(SISVGAENABLE) | 0x01;
|
|
- outSISREG(SISVGAENABLE, reg);
|
|
|
|
|
|
+ SiS_SetRegByte(SISVGAENABLE, reg);
|
|
|
|
|
|
/* Misc */
|
|
/* Misc */
|
|
reg = SiS_GetRegByte(SISMISCR) | 0x01;
|
|
reg = SiS_GetRegByte(SISMISCR) | 0x01;
|
|
- outSISREG(SISMISCW, reg);
|
|
|
|
|
|
+ SiS_SetRegByte(SISMISCW, reg);
|
|
|
|
|
|
/* Unlock SR */
|
|
/* Unlock SR */
|
|
outSISIDXREG(SISSR, 0x05, 0x86);
|
|
outSISIDXREG(SISSR, 0x05, 0x86);
|