Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 289055
b: refs/heads/master
c: 255aabd
h: refs/heads/master
i:
  289053: 064ed54
  289051: b2d5784
  289047: 990839a
  289039: b58b564
  289023: 4a6edb2
v: v3
  • Loading branch information
Peter Huewe authored and Greg Kroah-Hartman committed Feb 10, 2012
1 parent f90eae9 commit 0c25071
Show file tree
Hide file tree
Showing 4 changed files with 135 additions and 142 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 84359ef62aa36dc92508547852587b284c2664d2
refs/heads/master: 255aabd2b8ad98a49d224b243c7b1f82adcdfb4a
13 changes: 3 additions & 10 deletions trunk/drivers/staging/xgifb/vb_def.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,11 @@
#define PanelRGB18Bit 0x0100
#define PanelRGB24Bit 0x0000

#define Panel320x480 0x07 /*fstn*/
#define Panel_320x480 0x07 /*fstn*/
/* [ycchen] 02/12/03 Modify for Multi-Sync. LCD Support */
#define PanelResInfo 0x1F /* CR36 Panel Type/LCDResInfo */
#define Panel800x600 0x01
#define Panel1024x768 0x02
#define Panel1024x768x75 0x22
#define Panel1280x1024 0x03
#define Panel1280x1024x75 0x23
#define Panel640x480 0x04
#define Panel1280x960 0x07
#define Panel1400x1050 0x09
#define Panel1600x1200 0x0B
#define Panel_1024x768x75 0x22
#define Panel_1280x1024x75 0x23

