summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Plattner <aplattner@nvidia.com>2007-04-13 23:02:35 -0700
committerAaron Plattner <aplattner@nvidia.com>2007-04-13 23:06:32 -0700
commitf7c62016f8bf9ced7d56f74ce26e13b6df040379 (patch)
treed987a19425eb4a5f056821a3c49c5ef57357f04f
parentf1cda5eaba9cbbfeb913d249d014586a6e8fd7a6 (diff)
G80: Get rid of debug printouts.
-rw-r--r--src/g80_dac.c3
-rw-r--r--src/g80_display.c8
-rw-r--r--src/g80_driver.c7
-rw-r--r--src/g80_sor.c3
4 files changed, 1 insertions, 20 deletions
diff --git a/src/g80_dac.c b/src/g80_dac.c
index e536ef7..7848de2 100644
--- a/src/g80_dac.c
+++ b/src/g80_dac.c
@@ -84,9 +84,6 @@ G80DacModeSet(xf86OutputPtr output, DisplayModePtr mode,
G80OutputPrivPtr pPriv = output->driver_private;
const int dacOff = 0x80 * pPriv->or;
- if(adjusted_mode)
- ErrorF("DAC%i mode %s -> HEAD%i\n", pPriv->or, adjusted_mode->name, G80CrtcGetHead(output->crtc));
-
if(!adjusted_mode) {
C(0x00000400 + dacOff, 0);
return;
diff --git a/src/g80_display.c b/src/g80_display.c
index d7f52dd..652a5a9 100644
--- a/src/g80_display.c
+++ b/src/g80_display.c
@@ -461,17 +461,11 @@ G80CrtcPrepare(xf86CrtcPtr crtc)
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
int i;
- ErrorF("Outputs:\n");
for(i = 0; i < xf86_config->num_output; i++) {
xf86OutputPtr output = xf86_config->output[i];
- if(output->crtc) {
- G80CrtcPrivPtr pPriv = output->crtc->driver_private;
- ErrorF("\t%s -> HEAD%i\n", output->name, pPriv->head);
- } else {
- ErrorF("\t%s disconnected\n", output->name);
+ if(!output->crtc)
output->funcs->mode_set(output, NULL, NULL);
- }
}
}
diff --git a/src/g80_driver.c b/src/g80_driver.c
index 6ab92ee..a3d86c7 100644
--- a/src/g80_driver.c
+++ b/src/g80_driver.c
@@ -131,7 +131,6 @@ G80ResizeScreen(ScrnInfoPtr pScrn, int width, int height)
pitch = (pitch + 255) & ~255;
- ErrorF("Resizing screen to %ix%i\n", width, height);
pScrn->virtualX = width;
pScrn->virtualY = height;
@@ -481,12 +480,6 @@ G80BlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
static Bool
G80SaveScreen(ScreenPtr pScreen, int mode)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-
- if(!pScrn->vtSema) return FALSE;
-
- ErrorF("SaveScreen unimplemented\n");
-
return FALSE;
}
diff --git a/src/g80_sor.c b/src/g80_sor.c
index 5187d1f..90119f0 100644
--- a/src/g80_sor.c
+++ b/src/g80_sor.c
@@ -71,9 +71,6 @@ G80SorModeSet(xf86OutputPtr output, DisplayModePtr mode,
G80OutputPrivPtr pPriv = output->driver_private;
const int sorOff = 0x40 * pPriv->or;
- if(adjusted_mode)
- ErrorF("SOR%i mode %s -> HEAD%i\n", pPriv->or, adjusted_mode->name, G80CrtcGetHead(output->crtc));
-
if(!adjusted_mode) {
/* Disconnect the SOR */
C(0x00000600 + sorOff, 0);