frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86: Bump classic driver default to 1024x768 

Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Adam Jackson 2010-11-15 11:25:13 +10:00 committed by Keith Packard
parent 903e0f6f0f
commit 5f34853d6f
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/xfree86/common/xf86Mode.c
View File

@ -1402,6 +1402,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
strategy &= ~LOOKUP_OPTIONAL_TOLERANCES; strategy &= ~LOOKUP_OPTIONAL_TOLERANCES;
} else { } else {
const char *type = ""; const char *type = "";
Bool specified = FALSE;
if (scrp->monitor->nHsync <= 0) { if (scrp->monitor->nHsync <= 0) {
if (numTimings > 0) { if (numTimings > 0) {
@ -1412,10 +1413,12 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
} }
} else { } else {
scrp->monitor->hsync[0].lo = 31.5; scrp->monitor->hsync[0].lo = 31.5;
scrp->monitor->hsync[0].hi = 37.9; scrp->monitor->hsync[0].hi = 48.0;
scrp->monitor->nHsync = 1; scrp->monitor->nHsync = 1;
} }
type = "default "; type = "default ";
} else {
specified = TRUE;
} }
for (i = 0; i < scrp->monitor->nHsync; i++) { for (i = 0; i < scrp->monitor->nHsync; i++) {
if (scrp->monitor->hsync[i].lo == scrp->monitor->hsync[i].hi) if (scrp->monitor->hsync[i].lo == scrp->monitor->hsync[i].hi)
@ -1445,6 +1448,8 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
scrp->monitor->nVrefresh = 1; scrp->monitor->nVrefresh = 1;
} }
type = "default "; type = "default ";
} else {
specified = TRUE;
} }
for (i = 0; i < scrp->monitor->nVrefresh; i++) { for (i = 0; i < scrp->monitor->nVrefresh; i++) {
if (scrp->monitor->vrefresh[i].lo == scrp->monitor->vrefresh[i].hi) if (scrp->monitor->vrefresh[i].lo == scrp->monitor->vrefresh[i].hi)
@ -1459,10 +1464,16 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
scrp->monitor->vrefresh[i].lo, scrp->monitor->vrefresh[i].lo,
scrp->monitor->vrefresh[i].hi); scrp->monitor->vrefresh[i].hi);
} }
type = "";
if (!scrp->monitor->maxPixClock && !specified) {
type = "default ";
scrp->monitor->maxPixClock = 65000.0;
}
if (scrp->monitor->maxPixClock) { if (scrp->monitor->maxPixClock) {
xf86DrvMsg(scrp->scrnIndex, X_INFO, xf86DrvMsg(scrp->scrnIndex, X_INFO,
"%s: Using maximum pixel clock of %.2f MHz\n", "%s: Using %smaximum pixel clock of %.2f MHz\n",
scrp->monitor->id, scrp->monitor->id, type,
(float)scrp->monitor->maxPixClock / 1000.0); (float)scrp->monitor->maxPixClock / 1000.0);
} }
} }