|
 |
9c546f8 |
--- xorg-server-1.1.1/hw/xfree86/vbe/vbeModes.c.jx 2006-07-05 14:31:42.000000000 -0400
|
|
|
9c546f8 |
+++ xorg-server-1.1.1/hw/xfree86/vbe/vbeModes.c 2006-09-22 15:29:34.000000000 -0400
|
|
|
9c546f8 |
@@ -153,34 +153,6 @@
|
|
|
9c546f8 |
xf86ErrorFVerb(DEBUG_VERB, "*");
|
|
|
9c546f8 |
}
|
|
|
9c546f8 |
|
|
|
9c546f8 |
- /*
|
|
|
9c546f8 |
- * Check if there's a valid monitor mode that this one can be matched
|
|
|
9c546f8 |
- * up with. The actual matching is done later.
|
|
|
9c546f8 |
- */
|
|
|
9c546f8 |
- if (modeOK) {
|
|
|
9c546f8 |
- Bool sizeMatch = FALSE;
|
|
|
9c546f8 |
- modeOK = FALSE;
|
|
|
9c546f8 |
- for (p = pScrn->monitor->Modes; p != NULL; p = p->next) {
|
|
|
9c546f8 |
- if ((p->HDisplay != mode->XResolution) ||
|
|
|
9c546f8 |
- (p->VDisplay != mode->YResolution) ||
|
|
|
9c546f8 |
- (p->Flags & (V_INTERLACE | V_DBLSCAN | V_CLKDIV2)))
|
|
|
9c546f8 |
- continue;
|
|
|
9c546f8 |
- sizeMatch = TRUE;
|
|
|
9c546f8 |
- /* XXX could support the various V_ flags */
|
|
|
9c546f8 |
- status = xf86CheckModeForMonitor(p, pScrn->monitor);
|
|
|
9c546f8 |
- if (status == MODE_OK) {
|
|
|
9c546f8 |
- modeOK = TRUE;
|
|
|
9c546f8 |
- break;
|
|
|
9c546f8 |
- }
|
|
|
9c546f8 |
- }
|
|
|
9c546f8 |
- if (sizeMatch && !modeOK) {
|
|
|
9c546f8 |
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
|
|
|
9c546f8 |
- "Not using built-in mode \"%dx%d\" (%s)\n",
|
|
|
9c546f8 |
- mode->XResolution, mode->YResolution,
|
|
|
9c546f8 |
- xf86ModeStatusToString(status));
|
|
|
9c546f8 |
- }
|
|
|
9c546f8 |
- }
|
|
|
9c546f8 |
-
|
|
|
9c546f8 |
xf86ErrorFVerb(DEBUG_VERB,
|
|
|
9c546f8 |
"Mode: %x (%dx%d)\n", id, mode->XResolution, mode->YResolution);
|
|
|
9c546f8 |
xf86ErrorFVerb(DEBUG_VERB,
|