diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2006-07-10 15:01:51 -0700 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2006-07-10 15:01:51 -0700 |
| commit | 48ba9273ddfb36d3525e19238b94b18c56667c4d (patch) | |
| tree | 3d7a44ec9c35c711a836db535451771eb823ceed | |
| parent | 3924ffb7d7b71cb9c6ab9eeb12d0f1b2c26244c0 (diff) | |
Fix validation when the first mode is thrown out, and print hsync in modelines.
| -rw-r--r-- | src/i830_xf86Modes.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/i830_xf86Modes.c b/src/i830_xf86Modes.c index 09f6b342..4c5de4d9 100644 --- a/src/i830_xf86Modes.c +++ b/src/i830_xf86Modes.c @@ -249,11 +249,12 @@ PrintModeline(int scrnIndex,DisplayModePtr mode) if (mode->Flags & V_CLKDIV2) add(&flags, "vclk/2"); #endif xf86DrvMsg(scrnIndex, X_ERROR, - "Modeline \"%s\"x%.01f %6.2f %i %i %i %i %i %i %i %i%s\n", + "Modeline \"%s\"x%.01f %6.2f %i %i %i %i %i %i %i %i%s " + "(%.01f kHz)\n", mode->name, mode->VRefresh, mode->Clock/1000., mode->HDisplay, mode->HSyncStart, mode->HSyncEnd, mode->HTotal, mode->VDisplay, mode->VSyncStart, mode->VSyncEnd, - mode->VTotal, flags); + mode->VTotal, flags, i830xf86ModeHSync(mode)); xfree(flags); } @@ -400,7 +401,7 @@ i830xf86PruneInvalidModes(ScrnInfoPtr pScrn, DisplayModePtr *modeList, DisplayModePtr mode; for (mode = *modeList; mode != NULL;) { - DisplayModePtr next = mode->next; + DisplayModePtr next = mode->next, first = *modeList; if (mode->status != MODE_OK) { if (verbose) { @@ -416,7 +417,7 @@ i830xf86PruneInvalidModes(ScrnInfoPtr pScrn, DisplayModePtr *modeList, xf86DeleteMode(modeList, mode); } - if (next == *modeList) + if (next == first) break; mode = next; } |