XLibre/xf86-video-ast
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-ast.git synced 2026-03-24 01:24:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed S3 Resume Failed Issue

Browse Source
This commit is contained in:
Y.C. Chen
2013-08-05 23:46:47 +08:00
parent 1e3dbbd8e9
commit 9ab60c6383
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ast_driver.c
View File

@@ -1005,7 +1005,10 @@ ASTEnterVT(VT_FUNC_ARGS_DECL)
if (pAST->jChipType == AST1180)
bInitAST1180(pScrn);
else
{
vEnableASTVGAMMIO(pScrn);
InitVGA(pScrn, 1);
}
ASTRestore(pScrn);
}
@@ -1341,6 +1344,8 @@ ASTRestore(ScrnInfoPtr pScrn)
pAST = ASTPTR(pScrn);
astReg = &pAST->SavedReg;
ASTDisplayPowerManagementSet(pScrn, DPMSModeOff, 0);
if (pAST->jChipType == AST1180)
{
for (i=0; i<12; i++)

15
src/ast_vgatool.c
View File

@@ -660,15 +660,13 @@ Bool bIsVGAEnabled(ScrnInfoPtr pScrn)
}
else
{
ch = inb(pAST->RelocateIO + 0x43);
ch = GetReg(VGA_ENABLE_PORT);
if (ch)
if (ch == 0x01)
{
vASTOpenKey(pScrn);
GetIndexRegMask(CRTC_PORT, 0xB6, 0xFF, ch);
outw(pAST->RelocateIO + 0x54, 0xa880);
outb(pAST->RelocateIO + 0x54, 0xb6);
ch = inb(pAST->RelocateIO + 0x55);
return (ch & 0x04);
}
@@ -2978,7 +2976,8 @@ void vEnableASTVGAMMIO(ScrnInfoPtr pScrn)
ULONG ulData;
UCHAR jReg;
if (!xf86IsPrimaryPci(pAST->PciInfo))
jReg = inb(pAST->RelocateIO + 0x43);
if (jReg != 0x01)
{
/* Enable PCI */
PCI_READ_LONG(pAST->PciInfo, &ulData, 0x04);