From 1496194200adbcb044ec3977367a0908262e389c Mon Sep 17 00:00:00 2001 From: Arkadiusz Miskiewicz Date: Tue, 18 Dec 2007 15:29:53 -0500 Subject: RADEON: driver cleanups, warning fixes --- configure.ac | 2 +- src/radeon_accel.c | 6 +++--- src/radeon_commonfuncs.c | 4 ++-- src/radeon_display.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index b3d46a5..1570e54 100644 --- a/configure.ac +++ b/configure.ac @@ -58,7 +58,7 @@ AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri], AC_ARG_ENABLE(exa, AC_HELP_STRING([--disable-exa], - [Disable EXA support [[default enabled]]]), + [Disable EXA support [[default=enabled]]]), [EXA="$enableval"], [EXA=yes]) diff --git a/src/radeon_accel.c b/src/radeon_accel.c index 6028aff..ed7d1e9 100644 --- a/src/radeon_accel.c +++ b/src/radeon_accel.c @@ -136,8 +136,8 @@ void RADEONWaitForFifoFunction(ScrnInfoPtr pScrn, int entries) } xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, "FIFO timed out: %u entries, stat=0x%08x\n", - INREG(RADEON_RBBM_STATUS) & RADEON_RBBM_FIFOCNT_MASK, - INREG(RADEON_RBBM_STATUS)); + (unsigned int)INREG(RADEON_RBBM_STATUS) & RADEON_RBBM_FIFOCNT_MASK, + (unsigned int)INREG(RADEON_RBBM_STATUS)); xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "FIFO timed out, resetting engine...\n"); RADEONEngineReset(pScrn); @@ -168,7 +168,7 @@ void RADEONEngineFlush(ScrnInfoPtr pScrn) if (i == RADEON_TIMEOUT) { xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, "DC flush timeout: %x\n", - INREG(RADEON_RB3D_DSTCACHE_CTLSTAT)); + (unsigned int)INREG(RADEON_RB3D_DSTCACHE_CTLSTAT)); } } diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c index 6a999af..a1802f8 100644 --- a/src/radeon_commonfuncs.c +++ b/src/radeon_commonfuncs.c @@ -174,8 +174,8 @@ void FUNC_NAME(RADEONWaitForIdle)(ScrnInfoPtr pScrn) } xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, "Idle timed out: %u entries, stat=0x%08x\n", - INREG(RADEON_RBBM_STATUS) & RADEON_RBBM_FIFOCNT_MASK, - INREG(RADEON_RBBM_STATUS)); + (unsigned int)INREG(RADEON_RBBM_STATUS) & RADEON_RBBM_FIFOCNT_MASK, + (unsigned int)INREG(RADEON_RBBM_STATUS)); xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Idle timed out, resetting engine...\n"); RADEONEngineReset(pScrn); diff --git a/src/radeon_display.c b/src/radeon_display.c index 6bbd315..ea31a82 100644 --- a/src/radeon_display.c +++ b/src/radeon_display.c @@ -743,7 +743,7 @@ void RADEONInitDispBandwidth2(ScrnInfoPtr pScrn, RADEONInfoPtr info, int pixel_b xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, "GRPH_BUFFER_CNTL from %x to %x\n", (unsigned int)info->SavedReg.grph_buffer_cntl, - INREG(RADEON_GRPH_BUFFER_CNTL)); + (unsigned int)INREG(RADEON_GRPH_BUFFER_CNTL)); if (mode2) { stop_req = mode2->HDisplay * pixel_bytes2 / 16; @@ -793,7 +793,7 @@ void RADEONInitDispBandwidth2(ScrnInfoPtr pScrn, RADEONInfoPtr info, int pixel_b xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG, "GRPH2_BUFFER_CNTL from %x to %x\n", (unsigned int)info->SavedReg.grph2_buffer_cntl, - INREG(RADEON_GRPH2_BUFFER_CNTL)); + (unsigned int)INREG(RADEON_GRPH2_BUFFER_CNTL)); } } -- cgit v1.2.3 From 20568f66f9a9a60a33bd9a69ccc14a891c656836 Mon Sep 17 00:00:00 2001 From: Arkadiusz Miskiewicz Date: Tue, 18 Dec 2007 15:32:10 -0500 Subject: RADEON: more cleanups and warning fixes --- src/atividmem.c | 14 ++++---------- src/radeon_crtc.c | 4 +--- src/radeon_cursor.c | 2 +- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/atividmem.c b/src/atividmem.c index 8910c73..986ac0f 100644 --- a/src/atividmem.c +++ b/src/atividmem.c @@ -103,14 +103,12 @@ ATIUnmapLinear ATIPtr pATI ) { - pciVideoPtr pVideo = pATI->PCIInfo; - if (pATI->pMemory) { #ifndef XSERVER_LIBPCIACCESS xf86UnMapVidMem(iScreen, pATI->pMemory, pATI->LinearSize); #else - pci_device_unmap_range(pVideo, pATI->pMemory, pATI->LinearSize); + pci_device_unmap_range(pATI->PCIInfo, pATI->pMemory, pATI->LinearSize); #endif #if X_BYTE_ORDER != X_LITTLE_ENDIAN @@ -120,7 +118,7 @@ ATIUnmapLinear #ifndef XSERVER_LIBPCIACCESS xf86UnMapVidMem(iScreen, pATI->pMemoryLE, pATI->LinearSize); #else - pci_device_unmap_range(pVideo, pATI->pMemoryLE, pATI->LinearSize); + pci_device_unmap_range(pATI->PCIInfo, pATI->pMemoryLE, pATI->LinearSize); #endif } @@ -143,14 +141,12 @@ ATIUnmapMMIO ATIPtr pATI ) { - pciVideoPtr pVideo = pATI->PCIInfo; - if (pATI->pMMIO) { #ifndef XSERVER_LIBPCIACCESS xf86UnMapVidMem(iScreen, pATI->pMMIO, getpagesize()); #else - pci_device_unmap_range(pVideo, pATI->pMMIO, getpagesize()); + pci_device_unmap_range(pATI->PCIInfo, pATI->pMMIO, getpagesize()); #endif } @@ -169,14 +165,12 @@ ATIUnmapCursor ATIPtr pATI ) { - pciVideoPtr pVideo = pATI->PCIInfo; - if (pATI->pCursorPage) { #ifndef XSERVER_LIBPCIACCESS xf86UnMapVidMem(iScreen, pATI->pCursorPage, getpagesize()); #else - pci_device_unmap_range(pVideo, pATI->pCursorPage, getpagesize()); + pci_device_unmap_range(pATI->PCIInfo, pATI->pCursorPage, getpagesize()); #endif } diff --git a/src/radeon_crtc.c b/src/radeon_crtc.c index 41375da..07857dd 100644 --- a/src/radeon_crtc.c +++ b/src/radeon_crtc.c @@ -145,15 +145,13 @@ RADEONInitCommonRegisters(RADEONSavePtr save, RADEONInfoPtr info) static void RADEONInitSurfaceCntl(xf86CrtcPtr crtc, RADEONSavePtr save) { - ScrnInfoPtr pScrn = crtc->scrn; - save->surface_cntl = 0; #if X_BYTE_ORDER == X_BIG_ENDIAN /* We must set both apertures as they can be both used to map the entire * video memory. -BenH. */ - switch (pScrn->bitsPerPixel) { + switch (crtc->scrn->bitsPerPixel) { case 16: save->surface_cntl |= RADEON_NONSURF_AP0_SWP_16BPP; save->surface_cntl |= RADEON_NONSURF_AP1_SWP_16BPP; diff --git a/src/radeon_cursor.c b/src/radeon_cursor.c index 9dd6eb8..ba1159c 100644 --- a/src/radeon_cursor.c +++ b/src/radeon_cursor.c @@ -232,7 +232,7 @@ radeon_crtc_load_cursor_argb (xf86CrtcPtr crtc, CARD32 *image) ScrnInfoPtr pScrn = crtc->scrn; RADEONCrtcPrivatePtr radeon_crtc = crtc->driver_private; RADEONInfoPtr info = RADEONPTR(pScrn); - unsigned char *RADEONMMIO = info->MMIO; + CURSOR_SWAPPING_DECL_MMIO CARD32 *d = (CARD32 *)(pointer)(info->FB + radeon_crtc->cursor_offset + pScrn->fbOffset); RADEONCTRACE(("RADEONLoadCursorARGB\n")); -- cgit v1.2.3 From ce4fa1cedec0cf56b9979dfaa12a8d3a7c643df4 Mon Sep 17 00:00:00 2001 From: Arkadiusz Miskiewicz Date: Tue, 18 Dec 2007 15:34:14 -0500 Subject: RADEON: fix fd leak in lid detect code --- src/radeon_output.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/radeon_output.c b/src/radeon_output.c index c60ece8..6454460 100644 --- a/src/radeon_output.c +++ b/src/radeon_output.c @@ -699,15 +699,18 @@ RADEONDetectLidStatus(ScrnInfoPtr pScrn) while (fgets(lidline, sizeof lidline, f)) { if (!strncmp(lidline, "state:", strlen ("state:"))) { if (strstr(lidline, "open")) { + fclose(f); ErrorF("proc lid open\n"); return MT_LCD; } else if (strstr(lidline, "closed")) { + fclose(f); ErrorF("proc lid closed\n"); return MT_NONE; } } } + fclose(f); } #endif -- cgit v1.2.3