xf86-video-intel: Branch 'intel-batchbuffer' - src/i830_debug.c src/i830_dri.c src/i830_driver.c src/i830.h src/i830_video.c
Kristian Høgsberg
krh at kemper.freedesktop.org
Thu Mar 6 15:38:53 PST 2008
src/i830.h | 7 +++++++
src/i830_debug.c | 28 +++++++++++++++++-----------
src/i830_dri.c | 3 +--
src/i830_driver.c | 1 -
src/i830_video.c | 13 ++++++-------
5 files changed, 31 insertions(+), 21 deletions(-)
New commits:
commit ae527a36c8d0b0e1c1ee6155740e3c832aab0d6f
Author: Kristian Høgsberg <krh at redhat.com>
Date: Thu Mar 6 18:30:13 2008 -0500
Cut down on warnings.
Fix printf formatting warnings, wrap a couple of long lines, nuke
unused variables.
diff --git a/src/i830.h b/src/i830.h
index c61767d..63ba9f0 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -890,4 +890,11 @@ extern void i830_fixup_devices(ScrnInfoPtr);
#include "intel_batchbuffer.h"
+/* Mirrors CARD32 definition in Xmd.h */
+#ifdef LONG64
+#define CARD32_HEX "x"
+#else
+#define CARD32_HEX "lx"
+#endif
+
#endif /* _I830_H_ */
diff --git a/src/i830_debug.c b/src/i830_debug.c
index 7d0c0a0..17044b2 100644
--- a/src/i830_debug.c
+++ b/src/i830_debug.c
@@ -957,13 +957,14 @@ i830_dump_error_state(ScrnInfoPtr pScrn)
{
I830Ptr pI830 = I830PTR(pScrn);
- ErrorF("pgetbl_ctl: 0x%" PRIx32 "getbl_err: 0x%" PRIx32 "\n",
+ ErrorF("pgetbl_ctl: 0x%" CARD32_HEX "getbl_err: 0x%" CARD32_HEX "\n",
INREG(PGETBL_CTL), INREG(PGE_ERR));
- ErrorF("ipeir: %" PRIx32 " iphdr: %" PRIx32 "\n", INREG(IPEIR),
+ ErrorF("ipeir: %" CARD32_HEX " iphdr: %" CARD32_HEX "\n", INREG(IPEIR),
INREG(IPEHR));
- ErrorF("LP ring tail: %" PRIx32 " head: %" PRIx32 " len: %" PRIx32 " start %" PRIx32 "\n",
+ ErrorF("LP ring tail: %" CARD32_HEX " head: %" CARD32_HEX
+ " len: %" CARD32_HEX " start %" CARD32_HEX "\n",
INREG(LP_RING + RING_TAIL),
INREG(LP_RING + RING_HEAD) & HEAD_ADDR,
INREG(LP_RING + RING_LEN),
@@ -974,8 +975,8 @@ i830_dump_error_state(ScrnInfoPtr pScrn)
ErrorF("instdone: %x instpm: %x\n", INREG16(INST_DONE), INREG8(INST_PM));
- ErrorF("memmode: %" PRIx32 " instps: %" PRIx32 "\n", INREG(MEMMODE),
- INREG(INST_PS));
+ ErrorF("memmode: %" CARD32_HEX " instps: %" CARD32_HEX "\n",
+ INREG(MEMMODE), INREG(INST_PS));
ErrorF("hwstam: %x ier: %x imr: %x iir: %x\n",
INREG16(HWSTAM), INREG16(IER), INREG16(IMR), INREG16(IIR));
@@ -987,12 +988,14 @@ i965_dump_error_state(ScrnInfoPtr pScrn)
{
I830Ptr pI830 = I830PTR(pScrn);
- ErrorF("pgetbl_ctl: 0x%" PRIx32 " pgetbl_err: 0x%" PRIx32 "\n",
+ ErrorF("pgetbl_ctl: 0x%" CARD32_HEX " pgetbl_err: 0x%" CARD32_HEX "\n",
INREG(PGETBL_CTL), INREG(PGE_ERR));
- ErrorF("ipeir: %" PRIx32 " iphdr: %" PRIx32 "\n", INREG(IPEIR_I965), INREG(IPEHR_I965));
+ ErrorF("ipeir: %" CARD32_HEX " iphdr: %" CARD32_HEX "\n",
+ INREG(IPEIR_I965), INREG(IPEHR_I965));
- ErrorF("LP ring tail: %" PRIx32 " head: %" PRIx32 " len: %" PRIx32 " start %" PRIx32 "\n",
+ ErrorF("LP ring tail: %" CARD32_HEX " head: %" CARD32_HEX
+ " len: %" CARD32_HEX " start %" CARD32_HEX "\n",
INREG(LP_RING + RING_TAIL),
INREG(LP_RING + RING_HEAD) & HEAD_ADDR,
INREG(LP_RING + RING_LEN), INREG(LP_RING + RING_START));
@@ -1004,15 +1007,18 @@ i965_dump_error_state(ScrnInfoPtr pScrn)
(int)INREG(INST_DONE_1));
ErrorF("instpm: %x\n", (int)INREG(INST_PM));
- ErrorF("memmode: %" PRIx32 " instps: %" PRIx32 "\n", INREG(MEMMODE), INREG(INST_PS_I965));
+ ErrorF("memmode: %" CARD32_HEX " instps: %" CARD32_HEX "\n",
+ INREG(MEMMODE), INREG(INST_PS_I965));
ErrorF("HW Status mask (hwstam): %x\nIRQ enable (ier): %x "
"imr: %x iir: %x\n",
(int)INREG(HWSTAM), (int)INREG(IER), (int)INREG(IMR),
(int)INREG(IIR));
- ErrorF("acthd: %" PRIx32 " dma_fadd_p: %" PRIx32 "\n", INREG(ACTHD), INREG(DMA_FADD_P));
- ErrorF("ecoskpd: %" PRIx32 " excc: %" PRIx32 "\n", INREG(ECOSKPD), INREG(EXCC));
+ ErrorF("acthd: %" CARD32_HEX " dma_fadd_p: %" CARD32_HEX "\n",
+ INREG(ACTHD), INREG(DMA_FADD_P));
+ ErrorF("ecoskpd: %" CARD32_HEX " excc: %" CARD32_HEX "\n",
+ INREG(ECOSKPD), INREG(EXCC));
ErrorF("cache_mode: %x/%x\n", (int)INREG(CACHE_MODE_0),
(int)INREG(CACHE_MODE_1));
diff --git a/src/i830_dri.c b/src/i830_dri.c
index d95ecb2..f739b44 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -971,7 +971,6 @@ I830DRICloseScreen(ScreenPtr pScreen)
{
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
I830Ptr pI830 = I830PTR(pScrn);
- I830DRIPtr pI830DRI = (I830DRIPtr) pI830->pDRIInfo->devPrivate;
DPRINTF(PFX, "I830DRICloseScreen\n");
@@ -1954,7 +1953,7 @@ I830DRI2ScreenInit(ScreenPtr pScreen)
I830Ptr pI830 = I830PTR(pScrn);
I830RingBuffer *ring = pI830->LpRing;
drm_i915_init_t info;
- int fd, major, minor, patch;
+ int fd;
const char *driverName;
unsigned int sarea_handle;
void *p;
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 1556505..c4bcee0 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -2317,7 +2317,6 @@ void
IntelEmitInvarientState(ScrnInfoPtr pScrn)
{
I830Ptr pI830 = I830PTR(pScrn);
- CARD32 ctx_addr;
if (pI830->noAccel)
return;
diff --git a/src/i830_video.c b/src/i830_video.c
index dea9fde..645e25c 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -464,8 +464,8 @@ i830_overlay_continue(ScrnInfoPtr pScrn, Bool update_filter)
flip_addr = pI830->overlay_regs->bus_addr;
if (update_filter)
flip_addr |= OFC_UPDATE;
- OVERLAY_DEBUG ("overlay_continue cmd 0x%08" PRIx32 " -> 0x%08" PRIx32
- " sta 0x%08" PRIx32 "\n",
+ OVERLAY_DEBUG ("overlay_continue cmd 0x%08" CARD32_HEX
+ " -> 0x%08" CARD32_HEX " sta 0x%08" CARD32_HEX "\n",
overlay->OCMD, INREG(OCMD_REGISTER), INREG(DOVSTA));
BEGIN_BATCH(4);
OUT_BATCH(MI_FLUSH | MI_WRITE_DIRTY_STATE);
@@ -505,7 +505,8 @@ i830_overlay_off(ScrnInfoPtr pScrn)
*/
{
overlay->OCMD &= ~OVERLAY_ENABLE;
- OVERLAY_DEBUG ("overlay_off cmd 0x%08" PRIx32 " -> 0x%08" PRIx32 " sta 0x%08" PRIx32 "\n",
+ OVERLAY_DEBUG ("overlay_off cmd 0x%08" CARD32_HEX
+ " -> 0x%08" CARD32_HEX " sta 0x%08" CARD32_HEX "\n",
overlay->OCMD, INREG(OCMD_REGISTER), INREG(DOVSTA));
BEGIN_BATCH(6);
OUT_BATCH(MI_FLUSH | MI_WRITE_DIRTY_STATE);
@@ -1202,7 +1203,6 @@ I830CopyPackedData(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv,
int srcPitch,
int dstPitch, int top, int left, int h, int w)
{
- I830Ptr pI830 = I830PTR(pScrn);
unsigned char *src, *dst;
int i,j;
unsigned char *s;
@@ -1303,7 +1303,6 @@ I830CopyPlanarToPackedData(ScrnInfoPtr pScrn, I830PortPrivPtr pPriv,
int srcPitch2, int dstPitch, int srcH,
int top, int left, int h, int w, int id)
{
- I830Ptr pI830 = I830PTR(pScrn);
CARD8 *dst1, *srcy, *srcu, *srcv;
int y;
@@ -1928,7 +1927,7 @@ i830_display_video(ScrnInfoPtr pScrn, xf86CrtcPtr crtc,
overlay->OBUF_1V = pPriv->VBuf1offset;
}
- OVERLAY_DEBUG("pos: 0x%" PRIx32 ", size: 0x%" PRIx32 "\n",
+ OVERLAY_DEBUG("pos: 0x%" CARD32_HEX ", size: 0x%" CARD32_HEX "\n",
overlay->DWINPOS, overlay->DWINSZ);
OVERLAY_DEBUG("dst: %d x %d, src: %d x %d\n", drw_w, drw_h, src_w, src_h);
@@ -2090,7 +2089,7 @@ i830_display_video(ScrnInfoPtr pScrn, xf86CrtcPtr crtc,
OCMD |= BUFFER1;
overlay->OCMD = OCMD;
- OVERLAY_DEBUG("OCMD is 0x%" PRIx32 "\n", OCMD);
+ OVERLAY_DEBUG("OCMD is 0x%" CARD32_HEX "\n", OCMD);
/* make sure the overlay is on */
i830_overlay_on (pScrn);
More information about the xorg-commit
mailing list