xf86-video-ati: Branch 'master' - 8 commits
Michel Daenzer
daenzer at kemper.freedesktop.org
Thu Jun 15 17:12:19 EEST 2006
.gitignore | 16 ++++++++++++++--
man/.gitignore | 8 --------
src/.gitignore | 6 ------
src/radeon.h | 8 ++++----
src/radeon_accel.c | 4 ++--
src/radeon_commonfuncs.c | 2 +-
src/radeon_dri.c | 16 ++++++++--------
src/radeon_driver.c | 15 ++++++++-------
src/radeon_exa.c | 2 +-
src/radeon_video.c | 8 ++------
10 files changed, 40 insertions(+), 45 deletions(-)
New commits:
diff-tree 9c534b5330534fc6cf392936a9b200a5128c787c (from 3d68698647fb17a6f5ae9a225f552cb0130fa946)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date: Thu Jun 15 16:09:55 2006 +0200
Some more ignores.
diff --git a/.gitignore b/.gitignore
index 29faf62..42ddc0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
+*~
*.la
*.lo
+.#*
.deps
.libs
Makefile
@@ -17,6 +19,8 @@ config.status
config.sub
configure
configure.lineno
+cscope.files
+cscope.out
depcomp
install-sh
libtool
diff-tree 3d68698647fb17a6f5ae9a225f552cb0130fa946 (from ab2b48e0df328fd08a2412911126b3184a601aea)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date: Thu Jun 15 16:07:15 2006 +0200
Fix semantic glitches pointed out by gcc -Wall.
The radeon driver builds warning-free with gcc -Wall here now.
diff --git a/src/radeon.h b/src/radeon.h
index e45ade1..7f1e0ad 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -541,20 +541,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 GART space */
drm_handle_t ringReadPtrHandle; /* Handle from drmAddMap */
drmSize ringReadMapSize; /* Size of map */
- unsigned char *ringReadPtr; /* Map */
+ drmAddress ringReadPtr; /* Map */
/* CP vertex/indirect buffer data */
unsigned long bufStart; /* Offset into GART 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 */
@@ -563,7 +563,7 @@ typedef struct {
drm_handle_t gartTexHandle; /* Handle from drmAddMap */
drmSize gartTexMapSize; /* Size of map */
int gartTexSize; /* Size of GART tex space (in MB) */
- unsigned char *gartTex; /* Map */
+ drmAddress gartTex; /* Map */
int log2GARTTexGran;
/* CP accleration */
diff --git a/src/radeon_dri.c b/src/radeon_dri.c
index 3e789f9..bbc858a 100644
--- a/src/radeon_dri.c
+++ b/src/radeon_dri.c
@@ -837,7 +837,7 @@ static Bool RADEONDRIAgpInit(RADEONInfoP
"[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;
}
@@ -856,7 +856,7 @@ static Bool RADEONDRIAgpInit(RADEONInfoP
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;
@@ -876,7 +876,7 @@ static Bool RADEONDRIAgpInit(RADEONInfoP
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;
@@ -896,7 +896,7 @@ static Bool RADEONDRIAgpInit(RADEONInfoP
info->gartTexHandle);
if (drmMap(info->drmFD, info->gartTexHandle, info->gartTexMapSize,
- (drmAddressPtr)&info->gartTex) < 0) {
+ &info->gartTex) < 0) {
xf86DrvMsg(pScreen->myNum, X_ERROR,
"[agp] Could not map GART texture map\n");
return FALSE;
@@ -940,7 +940,7 @@ static Bool RADEONDRIPciInit(RADEONInfoP
"[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;
}
@@ -962,7 +962,7 @@ static Bool RADEONDRIPciInit(RADEONInfoP
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;
@@ -985,7 +985,7 @@ static Bool RADEONDRIPciInit(RADEONInfoP
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;
@@ -1008,7 +1008,7 @@ static Bool RADEONDRIPciInit(RADEONInfoP
info->gartTexHandle);
if (drmMap(info->drmFD, info->gartTexHandle, info->gartTexMapSize,
- (drmAddressPtr)&info->gartTex) < 0) {
+ &info->gartTex) < 0) {
xf86DrvMsg(pScreen->myNum, X_ERROR,
"[pci] Could not map GART texture map\n");
return FALSE;
diff --git a/src/radeon_video.c b/src/radeon_video.c
index 30f3bef..e9e503f 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -2159,10 +2159,9 @@ RADEONCopyRGB24Data(
{
sptr = src;
- for ( i = 0 ; i < w; i++ )
+ for ( i = 0 ; i < w; i++, sptr += 3 )
{
- *dptr++ = ( ( *sptr++ ) << 24 ) | ( ( *sptr++ ) << 16 ) |
- ( *sptr++ );
+ *dptr++ = (sptr[0] << 24) | (sptr[1] << 16) | sptr[2];
}
src += hpass * srcPitch;
diff-tree ab2b48e0df328fd08a2412911126b3184a601aea (from 56bd5a370472663af5607cd327f757367b238db0)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date: Thu Jun 15 16:06:13 2006 +0200
Remove another unused variable.
diff --git a/src/radeon_exa.c b/src/radeon_exa.c
index ab6810e..8070da1 100644
--- a/src/radeon_exa.c
+++ b/src/radeon_exa.c
@@ -262,7 +262,7 @@ static void RADEONFinishAccess(PixmapPtr
RINFO_FROM_SCREEN(pPix->drawable.pScreen);
unsigned char *RADEONMMIO = info->MMIO;
CARD32 offset = exaGetPixmapOffset(pPix);
- int bpp, soff;
+ int soff;
/* Front buffer is always set with proper swappers */
if (offset == 0)
diff-tree 56bd5a370472663af5607cd327f757367b238db0 (from ec93e08b24f7c0e583970d08bfe18ad142e6b047)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date: Thu Jun 15 15:35:05 2006 +0200
Fix some more cosmetic warnings.
diff --git a/src/radeon_accel.c b/src/radeon_accel.c
index 4c4a0f6..b18b6d4 100644
--- a/src/radeon_accel.c
+++ b/src/radeon_accel.c
@@ -133,7 +133,7 @@ void RADEONWaitForFifoFunction(ScrnInfoP
INREG(RADEON_RBBM_STATUS) & RADEON_RBBM_FIFOCNT_MASK;
if (info->fifo_slots >= entries) return;
}
- RADEONTRACE(("FIFO timed out: %ld entries, stat=0x%08lx\n",
+ RADEONTRACE(("FIFO timed out: %u entries, stat=0x%08x\n",
INREG(RADEON_RBBM_STATUS) & RADEON_RBBM_FIFOCNT_MASK,
INREG(RADEON_RBBM_STATUS)));
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -164,7 +164,7 @@ void RADEONEngineFlush(ScrnInfoPtr pScrn
break;
}
if (i == RADEON_TIMEOUT) {
- RADEONTRACE(("DC flush timeout: %lx\n",
+ RADEONTRACE(("DC flush timeout: %x\n",
INREG(RADEON_RB3D_DSTCACHE_CTLSTAT)));
}
}
diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c
index bbf111e..14260c9 100644
--- a/src/radeon_commonfuncs.c
+++ b/src/radeon_commonfuncs.c
@@ -171,7 +171,7 @@ void FUNC_NAME(RADEONWaitForIdle)(ScrnIn
return;
}
}
- RADEONTRACE(("Idle timed out: %ld entries, stat=0x%08lx\n",
+ RADEONTRACE(("Idle timed out: %u entries, stat=0x%08x\n",
INREG(RADEON_RBBM_STATUS) & RADEON_RBBM_FIFOCNT_MASK,
INREG(RADEON_RBBM_STATUS)));
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index b6ce998..54a868a 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -93,6 +93,7 @@
/* X and server generic header files */
#include "xf86.h"
+#include "xf86_ansic.h" /* For xf86getsecs() */
#include "xf86_OSproc.h"
#include "xf86RAC.h"
#include "xf86Resources.h"
@@ -4466,9 +4467,9 @@ static Bool RADEONPreInitAccel(ScrnInfoP
static Bool RADEONPreInitInt10(ScrnInfoPtr pScrn, xf86Int10InfoPtr *ppInt10)
{
+#if !defined(__powerpc__)
RADEONInfoPtr info = RADEONPTR(pScrn);
-#if !defined(__powerpc__)
if (xf86LoadSubModule(pScrn, "int10")) {
xf86LoaderReqSymLists(int10Symbols, NULL);
xf86DrvMsg(pScrn->scrnIndex,X_INFO,"initializing int10\n");
@@ -6217,8 +6218,8 @@ static void RADEONRestoreMemMapRegisters
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Timeout trying to update memory controller settings !\n");
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "MC_STATUS = 0x%08lx (on entry = 0x%08lx)\n",
- INREG(RADEON_MC_STATUS), old_mc_status);
+ "MC_STATUS = 0x%08x (on entry = 0x%08x)\n",
+ INREG(RADEON_MC_STATUS), (unsigned int)old_mc_status);
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"You will probably crash now ... \n");
/* Nothing we can do except maybe try to kill the server,
@@ -7692,8 +7693,8 @@ static void RADEONInitDispBandwidth(Scrn
OUTREG(RADEON_GRPH_BUFFER_CNTL, ((temp & ~RADEON_GRPH_CRITICAL_POINT_MASK) |
(critical_point << RADEON_GRPH_CRITICAL_POINT_SHIFT)));
- RADEONTRACE(("GRPH_BUFFER_CNTL from %lx to %lx\n",
- info->SavedReg.grph_buffer_cntl, INREG(RADEON_GRPH_BUFFER_CNTL)));
+ RADEONTRACE(("GRPH_BUFFER_CNTL from %x to %x\n",
+ (unsigned int)info->SavedReg.grph_buffer_cntl, INREG(RADEON_GRPH_BUFFER_CNTL)));
if (mode2) {
stop_req = mode2->HDisplay * info2->CurrentLayout.pixel_bytes / 16;
@@ -7740,8 +7741,8 @@ static void RADEONInitDispBandwidth(Scrn
OUTREG(RADEON_GRPH2_BUFFER_CNTL, ((temp & ~RADEON_GRPH_CRITICAL_POINT_MASK) |
(critical_point2 << RADEON_GRPH_CRITICAL_POINT_SHIFT)));
- RADEONTRACE(("GRPH2_BUFFER_CNTL from %lx to %lx\n",
- info->SavedReg.grph2_buffer_cntl, INREG(RADEON_GRPH2_BUFFER_CNTL)));
+ RADEONTRACE(("GRPH2_BUFFER_CNTL from %x to %x\n",
+ (unsigned int)info->SavedReg.grph2_buffer_cntl, INREG(RADEON_GRPH2_BUFFER_CNTL)));
}
}
diff --git a/src/radeon_video.c b/src/radeon_video.c
index d567e19..30f3bef 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
@@ -2726,9 +2726,6 @@ RADEONPutImage(
int top, left, npixels, nlines, bpp;
BoxRec dstBox;
CARD32 tmp;
-#if X_BYTE_ORDER == X_BIG_ENDIAN
- unsigned char *RADEONMMIO = info->MMIO;
-#endif
/*
* s2offset, s3offset - byte offsets into U and V plane of the
diff-tree ec93e08b24f7c0e583970d08bfe18ad142e6b047 (from parents)
Merge: 051c49d0f002c72d1d8f15f6df264d8b093d4e95 6ca986242c80bcfe7ca2d435a772bbdf034892c4
Author: Michel Dänzer <michel at tungstengraphics.com>
Date: Thu Jun 15 15:03:27 2006 +0200
Merge branch 'master' of ssh+git://git.freedesktop.org/git/xorg/driver/xf86-video-ati
diff-tree 051c49d0f002c72d1d8f15f6df264d8b093d4e95 (from parents)
Merge: a840afc75a0453b4694e3f987ebdbddc6844a169 dfac8191dbda29ef7f6ce33d7356fee89c17d59b
Author: Michel Dänzer <michel at tungstengraphics.com>
Date: Thu Jun 15 13:10:44 2006 +0200
Merge branch 'master' of ssh+git://git.freedesktop.org/git/xorg/driver/xf86-video-ati
diff-tree a840afc75a0453b4694e3f987ebdbddc6844a169 (from parents)
Merge: c90c49da3844f93d2d29070b15bb7def72b98b0f d511ef486a15b582e5d1708a17a00701f5cf1ccd
Author: Michel Dänzer <michel at tungstengraphics.com>
Date: Thu Jun 15 12:46:58 2006 +0200
Merge branch 'master' of ssh+git://git.freedesktop.org/git/xorg/driver/xf86-video-ati
diff-tree c90c49da3844f93d2d29070b15bb7def72b98b0f (from b7a3e4c9b33f72ae447f99c0c765f24fce988142)
Author: Michel Dänzer <michel at tungstengraphics.com>
Date: Thu Jun 15 10:29:46 2006 +0200
Collapse .gitignore files into single toplevel file, sorted with LC_ALL=C.
Suggested by Keith Packard.
diff --git a/.gitignore b/.gitignore
index f0b36b2..29faf62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,12 @@
-Makefile
-Makefile.in
*.la
*.lo
+.deps
+.libs
+Makefile
+Makefile.in
aclocal.m4
+ati.4
+ati.4x
autom4te.cache
compile
config.guess
@@ -18,4 +22,8 @@ install-sh
libtool
ltmain.sh
missing
+r128.4
+r128.4x
+radeon.4
+radeon.4x
stamp-h1
diff --git a/man/.gitignore b/man/.gitignore
deleted file mode 100644
index 88a914c..0000000
--- a/man/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-Makefile
-Makefile.in
-ati.4
-ati.4x
-r128.4
-r128.4x
-radeon.4
-radeon.4x
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 9730646..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
More information about the xorg-commit
mailing list