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

Revert " Support DP501 Output"

Browse Source 
This reverts commit 2a2ecb5517.
This commit is contained in:
Stefan Dirsch
2014-03-18 11:56:16 +01:00
parent ef37427b08
commit 99e07e0341
5 changed files with 59 additions and 4050 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/ast.h
View File

@@ -71,15 +71,8 @@ typedef enum _CHIP_ID {
AST1180
} CHIP_ID;
typedef enum _TX_CHIPTYPE {
Tx_NONE,
Tx_Sil164,
Tx_Ite66121,
Tx_DP501
} TX_CHIPTYPE;
/* AST REC Info */
#define AST_NAME "AST"
#define AST_NAME "AST"
#define AST_DRIVER_NAME "ast"
#define AST_MAJOR_VERSION PACKAGE_VERSION_MAJOR
#define AST_MINOR_VERSION PACKAGE_VERSION_MINOR
@@ -89,15 +82,11 @@ typedef enum _TX_CHIPTYPE {
/* Customized Info */
#define DEFAULT_VIDEOMEM_SIZE 0x00800000
#define DEFAULT_MMIO_SIZE 0x00020000
#define DEFAULT_CMDQ_SIZE 0x00100000
#define MIN_CMDQ_SIZE 0x00040000
#define DEFAULT_MMIO_SIZE 0x00020000
#define DEFAULT_CMDQ_SIZE 0x00100000
#define MIN_CMDQ_SIZE 0x00040000
#define CMD_QUEUE_GUARD_BAND 0x00000020
#define DEFAULT_HWC_NUM 0x00000002
/* Customized Info. for DVO */
#define HDMI_I2C_CHANNEL 1
#define HDMI_TX_I2C_SLAVE_ADDR 0x98
#define DEFAULT_HWC_NUM 0x00000002
/* Patch Info */
#define ABI_VIDEODRV_VERSION_PATCH SET_ABI_VERSION(0, 5)
@@ -280,10 +269,6 @@ typedef struct _ASTRec {
int mon_h_active; /* Monitor Info. */
int mon_v_active;
UCHAR jTxChipType; /* 3rd TX */
UCHAR DP501_MaxVCLK;
UCHAR *pDP501FWBufferVirtualAddress;
#ifdef AstVideo
XF86VideoAdaptorPtr adaptor;
Atom xvBrightness, xvContrast, xvColorKey, xvHue, xvSaturation;

21
src/ast_driver.c
View File

@@ -85,9 +85,6 @@ extern Bool bInitAST1180(ScrnInfoPtr pScrn);
extern void GetAST1180DRAMInfo(ScrnInfoPtr pScrn);
extern void vEnableASTVGAMMIO(ScrnInfoPtr pScrn);
extern Bool ReadEDID_M68K(ScrnInfoPtr pScrn, BYTE *pEDIDData);
extern UCHAR GetLinkMaxCLK(ScrnInfoPtr pScrn);
extern Bool bInitCMDQInfo(ScrnInfoPtr pScrn, ASTRecPtr pAST);
extern Bool bEnableCMDQ(ScrnInfoPtr pScrn, ASTRecPtr pAST);
extern void vDisable2D(ScrnInfoPtr pScrn, ASTRecPtr pAST);
@@ -1268,14 +1265,10 @@ ASTGetRec(ScrnInfoPtr pScrn)
static void
ASTFreeRec(ScrnInfoPtr pScrn)
{
ASTRecPtr pAST = ASTPTR(pScrn);
if (!pScrn)
return;
if (!pScrn->driverPrivate)
return;
if (pAST->pDP501FWBufferVirtualAddress)
free(pAST->pDP501FWBufferVirtualAddress);
free(pScrn->driverPrivate);
pScrn->driverPrivate = 0;
}
@@ -1540,12 +1533,6 @@ ASTProbeDDC(ScrnInfoPtr pScrn, int index)
{
if (pAST->jChipType == AST1180)
Flags = GetVGA2EDID(pScrn, DDC_data);
else if (pAST->jTxChipType == Tx_DP501)
{
Flags = ReadEDID_M68K(pScrn, DDC_data);
if (Flags == FALSE)
Flags = GetVGAEDID(pScrn, DDC_data);
}
else
Flags = GetVGAEDID(pScrn, DDC_data);
@@ -1590,14 +1577,6 @@ ASTDoDDC(ScrnInfoPtr pScrn, int index)
{
if (pAST->jChipType == AST1180)
Flags = GetVGA2EDID(pScrn, DDC_data);
else if (pAST->jTxChipType == Tx_DP501)
{
pAST->DP501_MaxVCLK = 0xFF;
Flags = ReadEDID_M68K(pScrn, DDC_data);
if (Flags) pAST->DP501_MaxVCLK = GetLinkMaxCLK(pScrn);
else
Flags = GetVGAEDID(pScrn, DDC_data);
}
else
Flags = GetVGAEDID(pScrn, DDC_data);

9
src/ast_mode.c
View File

@@ -413,8 +413,8 @@ VBIOS_DAC_INFO DAC_VGA[] = {
/* extern. function */
extern void vASTOpenKey(ScrnInfoPtr pScrn);
extern Bool bASTRegInit(ScrnInfoPtr pScrn);
extern void vAST1000DisplayOn(ScrnInfoPtr pScrn);
extern void vAST1000DisplayOff(ScrnInfoPtr pScrn);
extern void vAST1000DisplayOn(ASTRecPtr pAST);
extern void vAST1000DisplayOff(ASTRecPtr pAST);
extern Bool bEnable2D(ScrnInfoPtr pScrn, ASTRecPtr pAST);
extern void vDisable2D(ScrnInfoPtr pScrn, ASTRecPtr pAST);
@@ -465,8 +465,6 @@ ASTSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
vASTOpenKey(pScrn);
bASTRegInit(pScrn);
vAST1000DisplayOff(pScrn);
vSetStdReg(pScrn, mode, &vgamodeinfo);
vSetCRTCReg(pScrn, mode, &vgamodeinfo);
vSetOffsetReg(pScrn, mode, &vgamodeinfo);
@@ -474,8 +472,6 @@ ASTSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
vSetExtReg(pScrn, mode, &vgamodeinfo);
vSetSyncReg(pScrn, mode, &vgamodeinfo);
bSetDACReg(pScrn, mode, &vgamodeinfo);
vAST1000DisplayOn(pScrn);
}
/* post set mode */
@@ -495,6 +491,7 @@ ASTSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
}
}
#endif
vAST1000DisplayOn(pAST);
return (TRUE);
}

4050
src/ast_vgatool.c
View File

File diff suppressed because it is too large Load Diff

4
src/ast_vgatool.h
View File

@@ -166,7 +166,3 @@
*(ULONG *) (pAST->MMIOVirtualAddr + 0xF000) = 0x1; \
*(ULONG *) (pAST->MMIOVirtualAddr + 0x10000 + ((addr) & 0x0000FFFF)) = (data); \
}
/* Delay */
#define DelayUS(x) usleep(x)
#define DelayMS(x) DelayUS(1000*x)