#define PanelRef60Hz 0x00
#define PanelRef75Hz 0x20
Expand Down
94 changes: 47 additions & 47 deletions trunk/drivers/staging/xgifb/vb_setmode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -359,8 +359,8 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeNo,
if (pVBInfo->VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)) {
tempax |= SupportLCD;

if (pVBInfo->LCDResInfo != Panel1280x1024) {
if (pVBInfo->LCDResInfo != Panel1280x960) {
if (pVBInfo->LCDResInfo != Panel_1280x1024) {
if (pVBInfo->LCDResInfo != Panel_1280x960) {
if (pVBInfo->LCDInfo &
LCDNonExpanding) {
if (resinfo >= 9) {
Expand Down Expand Up @@ -436,7 +436,7 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeNo,
if (resinfo > 0x08)
return 0; /* 1024x768 */

if (pVBInfo->LCDResInfo < Panel1024x768) {
if (pVBInfo->LCDResInfo < Panel_1024x768) {
if (resinfo > 0x07)
return 0; /* 800x600 */

Expand Down Expand Up @@ -1267,7 +1267,7 @@ static unsigned short XGI_GetVCLK2Ptr(unsigned short ModeNo,
if (pVBInfo->IF_DEF_LVDS == 0) {
CRT2Index = CRT2Index >> 6; /* for LCD */
if (pVBInfo->VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)) { /*301b*/
if (pVBInfo->LCDResInfo != Panel1024x768)
if (pVBInfo->LCDResInfo != Panel_1024x768)
VCLKIndex = LCDXlat2VCLK[CRT2Index];
else
VCLKIndex = LCDXlat1VCLK[CRT2Index];
Expand Down Expand Up @@ -1329,11 +1329,11 @@ static unsigned short XGI_GetVCLK2Ptr(unsigned short ModeNo,
VCLKIndex = CRT2Index;

VCLKIndex = VCLKIndex >> 6;
if ((pVBInfo->LCDResInfo == Panel800x600) ||
(pVBInfo->LCDResInfo == Panel320x480))
if ((pVBInfo->LCDResInfo == Panel_800x600) ||
(pVBInfo->LCDResInfo == Panel_320x480))
VCLKIndex = LVDSXlat1VCLK[VCLKIndex];
else if ((pVBInfo->LCDResInfo == Panel1024x768) ||
(pVBInfo->LCDResInfo == Panel1024x768x75))
else if ((pVBInfo->LCDResInfo == Panel_1024x768) ||
(pVBInfo->LCDResInfo == Panel_1024x768x75))
VCLKIndex = LVDSXlat2VCLK[VCLKIndex];
else
VCLKIndex = LVDSXlat3VCLK[VCLKIndex];
Expand Down Expand Up @@ -2377,15 +2377,15 @@ static void XGI_GetLVDSData(unsigned short ModeNo, unsigned short ModeIdIndex,
if (pVBInfo->VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)) {
if (!(pVBInfo->LCDInfo & (SetLCDtoNonExpanding
| EnableScalingLCD))) {
if ((pVBInfo->LCDResInfo == Panel1024x768) ||
(pVBInfo->LCDResInfo == Panel1024x768x75)) {
if ((pVBInfo->LCDResInfo == Panel_1024x768) ||
(pVBInfo->LCDResInfo == Panel_1024x768x75)) {
pVBInfo->HDE = 1024;
pVBInfo->VDE = 768;
} else if ((pVBInfo->LCDResInfo == Panel1280x1024) ||
(pVBInfo->LCDResInfo == Panel1280x1024x75)) {
} else if ((pVBInfo->LCDResInfo == Panel_1280x1024) ||
(pVBInfo->LCDResInfo == Panel_1280x1024x75)) {
pVBInfo->HDE = 1280;
pVBInfo->VDE = 1024;
} else if (pVBInfo->LCDResInfo == Panel1400x1050) {
} else if (pVBInfo->LCDResInfo == Panel_1400x1050) {
pVBInfo->HDE = 1400;
pVBInfo->VDE = 1050;
} else {
Expand Down Expand Up @@ -2496,7 +2496,7 @@ static unsigned short XGI_GetLCDCapPtr1(struct vb_device_info *pVBInfo)
}

if (tempbl == 0xFF) {
pVBInfo->LCDResInfo = Panel1024x768;
pVBInfo->LCDResInfo = Panel_1024x768;
pVBInfo->LCDTypeInfo = 0;
i = 0;
}
Expand Down Expand Up @@ -2556,15 +2556,15 @@ static void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
push2 = tempax;

/* GetLCDResInfo */
if ((pVBInfo->LCDResInfo == Panel1024x768) ||
(pVBInfo->LCDResInfo == Panel1024x768x75)) {
if ((pVBInfo->LCDResInfo == Panel_1024x768) ||
(pVBInfo->LCDResInfo == Panel_1024x768x75)) {
tempax = 1024;
tempbx = 768;
} else if ((pVBInfo->LCDResInfo == Panel1280x1024) ||
(pVBInfo->LCDResInfo == Panel1280x1024x75)) {
} else if ((pVBInfo->LCDResInfo == Panel_1280x1024) ||
(pVBInfo->LCDResInfo == Panel_1280x1024x75)) {
tempax = 1280;
tempbx = 1024;
} else if (pVBInfo->LCDResInfo == Panel1400x1050) {
} else if (pVBInfo->LCDResInfo == Panel_1400x1050) {
tempax = 1400;
tempbx = 1050;
} else {
Expand Down Expand Up @@ -2768,7 +2768,7 @@ static void XGI_SetLVDSRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
temp1 = temp1 / push3;
tempbx = (unsigned short) (temp1 & 0xffff);

if (pVBInfo->LCDResInfo == Panel1024x768)
if (pVBInfo->LCDResInfo == Panel_1024x768)
tempbx -= 1;

tempax = ((tempbx >> 8) & 0xff) << 3;
Expand Down Expand Up @@ -3386,10 +3386,10 @@ static unsigned char XGI_GetLCDInfo(unsigned short ModeNo,
tempbx = temp & 0x0F;

if (tempbx == 0)
tempbx = Panel1024x768; /* default */
tempbx = Panel_1024x768; /* default */

/* LCD75 [2003/8/22] Vicent */
if ((tempbx == Panel1024x768) || (tempbx == Panel1280x1024)) {
if ((tempbx == Panel_1024x768) || (tempbx == Panel_1280x1024)) {
if (pVBInfo->VBInfo & DriverMode) {
tempax = xgifb_reg_get(pVBInfo->P3d4, 0x33);
if (pVBInfo->VBInfo & SetCRT2ToLCDA)
Expand Down Expand Up @@ -3434,10 +3434,10 @@ static unsigned char XGI_GetLCDInfo(unsigned short ModeNo,
}

if (pVBInfo->IF_DEF_LVDS == 0) {
if ((pVBInfo->LCDResInfo == Panel1400x1050) && (pVBInfo->VBInfo
if ((pVBInfo->LCDResInfo == Panel_1400x1050) && (pVBInfo->VBInfo
& SetCRT2ToLCD) && (ModeNo > 0x13) && (resinfo
== 9) && (!(tempbx & EnableScalingLCD)))
/* set to center in 1280x1024 LCDB for Panel1400x1050 */
/* set to center in 1280x1024 LCDB for Panel_1400x1050 */
tempbx |= SetLCDtoNonExpanding;
}

Expand All @@ -3448,7 +3448,7 @@ static unsigned char XGI_GetLCDInfo(unsigned short ModeNo,
} else {
if (ModeNo > 0x13) {
if (pVBInfo->LCDResInfo
== Panel1024x768) {
== Panel_1024x768) {
if (resinfo == 4) {/* 512x384 */
tempbx |= EnableLVDSDDA;
}
Expand Down Expand Up @@ -3801,14 +3801,14 @@ static void XGI_GetCRT2ResInfo(unsigned short ModeNo,

if (pVBInfo->VBInfo & SetCRT2ToLCD) {
if (pVBInfo->IF_DEF_LVDS == 0) {
if (pVBInfo->LCDResInfo == Panel1600x1200) {
if (pVBInfo->LCDResInfo == Panel_1600x1200) {
if (!(pVBInfo->LCDInfo & LCDVESATiming)) {
if (yres == 1024)
yres = 1056;
}
}

if (pVBInfo->LCDResInfo == Panel1280x1024) {
if (pVBInfo->LCDResInfo == Panel_1280x1024) {
if (yres == 400)
yres = 405;
else if (yres == 350)
Expand All @@ -3820,7 +3820,7 @@ static void XGI_GetCRT2ResInfo(unsigned short ModeNo,
}
}

if (pVBInfo->LCDResInfo == Panel1024x768) {
if (pVBInfo->LCDResInfo == Panel_1024x768) {
if (!(pVBInfo->LCDInfo & LCDVESATiming)) {
if (!(pVBInfo->LCDInfo
& LCDNonExpanding)) {
Expand Down Expand Up @@ -3954,7 +3954,7 @@ static void XGI_GetCRT2Data(unsigned short ModeNo, unsigned short ModeIdIndex,
pVBInfo->HT = LCDPtr->LCDHT;
pVBInfo->VT = LCDPtr->LCDVT;

if (pVBInfo->LCDResInfo == Panel1024x768) {
if (pVBInfo->LCDResInfo == Panel_1024x768) {
tempax = 1024;
tempbx = 768;

Expand All @@ -3971,10 +3971,10 @@ static void XGI_GetCRT2Data(unsigned short ModeNo, unsigned short ModeIdIndex,
tempbx = 768;
} else
tempbx = 768;
} else if (pVBInfo->LCDResInfo == Panel1024x768x75) {
} else if (pVBInfo->LCDResInfo == Panel_1024x768x75) {
tempax = 1024;
tempbx = 768;
} else if (pVBInfo->LCDResInfo == Panel1280x1024) {
} else if (pVBInfo->LCDResInfo == Panel_1280x1024) {
tempax = 1280;
if (pVBInfo->VGAVDE == 360)
tempbx = 768;
Expand All @@ -3984,10 +3984,10 @@ static void XGI_GetCRT2Data(unsigned short ModeNo, unsigned short ModeIdIndex,
tempbx = 864;
else
tempbx = 1024;
} else if (pVBInfo->LCDResInfo == Panel1280x1024x75) {
} else if (pVBInfo->LCDResInfo == Panel_1280x1024x75) {
tempax = 1280;
tempbx = 1024;
} else if (pVBInfo->LCDResInfo == Panel1280x960) {
} else if (pVBInfo->LCDResInfo == Panel_1280x960) {
tempax = 1280;
if (pVBInfo->VGAVDE == 350)
tempbx = 700;
Expand All @@ -3997,15 +3997,15 @@ static void XGI_GetCRT2Data(unsigned short ModeNo, unsigned short ModeIdIndex,
tempbx = 960;
else
tempbx = 960;
} else if (pVBInfo->LCDResInfo == Panel1400x1050) {
} else if (pVBInfo->LCDResInfo == Panel_1400x1050) {
tempax = 1400;
tempbx = 1050;

if (pVBInfo->VGAVDE == 1024) {
tempax = 1280;
tempbx = 1024;
}
} else if (pVBInfo->LCDResInfo == Panel1600x1200) {
} else if (pVBInfo->LCDResInfo == Panel_1600x1200) {
tempax = 1600;
tempbx = 1200; /* alan 10/14/2003 */
if (!(pVBInfo->LCDInfo & LCDVESATiming)) {
Expand Down Expand Up @@ -4513,19 +4513,19 @@ static void XGI_SetLockRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
}
} else if (!(modeflag & HalfDCLK)) {
temp -= 4;
if (pVBInfo->LCDResInfo != Panel1280x960 &&
if (pVBInfo->LCDResInfo != Panel_1280x960 &&
pVBInfo->VGAHDE >= 800) {
temp -= 7;
if (pVBInfo->ModeType == ModeEGA &&
pVBInfo->VGAVDE == 1024) {
temp += 15;
if (pVBInfo->LCDResInfo !=
Panel1280x1024)
Panel_1280x1024)
temp += 7;
}

if (pVBInfo->VGAHDE >= 1280 &&
pVBInfo->LCDResInfo != Panel1280x960 &&
pVBInfo->LCDResInfo != Panel_1280x960 &&
(pVBInfo->LCDInfo & LCDNonExpanding))
temp += 28;
}
Expand Down Expand Up @@ -4619,7 +4619,7 @@ static void XGI_SetLockRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
push2 = tempbx;

if (pVBInfo->VBInfo & SetCRT2ToLCD) {
if (pVBInfo->LCDResInfo == Panel1024x768) {
if (pVBInfo->LCDResInfo == Panel_1024x768) {
if (!(pVBInfo->LCDInfo & LCDVESATiming)) {
if (tempbx == 350)
tempbx += 5;
Expand Down Expand Up @@ -5267,7 +5267,7 @@ static void XGI_SetLCDRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
xgifb_reg_and_or(pVBInfo->Part2Port, 0x2B, 0x0F, temp);
temp = 0x01;

if (pVBInfo->LCDResInfo == Panel1280x1024) {
if (pVBInfo->LCDResInfo == Panel_1280x1024) {
if (pVBInfo->ModeType == ModeEGA) {
if (pVBInfo->VGAHDE >= 1024) {
temp = 0x02;
Expand Down Expand Up @@ -5305,14 +5305,14 @@ static void XGI_SetLCDRegs(unsigned short ModeNo, unsigned short ModeIdIndex,
tempah = pVBInfo->LCDResInfo;
tempah &= PanelResInfo;

if ((tempah == Panel1024x768) || (tempah == Panel1024x768x75)) {
if ((tempah == Panel_1024x768) || (tempah == Panel_1024x768x75)) {
tempbx = 1024;
tempcx = 768;
} else if ((tempah == Panel1280x1024) ||
(tempah == Panel1280x1024x75)) {
} else if ((tempah == Panel_1280x1024) ||
(tempah == Panel_1280x1024x75)) {
tempbx = 1280;
tempcx = 1024;
} else if (tempah == Panel1400x1050) {
} else if (tempah == Panel_1400x1050) {
tempbx = 1400;
tempcx = 1050;
} else {
Expand Down Expand Up @@ -6807,11 +6807,11 @@ static void XGI_SetCRT2ModeRegs(unsigned short ModeNo,
tempah |= 0x40;
}

if ((pVBInfo->LCDResInfo == Panel1280x1024)
|| (pVBInfo->LCDResInfo == Panel1280x1024x75))
if ((pVBInfo->LCDResInfo == Panel_1280x1024)
|| (pVBInfo->LCDResInfo == Panel_1280x1024x75))
tempah |= 0x80;

if (pVBInfo->LCDResInfo == Panel1280x960)
if (pVBInfo->LCDResInfo == Panel_1280x960)
tempah |= 0x80;

xgifb_reg_set(pVBInfo->Part4Port, 0x0C, tempah);
Expand Down
Loading

0 comments on commit 0c25071

Please sign in to comment.