git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
video
/
sis
/
init301.c
diff --git
a/drivers/video/sis/init301.c
b/drivers/video/sis/init301.c
index
c3e070a
..
2d88f90
100644
(file)
--- a/
drivers/video/sis/init301.c
+++ b/
drivers/video/sis/init301.c
@@
-8564,9
+8564,11
@@
SiS_ChrontelDoSomething3(struct SiS_Private *SiS_Pr, unsigned short ModeNo)
static void
SiS_ChrontelDoSomething2(struct SiS_Private *SiS_Pr)
{
static void
SiS_ChrontelDoSomething2(struct SiS_Private *SiS_Pr)
{
- unsigned short temp;
+ unsigned short temp
,tempcl,tempch
;
SiS_LongDelay(SiS_Pr, 1);
SiS_LongDelay(SiS_Pr, 1);
+ tempcl = 3;
+ tempch = 0;
do {
temp = SiS_GetCH701x(SiS_Pr,0x66);
do {
temp = SiS_GetCH701x(SiS_Pr,0x66);
@@
-8580,6
+8582,13
@@
SiS_ChrontelDoSomething2(struct SiS_Private *SiS_Pr)
SiS_SetCH701xForLCD(SiS_Pr);
SiS_SetCH701xForLCD(SiS_Pr);
+ if(tempcl == 0) {
+ if(tempch == 3) break;
+ SiS_ChrontelResetDB(SiS_Pr);
+ tempcl = 3;
+ tempch++;
+ }
+ tempcl--;
temp = SiS_GetCH701x(SiS_Pr,0x76);
temp &= 0xfb; /* Reset PLL */
SiS_SetCH701x(SiS_Pr,0x76,temp);
temp = SiS_GetCH701x(SiS_Pr,0x76);
temp &= 0xfb; /* Reset PLL */
SiS_SetCH701x(SiS_Pr,0x76,temp);