Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Evergreen:11.2
xorg-x11-driver-video
xf86-video-xgi.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File xf86-video-xgi.diff of Package xorg-x11-driver-video
Index: src/xgi_accel.c =================================================================== --- src/xgi_accel.c.orig +++ src/xgi_accel.c @@ -82,26 +82,10 @@ static void Volari_DisableCmdQueue(ScrnI extern int FbDevExist; -#if X_BYTE_ORDER == X_BIG_ENDIAN -static CARD32 BE_SWAP32 (CARD32 val) -{ - if (CurrentColorDepth == 8) - return ((((val) & 0x000000ff) << 24) | \ - (((val) & 0x0000ff00) << 8) | \ - (((val) & 0x00ff0000) >> 8) | \ - (((val) & 0xff000000) >> 24)); - if (CurrentColorDepth == 24) - return val; - if (CurrentColorDepth == 16) - return ((((val) & 0x0000ffff) << 16) | \ - (((val) & 0xffff0000) >> 16)); -} -#else static CARD32 BE_SWAP32 (CARD32 val) { return val; } -#endif #ifdef DEBUG Index: src/xgi_dri.c =================================================================== --- src/xgi_dri.c.orig +++ src/xgi_dri.c @@ -280,7 +280,7 @@ Bool XGIDRIScreenInit(ScreenPtr pScreen) pDRIInfo->ddxDriverMajorVersion = PACKAGE_VERSION_MAJOR; pDRIInfo->ddxDriverMinorVersion = PACKAGE_VERSION_MINOR; pDRIInfo->ddxDriverPatchVersion = PACKAGE_VERSION_PATCHLEVEL; - pDRIInfo->frameBufferPhysicalAddress = pXGI->FbAddress; + pDRIInfo->frameBufferPhysicalAddress = (pointer) pXGI->FbAddress; pDRIInfo->frameBufferSize = pXGI->FbMapSize; /* ?? */ Index: src/xgi_driver.c =================================================================== --- src/xgi_driver.c.orig +++ src/xgi_driver.c @@ -2504,7 +2504,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags) FbDevExist = FALSE; if (pXGI->Chipset != PCI_CHIP_XGIXG20) { - if ((fd = open("/dev/fb", 'r')) != -1) { + if ((fd = open("/dev/fb", O_RDONLY)) != -1) { PDEBUG(ErrorF("--- open /dev/fb.... \n")); ioctl(fd, FBIOGET_FSCREENINFO, &fix); if (fix.accel == FB_ACCEL_XGI_GLAMOUR) { @@ -2601,7 +2601,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags) (pXGI->PciInfo->ioBase[2] & 0xFFFC) #endif ); - pXGI->xgi_HwDevExt.pjIOAddress = (XGIIOADDRESS) (pXGI->RelIO + 0x30); + pXGI->xgi_HwDevExt.pjIOAddress = (PUCHAR) (pXGI->RelIO + 0x30); xf86DrvMsg(pScrn->scrnIndex, from, "Relocated IO registers at 0x%lX\n", (unsigned long) pXGI->RelIO); Index: src/xgi_setup.c =================================================================== --- src/xgi_setup.c.orig +++ src/xgi_setup.c @@ -317,7 +317,7 @@ XGI_InitHwDevInfo(ScrnInfoPtr pScrn) PDEBUG(ErrorF("pXGI->FbBase = 0x%08lx\n",(ULONG)(pXGI->FbBase))) ; PDEBUG(ErrorF("pHwDevInfo->pjVideoMemoryAddress = 0x%08lx\n",(ULONG)(pHwDevInfo->pjVideoMemoryAddress))) ; pHwDevInfo->ulVideoMemorySize = pXGI->FbMapSize ; - pHwDevInfo->pjIOAddress = pXGI->RelIO + 0x30 ; + pHwDevInfo->pjIOAddress = (PUCHAR) (pXGI->RelIO + 0x30) ; switch (pXGI->Chipset) { case PCI_CHIP_XGIXG40:
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor