Hello community, here is the log from the commit of package xf86-video-ast for openSUSE:Factory checked in at 2014-04-26 06:06:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-ast (Old) and /work/SRC/openSUSE:Factory/.xf86-video-ast.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-ast" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-ast/xf86-video-ast.changes 2014-03-18 14:07:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xf86-video-ast.new/xf86-video-ast.changes 2014-04-26 06:06:34.000000000 +0200 @@ -1,0 +2,28 @@ +Thu Apr 24 10:40:58 UTC 2014 - [email protected] + +- Updated to Version 0.99.9: + This obsoletes: + * u_ast-fix-falling-back-after-kernel-check.patch + * u_Fixed-driver-name-in-error-message-about-KMS-active.patch + It adds support for the AST 2400 chip as well as for the DP501 (and + some other) encoders (bnc#871134). +- Added clean up patches: + * Fix compiler warnings: + u_01-Fix-compiler-warnings-get-rid-if-xf86PciInfo-h.patch + u_02-Fix-compiler-warnings-get-rid-of-deprecated-IOADDRESS.patch + u_03-Fix-compiler-warnings-add-DrawablePtr-argument-to-ASTPutImage.patch + * Clean up namespace: + u_04-Clean-up-namespace-in-ast_vgatools.c.patch + u_05-Clean-up-namespace-in-ast_2dtool.c.patch + u_06-Clean-up-namespace-in-ast_cursor.c.patch + u_07-Clean-up-namespace-in-ast_mode.c.patch + u_08-Clean-up-namespace-in-ast_accel.c.patch + u_09-Clean-up-namespace-in-ast_tool.c.patch + * Misc cleanup: + u_10-Include-local-headers-only-when-needed.patch + u_11-Fix-typo.patch + u_12-Fix-ABI-version-conflict-in-xf86UnclaimPciSlot.patch + u_13-Move-firmware-for-DP501-to-a-separate-file.patch + u_14-Add-_AST_H_-define-to-ast.h.patch + +------------------------------------------------------------------- Old: ---- u_Fixed-driver-name-in-error-message-about-KMS-active.patch u_ast-fix-falling-back-after-kernel-check.patch xf86-video-ast-0.98.0.tar.bz2 New: ---- u_01-Fix-compiler-warnings-get-rid-if-xf86PciInfo-h.patch u_02-Fix-compiler-warnings-get-rid-of-deprecated-IOADDRESS.patch u_03-Fix-compiler-warnings-add-DrawablePtr-argument-to-ASTPutImage.patch u_04-Clean-up-namespace-in-ast_vgatools.c.patch u_05-Clean-up-namespace-in-ast_2dtool.c.patch u_06-Clean-up-namespace-in-ast_cursor.c.patch u_07-Clean-up-namespace-in-ast_mode.c.patch u_08-Clean-up-namespace-in-ast_accel.c.patch u_09-Clean-up-namespace-in-ast_tool.c.patch u_10-Include-local-headers-only-when-needed.patch u_11-Fix-typo.patch u_12-Fix-ABI-version-conflict-in-xf86UnclaimPciSlot.patch u_13-Move-firmware-for-DP501-to-a-separate-file.patch u_14-Add-_AST_H_-define-to-ast.h.patch xf86-video-ast-0.99.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-ast.spec ++++++ --- /var/tmp/diff_new_pack.K6w3RM/_old 2014-04-26 06:06:35.000000000 +0200 +++ /var/tmp/diff_new_pack.K6w3RM/_new 2014-04-26 06:06:35.000000000 +0200 @@ -17,15 +17,27 @@ Name: xf86-video-ast -Version: 0.98.0 +Version: 0.99.9 Release: 0 Summary: ASpeed Technologies video driver for the Xorg X server License: MIT Group: System/X11/Servers/XF86_4 Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2 -Patch0: u_ast-fix-falling-back-after-kernel-check.patch -Patch1: u_Fixed-driver-name-in-error-message-about-KMS-active.patch +Patch1: u_01-Fix-compiler-warnings-get-rid-if-xf86PciInfo-h.patch +Patch2: u_02-Fix-compiler-warnings-get-rid-of-deprecated-IOADDRESS.patch +Patch3: u_03-Fix-compiler-warnings-add-DrawablePtr-argument-to-ASTPutImage.patch +Patch4: u_04-Clean-up-namespace-in-ast_vgatools.c.patch +Patch5: u_05-Clean-up-namespace-in-ast_2dtool.c.patch +Patch6: u_06-Clean-up-namespace-in-ast_cursor.c.patch +Patch7: u_07-Clean-up-namespace-in-ast_mode.c.patch +Patch8: u_08-Clean-up-namespace-in-ast_accel.c.patch +Patch9: u_09-Clean-up-namespace-in-ast_tool.c.patch +Patch10: u_10-Include-local-headers-only-when-needed.patch +Patch11: u_11-Fix-typo.patch +Patch12: u_12-Fix-ABI-version-conflict-in-xf86UnclaimPciSlot.patch +Patch13: u_13-Move-firmware-for-DP501-to-a-separate-file.patch +Patch14: u_14-Add-_AST_H_-define-to-ast.h.patch BuildRequires: pkg-config BuildRequires: pkgconfig(fontsproto) BuildRequires: pkgconfig(pciaccess) >= 0.8.0 @@ -48,8 +60,20 @@ %prep %setup -q -%patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 %build %configure ++++++ u_01-Fix-compiler-warnings-get-rid-if-xf86PciInfo-h.patch ++++++ From: Egbert Eich <[email protected]> Date: Tue Apr 22 11:38:10 2014 +0200 Subject: [PATCH 1/14]Fix compiler warnings: get rid if xf86PciInfo,h Patch-Mainline: to be upstreamed Git-commit: 1af0ec68407ff1ea45fc03bab58acde669da07be Git-repo: git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ast References: Signed-off-by: Egbert Eich <[email protected]> xf86PciInfo.h is not needed in the ASpeed driver at all. Signed-off-by: Egbert Eich <[email protected]> --- src/ast_2dtool.c | 1 - src/ast_accel.c | 1 - src/ast_cursor.c | 1 - src/ast_driver.c | 1 - src/ast_mode.c | 1 - src/ast_tool.c | 1 - src/ast_vgatool.c | 1 - 7 files changed, 7 deletions(-) diff --git a/src/ast_2dtool.c b/src/ast_2dtool.c index 210d75c..47f0d64 100644 --- a/src/ast_2dtool.c +++ b/src/ast_2dtool.c @@ -36,7 +36,6 @@ #include "xf86xv.h" #include <X11/extensions/Xv.h> -#include "xf86PciInfo.h" #include "xf86Pci.h" /* framebuffer offscreen manager */ diff --git a/src/ast_accel.c b/src/ast_accel.c index 71eeb79..3bfe7ee 100644 --- a/src/ast_accel.c +++ b/src/ast_accel.c @@ -36,7 +36,6 @@ #include "xf86xv.h" #include <X11/extensions/Xv.h> -#include "xf86PciInfo.h" #include "xf86Pci.h" /* framebuffer offscreen manager */ diff --git a/src/ast_cursor.c b/src/ast_cursor.c index 80d787a..7bfa15f 100644 --- a/src/ast_cursor.c +++ b/src/ast_cursor.c @@ -36,7 +36,6 @@ #include "xf86xv.h" #include <X11/extensions/Xv.h> -#include "xf86PciInfo.h" #include "xf86Pci.h" /* framebuffer offscreen manager */ diff --git a/src/ast_driver.c b/src/ast_driver.c index 5f7fa8e..c2ba129 100644 --- a/src/ast_driver.c +++ b/src/ast_driver.c @@ -40,7 +40,6 @@ #include "xf86xv.h" #include <X11/extensions/Xv.h> -#include "xf86PciInfo.h" #include "xf86Pci.h" /* framebuffer offscreen manager */ diff --git a/src/ast_mode.c b/src/ast_mode.c index 964fe7a..8c3d828 100644 --- a/src/ast_mode.c +++ b/src/ast_mode.c @@ -36,7 +36,6 @@ #include "xf86xv.h" #include <X11/extensions/Xv.h> -#include "xf86PciInfo.h" #include "xf86Pci.h" /* framebuffer offscreen manager */ diff --git a/src/ast_tool.c b/src/ast_tool.c index 7f1362e..1e1cb6b 100644 --- a/src/ast_tool.c +++ b/src/ast_tool.c @@ -36,7 +36,6 @@ #include "xf86xv.h" #include <X11/extensions/Xv.h> -#include "xf86PciInfo.h" #include "xf86Pci.h" /* framebuffer offscreen manager */ diff --git a/src/ast_vgatool.c b/src/ast_vgatool.c index 73d379c..8522a6f 100644 --- a/src/ast_vgatool.c +++ b/src/ast_vgatool.c @@ -36,7 +36,6 @@ #include "xf86xv.h" #include <X11/extensions/Xv.h> -#include "xf86PciInfo.h" #include "xf86Pci.h" /* framebuffer offscreen manager */ ++++++ u_02-Fix-compiler-warnings-get-rid-of-deprecated-IOADDRESS.patch ++++++ From: Egbert Eich <[email protected]> Date: Tue Apr 22 11:41:07 2014 +0200 Subject: [PATCH 2/14]Fix compiler warnings: get rid of deprecated IOADDRESS Patch-Mainline: to be upstreamed Git-commit: a186bd0eafa8f2f6eb0db39fd046591bf2d3e507 Git-repo: git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ast References: Signed-off-by: Egbert Eich <[email protected]> For newer ABI versions IOADDRESS can be replaced by int which is big enough to hold an PIO offset. Signed-off-by: Egbert Eich <[email protected]> --- src/ast.h | 6 ++++-- src/ast_driver.c | 18 ++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/ast.h b/src/ast.h index cbe62fb..3b56a6c 100644 --- a/src/ast.h +++ b/src/ast.h @@ -261,9 +261,11 @@ typedef struct _ASTRec { unsigned long FbMapSize; unsigned long MMIOMapSize; - IOADDRESS IODBase; /* Base of PIO memory area */ - IOADDRESS PIOOffset; +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 IOADDRESS RelocateIO; +#else + int RelocateIO; +#endif VIDEOMODE VideoModeInfo; ASTRegRec SavedReg; diff --git a/src/ast_driver.c b/src/ast_driver.c index c2ba129..639562d 100644 --- a/src/ast_driver.c +++ b/src/ast_driver.c @@ -570,23 +570,21 @@ ASTPreInit(ScrnInfoPtr pScrn, int flags) xf86DrvMsg(pScrn->scrnIndex, from, "Chipset: \"%s\"\n", (pScrn->chipset != NULL) ? pScrn->chipset : "Unknown ast"); - /* Resource Allocation */ + #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - pAST->IODBase = pScrn->domainIOBase; -#else - pAST->IODBase = 0; -#endif /* "Patch" the PIOOffset inside vgaHW in order to force * the vgaHW module to use our relocated i/o ports. */ + VGAHWPTR(pScrn)->PIOOffset = + pScrn->domainIOBase + PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) - 0x380; + + pAST->RelocateIO = pScrn->domainIOBase + + PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO); +#else + pAST->RelocateIO = (PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO)); -#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 - VGAHWPTR(pScrn)->PIOOffset = /* ... */ #endif - pAST->PIOOffset = - pAST->IODBase + PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) - 0x380; - pAST->RelocateIO = (IOADDRESS)(PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) + pAST->IODBase); if (pAST->pEnt->device->MemBase != 0) { pAST->FBPhysAddr = pAST->pEnt->device->MemBase; ++++++ u_03-Fix-compiler-warnings-add-DrawablePtr-argument-to-ASTPutImage.patch ++++++ From: Egbert Eich <[email protected]> Date: Tue Apr 22 12:37:49 2014 +0200 Subject: [PATCH 3/14]Fix compiler warnings: add DrawablePtr argument to ASTPutImage Patch-Mainline: to be upstreamed Git-commit: cf5db4696ac80c3cefce7acb38ba553863c1fc31 Git-repo: git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ast References: Signed-off-by: Egbert Eich <[email protected]> An archaeological survey revealed that this ABI change took place in 2006 already. Signed-off-by: Egbert Eich <[email protected]> --- src/ast_driver.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ast_driver.c b/src/ast_driver.c index 639562d..b04b026 100644 --- a/src/ast_driver.c +++ b/src/ast_driver.c @@ -128,7 +128,11 @@ static Bool ASTModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode); static void ASTInitVideo(ScreenPtr pScreen); static int ASTPutImage( ScrnInfoPtr, short, short, short, short, short, short, short, short, - int, unsigned char*, short, short, Bool, RegionPtr, pointer); + int, unsigned char*, short, short, Bool, RegionPtr, pointer +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 1 + , DrawablePtr pDraw +#endif + ); #endif /* @@ -2134,6 +2138,9 @@ static int ASTPutImage(ScrnInfoPtr pScrn, short width, short height, Bool sync, RegionPtr clipBoxes, pointer data +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 1 + , DrawablePtr pDraw +#endif ) { ASTPtr pAST = ASTPTR(pScrn); ++++++ u_04-Clean-up-namespace-in-ast_vgatools.c.patch ++++++ ++++ 971 lines (skipped) ++++++ u_05-Clean-up-namespace-in-ast_2dtool.c.patch ++++++ ++++ 628 lines (skipped) ++++++ u_06-Clean-up-namespace-in-ast_cursor.c.patch ++++++ From: Egbert Eich <[email protected]> Date: Tue Apr 22 13:47:39 2014 +0200 Subject: [PATCH 6/14]Clean up namespace in ast_cursor.c Patch-Mainline: to be upstreamed Git-commit: 0d61630966ca6958d8e6fafe0575191a4634b9a4 Git-repo: git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ast References: Signed-off-by: Egbert Eich <[email protected]> - Make sure exported functions have 'AST' in their name. This avoids name space conflicts with the server or other drivers. - Place declaration of exported functions in a header file. This ensures that changes to the function type or arguments are followed thru everywhere. --- src/ast.h | 7 +++++++ src/ast_cursor.c | 5 +---- src/ast_driver.c | 3 --- src/ast_mode.c | 5 +---- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/ast.h b/src/ast.h index 20df2e1..707149e 100644 --- a/src/ast.h +++ b/src/ast.h @@ -335,6 +335,13 @@ UCHAR *pASTjRequestCMDQ(ASTRecPtr pAST, ULONG ulDataLen); Bool bASTEnable2D(ScrnInfoPtr pScrn, ASTRecPtr pAST); void vASTDisable2D(ScrnInfoPtr pScrn, ASTRecPtr pAST); +/* ast_cursor.c */ +#ifdef HWC +Bool ASTCursorInit(ScreenPtr pScreen); +Bool bASTInitHWC(ScrnInfoPtr pScrn, ASTRecPtr pAST); +void ASTDisableHWC(ScrnInfoPtr pScrn); +#endif + /* Include Files */ #include "ast_mode.h" #include "ast_vgatool.h" diff --git a/src/ast_cursor.c b/src/ast_cursor.c index 7bfa15f..4598daa 100644 --- a/src/ast_cursor.c +++ b/src/ast_cursor.c @@ -53,9 +53,6 @@ #ifdef HWC /* Prototype type declaration */ -Bool ASTCursorInit(ScreenPtr pScreen); -Bool bInitHWC(ScrnInfoPtr pScrn, ASTRecPtr pAST); -void ASTDisableHWC(ScrnInfoPtr pScrn); static void ASTShowCursor(ScrnInfoPtr pScrn); static void ASTHideCursor(ScrnInfoPtr pScrn); static void ASTSetCursorPosition(ScrnInfoPtr pScrn, int x, int y); @@ -111,7 +108,7 @@ ASTCursorInit(ScreenPtr pScreen) } -Bool bInitHWC(ScrnInfoPtr pScrn, ASTRecPtr pAST) +Bool bASTInitHWC(ScrnInfoPtr pScrn, ASTRecPtr pAST) { ScreenPtr pScreen; diff --git a/src/ast_driver.c b/src/ast_driver.c index 5b02c9e..4fc8b28 100644 --- a/src/ast_driver.c +++ b/src/ast_driver.c @@ -69,9 +69,6 @@ extern Bool ASTSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode); extern Bool ASTAccelInit(ScreenPtr pScreen); #endif -extern Bool ASTCursorInit(ScreenPtr pScreen); -extern void ASTDisableHWC(ScrnInfoPtr pScrn); - /* Mandatory functions */ static void ASTIdentify(int flags); const OptionInfoRec *ASTAvailableOptions(int chipid, int busid); diff --git a/src/ast_mode.c b/src/ast_mode.c index 3d06700..9e41bd4 100644 --- a/src/ast_mode.c +++ b/src/ast_mode.c @@ -406,9 +406,6 @@ VBIOS_DAC_INFO DAC_VGA[] = { { 0x00, 0x00, 0x00 }, { 0x00, 0x00, 0x00 }, { 0x00, 0x00, 0x00 }, { 0x00, 0x00, 0x00 }, }; -/* extern. function */ -extern Bool bInitHWC(ScrnInfoPtr pScrn, ASTRecPtr pAST); - /* Prototype type declaration*/ Bool ASTSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode); Bool bGetAST1000VGAModeInfo(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); @@ -477,7 +474,7 @@ ASTSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode) #endif #ifdef HWC if (!pAST->noHWC) { - if (!bInitHWC(pScrn, pAST)) { + if (!bASTInitHWC(pScrn, pAST)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR,"Init HWC failed\n"); pAST->noHWC = TRUE; } ++++++ u_07-Clean-up-namespace-in-ast_mode.c.patch ++++++ From: Egbert Eich <[email protected]> Date: Tue Apr 22 13:57:25 2014 +0200 Subject: [PATCH 7/14]Clean up namespace in ast_mode.c Patch-Mainline: to be upstreamed Git-commit: 441091fb94f5d0ef980a26c109af8ddedcd6c617 Git-repo: git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ast References: Signed-off-by: Egbert Eich <[email protected]> - Make local functions static This sometimes helps the compiler to optimize. - Made sure exported functions have 'AST' in their name. This avoids name space conflicts with the server or other drivers. - Placed declaration of exported functions in a header file. This ensures that changes to the function type or arguments are followed thru everywhere. Signed-off-by: Egbert Eich <[email protected]> --- src/ast.h | 3 ++ src/ast_driver.c | 2 -- src/ast_mode.c | 96 +++++++++++++++++++++++++++----------------------------- 3 files changed, 50 insertions(+), 51 deletions(-) diff --git a/src/ast.h b/src/ast.h index 707149e..89971d3 100644 --- a/src/ast.h +++ b/src/ast.h @@ -342,6 +342,9 @@ Bool bASTInitHWC(ScrnInfoPtr pScrn, ASTRecPtr pAST); void ASTDisableHWC(ScrnInfoPtr pScrn); #endif +/* ast_mode.c */ +Bool ASTSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode); + /* Include Files */ #include "ast_mode.h" #include "ast_vgatool.h" diff --git a/src/ast_driver.c b/src/ast_driver.c index 4fc8b28..8e3a814 100644 --- a/src/ast_driver.c +++ b/src/ast_driver.c @@ -63,8 +63,6 @@ extern Bool ASTUnmapMem(ScrnInfoPtr pScrn); extern Bool ASTMapMMIO(ScrnInfoPtr pScrn); extern void ASTUnmapMMIO(ScrnInfoPtr pScrn); -extern Bool ASTSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode); - #ifdef HAVE_XAA_H extern Bool ASTAccelInit(ScreenPtr pScreen); #endif diff --git a/src/ast_mode.c b/src/ast_mode.c index 9e41bd4..ceb2ddb 100644 --- a/src/ast_mode.c +++ b/src/ast_mode.c @@ -53,7 +53,7 @@ /* Driver specific headers */ #include "ast.h" -VBIOS_STDTABLE_STRUCT StdTable[] = { +static VBIOS_STDTABLE_STRUCT StdTable[] = { /* MD_2_3_400 */ { 0x67, @@ -126,7 +126,7 @@ VBIOS_STDTABLE_STRUCT StdTable[] = { }, }; -VBIOS_ENHTABLE_STRUCT Res640x480Table[] = { +static VBIOS_ENHTABLE_STRUCT Res640x480Table[] = { { 800, 640, 8, 96, 525, 480, 2, 2, VCLK25_175, /* 60Hz */ (SyncNN | HBorder | VBorder | Charx8Dot), 60, 1, 0x2E }, { 832, 640, 16, 40, 520, 480, 1, 3, VCLK31_5, /* 72Hz */ @@ -140,7 +140,7 @@ VBIOS_ENHTABLE_STRUCT Res640x480Table[] = { }; -VBIOS_ENHTABLE_STRUCT Res800x600Table[] = { +static VBIOS_ENHTABLE_STRUCT Res800x600Table[] = { {1024, 800, 24, 72, 625, 600, 1, 2, VCLK36, /* 56Hz */ (SyncPP | Charx8Dot), 56, 1, 0x30 }, {1056, 800, 40, 128, 628, 600, 1, 4, VCLK40, /* 60Hz */ @@ -155,8 +155,7 @@ VBIOS_ENHTABLE_STRUCT Res800x600Table[] = { (SyncPP | Charx8Dot), 0xFF, 5, 0x30 }, }; - -VBIOS_ENHTABLE_STRUCT Res1024x768Table[] = { +static VBIOS_ENHTABLE_STRUCT Res1024x768Table[] = { {1344, 1024, 24, 136, 806, 768, 3, 6, VCLK65, /* 60Hz */ (SyncNN | Charx8Dot), 60, 1, 0x31 }, {1328, 1024, 24, 136, 806, 768, 3, 6, VCLK75, /* 70Hz */ @@ -169,7 +168,7 @@ VBIOS_ENHTABLE_STRUCT Res1024x768Table[] = { (SyncPP | Charx8Dot), 0xFF, 4, 0x31 }, }; -VBIOS_ENHTABLE_STRUCT Res1280x1024Table[] = { +static VBIOS_ENHTABLE_STRUCT Res1280x1024Table[] = { {1688, 1280, 48, 112, 1066, 1024, 1, 3, VCLK108, /* 60Hz */ (SyncPP | Charx8Dot), 60, 1, 0x32 }, {1688, 1280, 16, 144, 1066, 1024, 1, 3, VCLK135, /* 75Hz */ @@ -180,7 +179,7 @@ VBIOS_ENHTABLE_STRUCT Res1280x1024Table[] = { (SyncPP | Charx8Dot), 0xFF, 3, 0x32 }, }; -VBIOS_ENHTABLE_STRUCT Res1600x1200Table[] = { +static VBIOS_ENHTABLE_STRUCT Res1600x1200Table[] = { {2160, 1600, 64, 192, 1250, 1200, 1, 3, VCLK162, /* 60Hz */ (SyncPP | Charx8Dot), 60, 1, 0x33 }, {2160, 1600, 64, 192, 1250, 1200, 1, 3, VCLK162, /* end */ @@ -188,21 +187,21 @@ VBIOS_ENHTABLE_STRUCT Res1600x1200Table[] = { }; /* 16:9 */ -VBIOS_ENHTABLE_STRUCT Res1360x768Table[] = { +static VBIOS_ENHTABLE_STRUCT Res1360x768Table[] = { {1792, 1360, 64,112, 795, 768, 3, 6, VCLK85_5, /* 60Hz */ (SyncPP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x39 }, {1792, 1360, 64,112, 795, 768, 3, 6, VCLK85_5, /* end */ (SyncPP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 1, 0x39 }, }; -VBIOS_ENHTABLE_STRUCT Res1600x900Table[] = { +static VBIOS_ENHTABLE_STRUCT Res1600x900Table[] = { {1760, 1600, 48, 32, 926, 900, 3, 5, VCLK97_75, /* 60Hz CVT RB */ (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x3A }, {1760, 1600, 48, 32, 926, 900, 3, 5, VCLK97_75, /* end */ (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 1, 0x3A }, }; -VBIOS_ENHTABLE_STRUCT Res1920x1080Table[] = { +static VBIOS_ENHTABLE_STRUCT Res1920x1080Table[] = { {2200, 1920, 88, 44, 1125, 1080, 4, 5, VCLK148_5, /* HDTV 60Hz */ (SyncPP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x38 }, {2200, 1920, 88, 44, 1125, 1080, 4, 5, VCLK148_5, /* end */ @@ -210,7 +209,7 @@ VBIOS_ENHTABLE_STRUCT Res1920x1080Table[] = { }; /* 16:10 */ -VBIOS_ENHTABLE_STRUCT Res1280x800Table[] = { +static VBIOS_ENHTABLE_STRUCT Res1280x800Table[] = { {1440, 1280, 48, 32, 823, 800, 3, 6, VCLK71, /* 60Hz RB */ (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 35 }, {1680, 1280, 72,128, 831, 800, 3, 6, VCLK83_5, /* 60Hz */ @@ -220,7 +219,7 @@ VBIOS_ENHTABLE_STRUCT Res1280x800Table[] = { }; -VBIOS_ENHTABLE_STRUCT Res1440x900Table[] = { +static VBIOS_ENHTABLE_STRUCT Res1440x900Table[] = { {1600, 1440, 48, 32, 926, 900, 3, 6, VCLK88_75, /* 60Hz RB */ (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x36 }, {1904, 1440, 80,152, 934, 900, 3, 6, VCLK106_5, /* 60Hz */ @@ -229,7 +228,7 @@ VBIOS_ENHTABLE_STRUCT Res1440x900Table[] = { (SyncPN | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 1, 0x36 }, }; -VBIOS_ENHTABLE_STRUCT Res1680x1050Table[] = { +static VBIOS_ENHTABLE_STRUCT Res1680x1050Table[] = { {1840, 1680, 48, 32, 1080, 1050, 3, 6, VCLK119, /* 60Hz RB */ (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x37 }, {2240, 1680,104,176, 1089, 1050, 3, 6, VCLK146_25, /* 60Hz */ @@ -238,14 +237,14 @@ VBIOS_ENHTABLE_STRUCT Res1680x1050Table[] = { (SyncPN | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 1, 0x37 }, }; -VBIOS_ENHTABLE_STRUCT Res1920x1200Table[] = { +static VBIOS_ENHTABLE_STRUCT Res1920x1200Table[] = { {2080, 1920, 48, 32, 1235, 1200, 3, 6, VCLK154, /* 60Hz */ (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 60, 1, 0x34 }, {2080, 1920, 48, 32, 1235, 1200, 3, 6, VCLK154, /* 60Hz */ (SyncNP | Charx8Dot | LineCompareOff | WideScreenMode | NewModeInfo), 0xFF, 1, 0x34 }, }; -VBIOS_DCLK_INFO DCLKTable [] = { +static VBIOS_DCLK_INFO DCLKTable [] = { {0x2C, 0xE7, 0x03}, /* 00: VCLK25_175 */ {0x95, 0x62, 0x03}, /* 01: VCLK28_322 */ {0x67, 0x63, 0x01}, /* 02: VCLK31_5 */ @@ -273,7 +272,7 @@ VBIOS_DCLK_INFO DCLKTable [] = { {0x32, 0x67, 0x80}, /* 18: VCLK85_5 */ }; -VBIOS_DCLK_INFO DCLKTable_AST2100 [] = { +static VBIOS_DCLK_INFO DCLKTable_AST2100 [] = { {0x2C, 0xE7, 0x03}, /* 00: VCLK25_175 */ {0x95, 0x62, 0x03}, /* 01: VCLK28_322 */ {0x67, 0x63, 0x01}, /* 02: VCLK31_5 */ @@ -301,7 +300,7 @@ VBIOS_DCLK_INFO DCLKTable_AST2100 [] = { {0x32, 0x67, 0x80}, /* 18: VCLK85_5 */ }; -VBIOS_DAC_INFO DAC_TEXT[] = { +static VBIOS_DAC_INFO DAC_TEXT[] = { { 0x00, 0x00, 0x00 }, { 0x00, 0x00, 0x2a }, { 0x00, 0x2a, 0x00 }, { 0x00, 0x2a, 0x2a }, { 0x2a, 0x00, 0x00 }, { 0x2a, 0x00, 0x2a }, { 0x2a, 0x2a, 0x00 }, { 0x2a, 0x2a, 0x2a }, { 0x00, 0x00, 0x15 }, { 0x00, 0x00, 0x3f }, { 0x00, 0x2a, 0x15 }, { 0x00, 0x2a, 0x3f }, @@ -320,7 +319,7 @@ VBIOS_DAC_INFO DAC_TEXT[] = { { 0x3f, 0x15, 0x15 }, { 0x3f, 0x15, 0x3f }, { 0x3f, 0x3f, 0x15 }, { 0x3f, 0x3f, 0x3f }, }; -VBIOS_DAC_INFO DAC_EGA[] = { +static VBIOS_DAC_INFO DAC_EGA[] = { { 0x00, 0x00, 0x00 }, { 0x00, 0x00, 0x2a }, { 0x00, 0x2a, 0x00 }, { 0x00, 0x2a, 0x2a }, { 0x2a, 0x00, 0x00 }, { 0x2a, 0x00, 0x2a }, { 0x2a, 0x2a, 0x00 }, { 0x2a, 0x2a, 0x2a }, { 0x00, 0x00, 0x15 }, { 0x00, 0x00, 0x3f }, { 0x00, 0x2a, 0x15 }, { 0x00, 0x2a, 0x3f }, @@ -339,7 +338,7 @@ VBIOS_DAC_INFO DAC_EGA[] = { { 0x3f, 0x15, 0x15 }, { 0x3f, 0x15, 0x3f }, { 0x3f, 0x3f, 0x15 }, { 0x3f, 0x3f, 0x3f }, }; -VBIOS_DAC_INFO DAC_VGA[] = { +static VBIOS_DAC_INFO DAC_VGA[] = { { 0x00, 0x00, 0x00 }, { 0x00, 0x00, 0x2a }, { 0x00, 0x2a, 0x00 }, { 0x00, 0x2a, 0x2a }, { 0x2a, 0x00, 0x00 }, { 0x2a, 0x00, 0x2a }, { 0x2a, 0x15, 0x00 }, { 0x2a, 0x2a, 0x2a }, { 0x15, 0x15, 0x15 }, { 0x15, 0x15, 0x3f }, { 0x15, 0x3f, 0x15 }, { 0x15, 0x3f, 0x3f }, @@ -407,20 +406,19 @@ VBIOS_DAC_INFO DAC_VGA[] = { }; /* Prototype type declaration*/ -Bool ASTSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode); -Bool bGetAST1000VGAModeInfo(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); -void vSetStdReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); -void vSetCRTCReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); -void vSetOffsetReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); -void vSetDCLKReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); -void vSetExtReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); -void vSetSyncReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); -Bool bSetDACReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); -BOOL bSetAST1180CRTCReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); -BOOL bSetAST1180OffsetReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); -BOOL bSetAST1180DCLKReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); -BOOL bSetAST1180ExtReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); -void vInitChontelReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); +static Bool bGetAST1000VGAModeInfo(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); +static void vSetStdReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); +static void vSetCRTCReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); +static void vSetOffsetReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); +static void vSetDCLKReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); +static void vSetExtReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); +static void vSetSyncReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); +static Bool bSetDACReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); +static BOOL bSetAST1180CRTCReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); +static BOOL bSetAST1180OffsetReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); +static BOOL bSetAST1180DCLKReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); +static BOOL bSetAST1180ExtReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); +static void vInitChontelReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); Bool ASTSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode) @@ -485,7 +483,7 @@ ASTSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode) } -Bool bGetAST1000VGAModeInfo(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) +static Bool bGetAST1000VGAModeInfo(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) { ASTRecPtr pAST; ULONG ulModeID, ulColorIndex, ulRefreshRate, ulRefreshRateIndex = 0; @@ -628,7 +626,7 @@ Bool bGetAST1000VGAModeInfo(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_ return (TRUE); } -void vSetStdReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) +static void vSetStdReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) { PVBIOS_STDTABLE_STRUCT pStdModePtr; @@ -685,7 +683,7 @@ void vSetStdReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAMod } -void +static void vSetCRTCReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) { ASTRecPtr pAST; @@ -760,7 +758,7 @@ vSetCRTCReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInf } -void vSetOffsetReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) +static void vSetOffsetReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) { ASTRecPtr pAST; USHORT usOffset; @@ -774,7 +772,7 @@ void vSetOffsetReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGA } -void vSetDCLKReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) +static void vSetDCLKReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) { PVBIOS_ENHTABLE_STRUCT pEnhModePtr; PVBIOS_DCLK_INFO pDCLKPtr; @@ -795,7 +793,7 @@ void vSetDCLKReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAMo } -void vSetExtReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) +static void vSetExtReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) { ASTRecPtr pAST; @@ -853,7 +851,7 @@ void vSetExtReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAMod } -void vSetSyncReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) +static void vSetSyncReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) { PVBIOS_ENHTABLE_STRUCT pEnhModePtr; ASTRecPtr pAST; @@ -868,7 +866,7 @@ void vSetSyncReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAMo } -Bool bSetDACReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) +static Bool bSetDACReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) { PVBIOS_DAC_INFO pDACPtr; ASTRecPtr pAST; @@ -902,7 +900,7 @@ Bool bSetDACReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAMod } -ULONG AST1180DCLKTable [] = { +static ULONG AST1180DCLKTable [] = { 0x0008676b, /* 00: VCLK25_175 */ 0x00086342, /* 01: VCLK28_322 */ 0x00086568, /* 02: VCLK31_5 */ @@ -926,7 +924,7 @@ ULONG AST1180DCLKTable [] = { 0x00040769, /* 14: VCLK148_5 */ }; -BOOL bSetAST1180CRTCReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) +static BOOL bSetAST1180CRTCReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) { ASTRecPtr pAST = ASTPTR(pScrn); @@ -978,7 +976,7 @@ BOOL bSetAST1180CRTCReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INF } /* bSetAST1180CRTCReg */ -BOOL bSetAST1180OffsetReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) +static BOOL bSetAST1180OffsetReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) { ASTRecPtr pAST = ASTPTR(pScrn); ULONG ulOffset, ulTermalCount; @@ -993,7 +991,7 @@ BOOL bSetAST1180OffsetReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_I } /* bSetAST1180OffsetReg */ -BOOL bSetAST1180DCLKReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) +static BOOL bSetAST1180DCLKReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) { PVBIOS_ENHTABLE_STRUCT pEnhModePtr; ASTRecPtr pAST = ASTPTR(pScrn); @@ -1008,7 +1006,7 @@ BOOL bSetAST1180DCLKReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INF return (TRUE); } -BOOL bSetAST1180ExtReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) +static BOOL bSetAST1180ExtReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) { PVBIOS_ENHTABLE_STRUCT pEnhModePtr; ASTRecPtr pAST = ASTPTR(pScrn); @@ -1061,7 +1059,7 @@ BOOL bSetAST1180ExtReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO #define I2C_BASE_AST1180 0x80fcb000 #define I2C_DEVICEADDR_AST1180 0x0EC /* slave addr */ -void SetChrontelReg(ASTRecPtr pAST, UCHAR jChannel, UCHAR jIndex, UCHAR jData ) +static void SetChrontelReg(ASTRecPtr pAST, UCHAR jChannel, UCHAR jIndex, UCHAR jData ) { ULONG ulData, ulI2CAddr, ulI2CPortBase; ULONG retry; @@ -1117,7 +1115,7 @@ Exit_SetChrontelReg: ; } -UCHAR GetChrontelReg(ASTRecPtr pAST, UCHAR jChannel, UCHAR jIndex) +static UCHAR GetChrontelReg(ASTRecPtr pAST, UCHAR jChannel, UCHAR jIndex) { ULONG ulData, ulI2CAddr, ulI2CPortBase; UCHAR jData; @@ -1176,7 +1174,7 @@ UCHAR GetChrontelReg(ASTRecPtr pAST, UCHAR jChannel, UCHAR jIndex) return (jData); } -void vInitChontelReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) +static void vInitChontelReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) { PVBIOS_ENHTABLE_STRUCT pEnhModePtr = pVGAModeInfo->pEnhTableEntry; ++++++ u_08-Clean-up-namespace-in-ast_accel.c.patch ++++++ From: Egbert Eich <[email protected]> Date: Tue Apr 22 14:05:17 2014 +0200 Subject: [PATCH 8/14]Clean up namespace in ast_accel.c Patch-Mainline: to be upstreamed Git-commit: 692756dca1427078e1f1b9f8b094aebb11ee11da Git-repo: git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ast References: Signed-off-by: Egbert Eich <[email protected]> - Made sure exported functions have 'AST' in their name. This avoids name space conflicts with the server or other drivers. - Placed declaration of exported functions in a header file. This ensures that changes to the function type or arguments are followed thru everywhere. Signed-off-by: Egbert Eich <[email protected]> --- src/ast.h | 7 +++++++ src/ast_accel.c | 1 - src/ast_driver.c | 6 ------ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ast.h b/src/ast.h index 89971d3..a50f182 100644 --- a/src/ast.h +++ b/src/ast.h @@ -345,6 +345,13 @@ void ASTDisableHWC(ScrnInfoPtr pScrn); /* ast_mode.c */ Bool ASTSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode); +/* ast_accel.c */ +#ifdef HAVE_XAA_H +Bool ASTAccelInit(ScreenPtr pScreen); +#endif +void ASTDisplayVideo(ScrnInfoPtr pScrn, ASTPortPrivPtr pPriv, RegionPtr clipBoxes, int id); + + /* Include Files */ #include "ast_mode.h" #include "ast_vgatool.h" diff --git a/src/ast_accel.c b/src/ast_accel.c index 6fd0ca9..1217b01 100644 --- a/src/ast_accel.c +++ b/src/ast_accel.c @@ -98,7 +98,6 @@ int ASTXAAPatternROP[16]= }; /* Prototype type declaration */ -Bool ASTAccelInit(ScreenPtr pScreen); static void ASTSync(ScrnInfoPtr pScrn); static void ASTSetupForScreenToScreenCopy(ScrnInfoPtr pScrn, int xdir, int ydir, int rop, diff --git a/src/ast_driver.c b/src/ast_driver.c index 8e3a814..3d3f01a 100644 --- a/src/ast_driver.c +++ b/src/ast_driver.c @@ -63,10 +63,6 @@ extern Bool ASTUnmapMem(ScrnInfoPtr pScrn); extern Bool ASTMapMMIO(ScrnInfoPtr pScrn); extern void ASTUnmapMMIO(ScrnInfoPtr pScrn); -#ifdef HAVE_XAA_H -extern Bool ASTAccelInit(ScreenPtr pScreen); -#endif - /* Mandatory functions */ static void ASTIdentify(int flags); const OptionInfoRec *ASTAvailableOptions(int chipid, int busid); @@ -2096,8 +2092,6 @@ static int ASTQueryImageAttributes(ScrnInfoPtr pScrn, int id, return size; } -extern void ASTDisplayVideo(ScrnInfoPtr pScrn, ASTPortPrivPtr pPriv, RegionPtr clipBoxes, int id); - static int ASTPutImage(ScrnInfoPtr pScrn, short src_x, short src_y, short drw_x, short drw_y, ++++++ u_09-Clean-up-namespace-in-ast_tool.c.patch ++++++ From: Egbert Eich <[email protected]> Date: Tue Apr 22 14:09:10 2014 +0200 Subject: [PATCH 9/14]Clean up namespace in ast_tool.c Patch-Mainline: to be upstreamed Git-commit: 2532c8c4db1033ae9e15c760d21b963cdb5223e6 Git-repo: git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ast References: Signed-off-by: Egbert Eich <[email protected]> - Made sure exported functions have 'AST' in their name. This avoids name space conflicts with the server or other drivers. - Placed declaration of exported functions in a header file. This ensures that changes to the function type or arguments are followed thru everywhere. Signed-off-by: Egbert Eich <[email protected]> --- src/ast.h | 5 +++++ src/ast_driver.c | 6 ------ src/ast_tool.c | 6 ------ 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/ast.h b/src/ast.h index a50f182..953f257 100644 --- a/src/ast.h +++ b/src/ast.h @@ -351,6 +351,11 @@ Bool ASTAccelInit(ScreenPtr pScreen); #endif void ASTDisplayVideo(ScrnInfoPtr pScrn, ASTPortPrivPtr pPriv, RegionPtr clipBoxes, int id); +/* ast_tool.c */ +Bool ASTMapMem(ScrnInfoPtr pScrn); +Bool ASTUnmapMem(ScrnInfoPtr pScrn); +Bool ASTMapMMIO(ScrnInfoPtr pScrn); +void ASTUnmapMMIO(ScrnInfoPtr pScrn); /* Include Files */ #include "ast_mode.h" diff --git a/src/ast_driver.c b/src/ast_driver.c index 3d3f01a..863e590 100644 --- a/src/ast_driver.c +++ b/src/ast_driver.c @@ -57,12 +57,6 @@ /* Driver specific headers */ #include "ast.h" -/* external reference fucntion */ -extern Bool ASTMapMem(ScrnInfoPtr pScrn); -extern Bool ASTUnmapMem(ScrnInfoPtr pScrn); -extern Bool ASTMapMMIO(ScrnInfoPtr pScrn); -extern void ASTUnmapMMIO(ScrnInfoPtr pScrn); - /* Mandatory functions */ static void ASTIdentify(int flags); const OptionInfoRec *ASTAvailableOptions(int chipid, int busid); diff --git a/src/ast_tool.c b/src/ast_tool.c index 1e1cb6b..9ab28cb 100644 --- a/src/ast_tool.c +++ b/src/ast_tool.c @@ -50,12 +50,6 @@ /* Driver specific headers */ #include "ast.h" -/* Prototype type declaration*/ -Bool ASTMapMem(ScrnInfoPtr pScrn); -Bool ASTUnmapMem(ScrnInfoPtr pScrn); -Bool ASTMapMMIO(ScrnInfoPtr pScrn); -void ASTUnmapMMIO(ScrnInfoPtr pScrn); - Bool ASTMapMem(ScrnInfoPtr pScrn) { ++++++ u_10-Include-local-headers-only-when-needed.patch ++++++ From: Egbert Eich <[email protected]> Date: Tue Apr 22 14:31:39 2014 +0200 Subject: [PATCH 10/14]Include local headers only when needed Patch-Mainline: to be upstreamed Git-commit: b56e27e8a6df32dfa42a5f5f2f8aafae3020441f Git-repo: git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ast References: Signed-off-by: Egbert Eich <[email protected]> Move inclusion of local headers from ast.h to the individual files. Include only those headers which are needed. Signed-off-by: Egbert Eich <[email protected]> --- src/ast.h | 5 ----- src/ast_2dtool.c | 2 ++ src/ast_accel.c | 1 + src/ast_cursor.c | 2 ++ src/ast_driver.c | 3 +++ src/ast_mode.c | 2 ++ src/ast_vgatool.c | 1 + 7 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/ast.h b/src/ast.h index 953f257..6001b63 100644 --- a/src/ast.h +++ b/src/ast.h @@ -357,8 +357,3 @@ Bool ASTUnmapMem(ScrnInfoPtr pScrn); Bool ASTMapMMIO(ScrnInfoPtr pScrn); void ASTUnmapMMIO(ScrnInfoPtr pScrn); -/* Include Files */ -#include "ast_mode.h" -#include "ast_vgatool.h" -#include "ast_2dtool.h" -#include "ast_cursor.h" diff --git a/src/ast_2dtool.c b/src/ast_2dtool.c index 3cf83fe..b4f0a4a 100644 --- a/src/ast_2dtool.c +++ b/src/ast_2dtool.c @@ -48,6 +48,8 @@ /* Driver specific headers */ #include "ast.h" +#include "ast_vgatool.h" +#include "ast_2dtool.h" #ifdef Accel_2D typedef Bool (*PFN_bENABLE_CMDQ)(ScrnInfoPtr , ASTRecPtr); diff --git a/src/ast_accel.c b/src/ast_accel.c index 1217b01..fd91688 100644 --- a/src/ast_accel.c +++ b/src/ast_accel.c @@ -52,6 +52,7 @@ /* Driver specific headers */ #include "ast.h" +#include "ast_2dtool.h" #ifdef Accel_2D diff --git a/src/ast_cursor.c b/src/ast_cursor.c index 4598daa..5031aac 100644 --- a/src/ast_cursor.c +++ b/src/ast_cursor.c @@ -50,6 +50,8 @@ /* Driver specific headers */ #include "ast.h" +#include "ast_vgatool.h" +#include "ast_cursor.h" #ifdef HWC /* Prototype type declaration */ diff --git a/src/ast_driver.c b/src/ast_driver.c index 863e590..b6accbf 100644 --- a/src/ast_driver.c +++ b/src/ast_driver.c @@ -56,6 +56,9 @@ /* Driver specific headers */ #include "ast.h" +#include "ast_mode.h" +#include "ast_vgatool.h" +#include "ast_2dtool.h" /* Mandatory functions */ static void ASTIdentify(int flags); diff --git a/src/ast_mode.c b/src/ast_mode.c index ceb2ddb..59488c4 100644 --- a/src/ast_mode.c +++ b/src/ast_mode.c @@ -52,6 +52,8 @@ /* Driver specific headers */ #include "ast.h" +#include "ast_mode.h" +#include "ast_vgatool.h" static VBIOS_STDTABLE_STRUCT StdTable[] = { /* MD_2_3_400 */ diff --git a/src/ast_vgatool.c b/src/ast_vgatool.c index b42ac7a..9a96ac5 100644 --- a/src/ast_vgatool.c +++ b/src/ast_vgatool.c @@ -52,6 +52,7 @@ /* Driver specific headers */ #include "ast.h" +#include "ast_vgatool.h" __inline ULONG MIndwm(UCHAR *mmiobase, ULONG r) ++++++ u_11-Fix-typo.patch ++++++ From: Egbert Eich <[email protected]> Date: Tue Apr 22 15:10:20 2014 +0200 Subject: [PATCH 11/14]Fix typo Patch-Mainline: to be upstreamed Git-commit: 53bc8e5819d946412059f1e22c50086b312e45d9 Git-repo: git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ast References: Signed-off-by: Egbert Eich <[email protected]> Chontel -> Chrontel Signed-off-by: Egbert Eich <[email protected]> --- src/ast_mode.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ast_mode.c b/src/ast_mode.c index 59488c4..a52ee71 100644 --- a/src/ast_mode.c +++ b/src/ast_mode.c @@ -420,7 +420,7 @@ static BOOL bSetAST1180CRTCReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_M static BOOL bSetAST1180OffsetReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); static BOOL bSetAST1180DCLKReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); static BOOL bSetAST1180ExtReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); -static void vInitChontelReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); +static void vInitChrontelReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo); Bool ASTSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode) @@ -443,7 +443,7 @@ ASTSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode) bSetAST1180DCLKReg(pScrn, mode, &vgamodeinfo); bSetAST1180ExtReg(pScrn, mode, &vgamodeinfo); - vInitChontelReg(pScrn, mode, &vgamodeinfo); + vInitChrontelReg(pScrn, mode, &vgamodeinfo); } else { @@ -1176,7 +1176,7 @@ static UCHAR GetChrontelReg(ASTRecPtr pAST, UCHAR jChannel, UCHAR jIndex) return (jData); } -static void vInitChontelReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) +static void vInitChrontelReg(ScrnInfoPtr pScrn, DisplayModePtr mode, PVBIOS_MODE_INFO pVGAModeInfo) { PVBIOS_ENHTABLE_STRUCT pEnhModePtr = pVGAModeInfo->pEnhTableEntry; ++++++ u_12-Fix-ABI-version-conflict-in-xf86UnclaimPciSlot.patch ++++++ From: Egbert Eich <[email protected]> Date: Tue Apr 22 15:35:43 2014 +0200 Subject: [PATCH 12/14]Fix ABI version conflict in xf86UnclaimPciSlot() Patch-Mainline: to be upstreamed Git-commit: 553509b5ef5794d62a2b4d36c92794b17d8b01c6 Git-repo: git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ast References: Signed-off-by: Egbert Eich <[email protected]> xf86UnclaimPciSlot() received a GDevPtr as 2nd argument with ABI_VIDEODRV_VERSION 13. Signed-off-by: Egbert Eich <[email protected]> --- src/ast_driver.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ast_driver.c b/src/ast_driver.c index b6accbf..be1ac0f 100644 --- a/src/ast_driver.c +++ b/src/ast_driver.c @@ -281,7 +281,11 @@ ASTProbe(DriverPtr drv, int flags) pPci->device_id, pPci->bus, pPci->domain, pPci->dev, pPci->func); xf86DrvMsg(0, X_ERROR, "ast: This driver cannot operate until it has been unloaded.\n"); - xf86UnclaimPciSlot(pPci, devSections[0]); + xf86UnclaimPciSlot(pPci +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 13 + , devSections[0] +#endif + ); free(devSections); return FALSE; } ++++++ u_13-Move-firmware-for-DP501-to-a-separate-file.patch ++++++ ++++ 6700 lines (skipped) ++++++ u_14-Add-_AST_H_-define-to-ast.h.patch ++++++ From: Egbert Eich <[email protected]> Date: Tue Apr 22 17:09:42 2014 +0200 Subject: [PATCH 14/14]Add _AST_H_ define to ast.h Patch-Mainline: to be upstreamed Git-commit: b6bab2cb3330236efd835e14fee47156afcc063b Git-repo: git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ast References: Signed-off-by: Egbert Eich <[email protected]> --- src/ast.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/ast.h b/src/ast.h index 1bcb949..44239be 100644 --- a/src/ast.h +++ b/src/ast.h @@ -19,6 +19,10 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ + +#ifndef _AST_H_ +# define _AST_H_ + /* Compiler Options */ #define Accel_2D /* #define MMIO_2D */ @@ -356,3 +360,5 @@ Bool ASTMapMem(ScrnInfoPtr pScrn); Bool ASTUnmapMem(ScrnInfoPtr pScrn); Bool ASTMapMMIO(ScrnInfoPtr pScrn); void ASTUnmapMMIO(ScrnInfoPtr pScrn); + +#endif /* _AST_H_ */ ++++++ xf86-video-ast-0.98.0.tar.bz2 -> xf86-video-ast-0.99.9.tar.bz2 ++++++ ++++ 5785 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
