diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-02-21 10:39:48 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-02-21 11:29:41 +0000 |
| commit | 507f72d6d44963cae5d8d4b9da68165f73c6fd36 (patch) | |
| tree | b935b36a40866608411bd86a5b177d3bc31d128d /src/intel_driver.c | |
| parent | c72a67390ea243bf43e2ee4efe237ab88a4615b7 (diff) | |
uxa: Remove DPRINTF stubs
It wasn't being used for anything non-trivial and was throwing compiler
warnings, so remove it.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/intel_driver.c')
| -rw-r--r-- | src/intel_driver.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/src/intel_driver.c b/src/intel_driver.c index b3871f49..1837509f 100644 --- a/src/intel_driver.c +++ b/src/intel_driver.c @@ -137,23 +137,6 @@ static Bool I830EnterVT(int scrnIndex, int flags); /* temporary */ extern void xf86SetCursor(ScreenPtr screen, CursorPtr pCurs, int x, int y); -#ifdef I830DEBUG -void -I830DPRINTF(const char *filename, int line, const char *function, - const char *fmt, ...) -{ - va_list ap; - - ErrorF("\n##############################################\n" - "*** In function %s, on line %d, in file %s ***\n", - function, line, filename); - va_start(ap, fmt); - VErrorF(fmt, ap); - va_end(ap); - ErrorF("##############################################\n\n"); -} -#endif /* #ifdef I830DEBUG */ - /* Export I830 options to i830 driver where necessary */ const OptionInfoRec *intel_uxa_available_options(int chipid, int busid) { @@ -169,8 +152,6 @@ I830LoadPalette(ScrnInfoPtr scrn, int numColors, int *indices, int p; uint16_t lut_r[256], lut_g[256], lut_b[256]; - DPRINTF(PFX, "I830LoadPalette: numColors: %d\n", numColors); - for (p = 0; p < xf86_config->num_crtc; p++) { xf86CrtcPtr crtc = xf86_config->crtc[p]; @@ -979,9 +960,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv) if (!miSetPixmapDepths()) return FALSE; - DPRINTF(PFX, "assert( if(!I830EnterVT(scrnIndex, 0)) )\n"); - - DPRINTF(PFX, "assert( if(!fbScreenInit(screen, ...) )\n"); if (!fbScreenInit(screen, NULL, scrn->virtualX, scrn->virtualY, scrn->xDpi, scrn->yDpi, @@ -1055,11 +1033,9 @@ I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv) if (!xf86CrtcScreenInit(screen)) return FALSE; - DPRINTF(PFX, "assert( if(!miCreateDefColormap(screen)) )\n"); if (!miCreateDefColormap(screen)) return FALSE; - DPRINTF(PFX, "assert( if(!xf86HandleColormaps(screen, ...)) )\n"); if (!xf86HandleColormaps(screen, 256, 8, I830LoadPalette, NULL, CMAP_RELOAD_ON_MODE_SWITCH | CMAP_PALETTED_TRUECOLOR)) { @@ -1141,8 +1117,6 @@ static void I830LeaveVT(int scrnIndex, int flags) intel_screen_private *intel = intel_get_screen_private(scrn); int ret; - DPRINTF(PFX, "Leave VT\n"); - xf86RotateFreeShadow(scrn); xf86_hide_cursors(scrn); @@ -1162,8 +1136,6 @@ static Bool I830EnterVT(int scrnIndex, int flags) intel_screen_private *intel = intel_get_screen_private(scrn); int ret; - DPRINTF(PFX, "Enter VT\n"); - ret = drmSetMaster(intel->drmSubFD); if (ret) { xf86DrvMsg(scrn->scrnIndex, X_WARNING, @@ -1296,9 +1268,6 @@ static Bool I830PMEvent(int scrnIndex, pmEvent event, Bool undo) ScrnInfoPtr scrn = xf86Screens[scrnIndex]; intel_screen_private *intel = intel_get_screen_private(scrn); - DPRINTF(PFX, "Enter VT, event %d, undo: %s\n", event, - BOOLTOSTRING(undo)); - switch (event) { case XF86_APM_SYS_SUSPEND: case XF86_APM_CRITICAL_SUSPEND: /*do we want to delay a critical suspend? */ |