xf86-video-ati: Branch 'master' - 4 commits
Michel Daenzer
daenzer at kemper.freedesktop.org
Fri Jun 30 11:18:08 EEST 2006
src/r128.h | 12 ++++++------
src/r128_dri.c | 14 +++++++-------
src/r128_driver.c | 2 ++
src/radeon_driver.c | 4 ++--
4 files changed, 17 insertions(+), 15 deletions(-)
New commits:
diff-tree 9c4a1e3300d30b23806988aa9328fc6ef92e2663 (from ee0544b670567491b7770f469a64a6cd85519ba1)
Author: Frank Gevaerts <frank at gevaerts.be>
Date: Thu Jun 29 18:21:22 2006 +0200
Fix build for !defined(USE_EXA).
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 1cd1695..149cb2e 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -6380,6 +6380,7 @@ static void RADEONAdjustMemMapRegisters(
RADEONRestoreMemMapRegisters(pScrn, save);
}
+#ifdef USE_EXA
if (info->accelDFS)
{
drmRadeonGetParam gp;
@@ -6399,6 +6400,7 @@ static void RADEONAdjustMemMapRegisters(
info->gartLocation = gart_base;
}
}
+#endif /* USE_EXA */
}
#endif
diff-tree ee0544b670567491b7770f469a64a6cd85519ba1 (from 15c556f5a8c9069d3dd00ce139d46c39b7298951)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date: Thu Jun 29 18:19:58 2006 +0200
Remove unused variables.
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 753b1ab..1cd1695 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -9758,8 +9758,6 @@ RADEONGetMergedFBOptions(ScrnInfoPtr pSc
static void RADEONForceSomeClocks(ScrnInfoPtr pScrn)
{
/* It appears from r300 and rv100 may need some clocks forced-on */
- RADEONInfoPtr info = RADEONPTR(pScrn);
- unsigned char *RADEONMMIO = info->MMIO;
CARD32 tmp;
tmp = INPLL(pScrn, RADEON_SCLK_CNTL);
diff-tree 15c556f5a8c9069d3dd00ce139d46c39b7298951 (from 055ac2836ec0afd51cf554d043a59068c36a07d3)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date: Thu Jun 29 18:18:21 2006 +0200
Don't declare unused variables on __powerpc__ and __alpha__.
diff --git a/src/r128_driver.c b/src/r128_driver.c
index 95a9912..49c0d86 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -1377,8 +1377,10 @@ static Bool R128PreInitConfig(ScrnInfoPt
static Bool R128PreInitDDC(ScrnInfoPtr pScrn, xf86Int10InfoPtr pInt10)
{
+#if !defined(__powerpc__) && !defined(__alpha__)
R128InfoPtr info = R128PTR(pScrn);
vbeInfoPtr pVbe;
+#endif
if (!xf86LoadSubModule(pScrn, "ddc")) return FALSE;
xf86LoaderReqSymLists(ddcSymbols, NULL);
diff-tree 055ac2836ec0afd51cf554d043a59068c36a07d3 (from 4b1904017caa976c138594a86e75feaf470e72b5)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date: Thu Jun 29 18:14:45 2006 +0200
Fix strict aliasing violation flagged by gcc -Wall.
diff --git a/src/r128.h b/src/r128.h
index b37b3ce..6398340 100644
--- a/src/r128.h
+++ b/src/r128.h
@@ -338,7 +338,7 @@ typedef struct {
Bool IsPCI; /* Current card is a PCI card */
drmSize pciSize;
drm_handle_t pciMemHandle;
- unsigned char *PCI; /* Map */
+ drmAddress PCI; /* Map */
Bool allowPageFlip; /* Enable 3d page flipping */
Bool have3DWindows; /* Are there any 3d clients? */
@@ -347,7 +347,7 @@ typedef struct {
drmSize agpSize;
drm_handle_t agpMemHandle; /* Handle from drmAgpAlloc */
unsigned long agpOffset;
- unsigned char *AGP; /* Map */
+ drmAddress AGP; /* Map */
int agpMode;
Bool CCEInUse; /* CCE is currently active */
@@ -361,20 +361,20 @@ typedef struct {
drm_handle_t ringHandle; /* Handle from drmAddMap */
drmSize ringMapSize; /* Size of map */
int ringSize; /* Size of ring (in MB) */
- unsigned char *ring; /* Map */
+ drmAddress ring; /* Map */
int ringSizeLog2QW;
unsigned long ringReadOffset; /* Offset into AGP space */
drm_handle_t ringReadPtrHandle; /* Handle from drmAddMap */
drmSize ringReadMapSize; /* Size of map */
- unsigned char *ringReadPtr; /* Map */
+ drmAddress ringReadPtr; /* Map */
/* CCE vertex/indirect buffer data */
unsigned long bufStart; /* Offset into AGP space */
drm_handle_t bufHandle; /* Handle from drmAddMap */
drmSize bufMapSize; /* Size of map */
int bufSize; /* Size of buffers (in MB) */
- unsigned char *buf; /* Map */
+ drmAddress buf; /* Map */
int bufNumBufs; /* Number of buffers */
drmBufMapPtr buffers; /* Buffer map */
@@ -383,7 +383,7 @@ typedef struct {
drm_handle_t agpTexHandle; /* Handle from drmAddMap */
drmSize agpTexMapSize; /* Size of map */
int agpTexSize; /* Size of AGP tex space (in MB) */
- unsigned char *agpTex; /* Map */
+ drmAddress agpTex; /* Map */
int log2AGPTexGran;
/* CCE 2D accleration */
diff --git a/src/r128_dri.c b/src/r128_dri.c
index 73c67e5..f3915f6 100644
--- a/src/r128_dri.c
+++ b/src/r128_dri.c
@@ -532,7 +532,7 @@ static Bool R128DRIAgpInit(R128InfoPtr i
"[agp] ring handle = 0x%08x\n", info->ringHandle);
if (drmMap(info->drmFD, info->ringHandle, info->ringMapSize,
- (drmAddressPtr)&info->ring) < 0) {
+ &info->ring) < 0) {
xf86DrvMsg(pScreen->myNum, X_ERROR, "[agp] Could not map ring\n");
return FALSE;
}
@@ -551,7 +551,7 @@ static Bool R128DRIAgpInit(R128InfoPtr i
info->ringReadPtrHandle);
if (drmMap(info->drmFD, info->ringReadPtrHandle, info->ringReadMapSize,
- (drmAddressPtr)&info->ringReadPtr) < 0) {
+ &info->ringReadPtr) < 0) {
xf86DrvMsg(pScreen->myNum, X_ERROR,
"[agp] Could not map ring read ptr\n");
return FALSE;
@@ -571,7 +571,7 @@ static Bool R128DRIAgpInit(R128InfoPtr i
info->bufHandle);
if (drmMap(info->drmFD, info->bufHandle, info->bufMapSize,
- (drmAddressPtr)&info->buf) < 0) {
+ &info->buf) < 0) {
xf86DrvMsg(pScreen->myNum, X_ERROR,
"[agp] Could not map vertex/indirect buffers\n");
return FALSE;
@@ -591,7 +591,7 @@ static Bool R128DRIAgpInit(R128InfoPtr i
info->agpTexHandle);
if (drmMap(info->drmFD, info->agpTexHandle, info->agpTexMapSize,
- (drmAddressPtr)&info->agpTex) < 0) {
+ &info->agpTex) < 0) {
xf86DrvMsg(pScreen->myNum, X_ERROR,
"[agp] Could not map AGP texture map\n");
return FALSE;
@@ -676,7 +676,7 @@ static Bool R128DRIPciInit(R128InfoPtr i
"[pci] ring handle = 0x%08x\n", info->ringHandle);
if (drmMap(info->drmFD, info->ringHandle, info->ringMapSize,
- (drmAddressPtr)&info->ring) < 0) {
+ &info->ring) < 0) {
xf86DrvMsg(pScreen->myNum, X_ERROR, "[pci] Could not map ring\n");
return FALSE;
}
@@ -698,7 +698,7 @@ static Bool R128DRIPciInit(R128InfoPtr i
info->ringReadPtrHandle);
if (drmMap(info->drmFD, info->ringReadPtrHandle, info->ringReadMapSize,
- (drmAddressPtr)&info->ringReadPtr) < 0) {
+ &info->ringReadPtr) < 0) {
xf86DrvMsg(pScreen->myNum, X_ERROR,
"[pci] Could not map ring read ptr\n");
return FALSE;
@@ -721,7 +721,7 @@ static Bool R128DRIPciInit(R128InfoPtr i
info->bufHandle);
if (drmMap(info->drmFD, info->bufHandle, info->bufMapSize,
- (drmAddressPtr)&info->buf) < 0) {
+ &info->buf) < 0) {
xf86DrvMsg(pScreen->myNum, X_ERROR,
"[pci] Could not map vertex/indirect buffers\n");
return FALSE;
More information about the xorg-commit
mailing list