|
 |
d939a0a |
From 69603b8dea3a165daaf3d04c1281918626e68956 Mon Sep 17 00:00:00 2001
|
|
|
d939a0a |
From: Adam Jackson <ajax@redhat.com>
|
|
|
d939a0a |
Date: Mon, 11 Oct 2010 17:09:19 -0400
|
|
|
d939a0a |
Subject: [PATCH] xfree86: Bump classic driver default to 1024x768
|
|
|
d939a0a |
|
|
|
d939a0a |
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
|
|
d939a0a |
---
|
|
|
d939a0a |
hw/xfree86/common/xf86Mode.c | 21 ++++++++++++++++-----
|
|
|
d939a0a |
1 files changed, 16 insertions(+), 5 deletions(-)
|
|
|
d939a0a |
|
|
|
d939a0a |
diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c
|
|
|
d939a0a |
index 7bdf79a..a167df1 100644
|
|
|
d939a0a |
--- a/hw/xfree86/common/xf86Mode.c
|
|
|
d939a0a |
+++ b/hw/xfree86/common/xf86Mode.c
|
|
|
d939a0a |
@@ -1402,6 +1402,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
|
|
|
d939a0a |
strategy &= ~LOOKUP_OPTIONAL_TOLERANCES;
|
|
|
d939a0a |
} else {
|
|
|
d939a0a |
const char *type = "";
|
|
|
d939a0a |
+ Bool specified = FALSE;
|
|
|
d939a0a |
|
|
|
d939a0a |
if (scrp->monitor->nHsync <= 0) {
|
|
|
d939a0a |
if (numTimings > 0) {
|
|
|
d939a0a |
@@ -1412,11 +1413,13 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
|
|
|
d939a0a |
}
|
|
|
d939a0a |
} else {
|
|
|
d939a0a |
scrp->monitor->hsync[0].lo = 31.5;
|
|
|
d939a0a |
- scrp->monitor->hsync[0].hi = 37.9;
|
|
|
d939a0a |
+ scrp->monitor->hsync[0].hi = 48.0;
|
|
|
d939a0a |
scrp->monitor->nHsync = 1;
|
|
|
d939a0a |
}
|
|
|
d939a0a |
type = "default ";
|
|
|
d939a0a |
- }
|
|
|
d939a0a |
+ } else {
|
|
|
d939a0a |
+ specified = TRUE;
|
|
|
d939a0a |
+ }
|
|
|
d939a0a |
for (i = 0; i < scrp->monitor->nHsync; i++) {
|
|
|
d939a0a |
if (scrp->monitor->hsync[i].lo == scrp->monitor->hsync[i].hi)
|
|
|
d939a0a |
xf86DrvMsg(scrp->scrnIndex, X_INFO,
|
|
|
d939a0a |
@@ -1445,7 +1448,9 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
|
|
|
d939a0a |
scrp->monitor->nVrefresh = 1;
|
|
|
d939a0a |
}
|
|
|
d939a0a |
type = "default ";
|
|
|
d939a0a |
- }
|
|
|
d939a0a |
+ } else {
|
|
|
d939a0a |
+ specified = TRUE;
|
|
|
d939a0a |
+ }
|
|
|
d939a0a |
for (i = 0; i < scrp->monitor->nVrefresh; i++) {
|
|
|
d939a0a |
if (scrp->monitor->vrefresh[i].lo == scrp->monitor->vrefresh[i].hi)
|
|
|
d939a0a |
xf86DrvMsg(scrp->scrnIndex, X_INFO,
|
|
|
d939a0a |
@@ -1459,10 +1464,16 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
|
|
|
d939a0a |
scrp->monitor->vrefresh[i].lo,
|
|
|
d939a0a |
scrp->monitor->vrefresh[i].hi);
|
|
|
d939a0a |
}
|
|
|
d939a0a |
+
|
|
|
d939a0a |
+ type = "";
|
|
|
d939a0a |
+ if (!scrp->monitor->maxPixClock && !specified) {
|
|
|
d939a0a |
+ type = "default ";
|
|
|
d939a0a |
+ scrp->monitor->maxPixClock = 65000.0;
|
|
|
d939a0a |
+ }
|
|
|
d939a0a |
if (scrp->monitor->maxPixClock) {
|
|
|
d939a0a |
xf86DrvMsg(scrp->scrnIndex, X_INFO,
|
|
|
d939a0a |
- "%s: Using maximum pixel clock of %.2f MHz\n",
|
|
|
d939a0a |
- scrp->monitor->id,
|
|
|
d939a0a |
+ "%s: Using %smaximum pixel clock of %.2f MHz\n",
|
|
|
d939a0a |
+ scrp->monitor->id, type,
|
|
|
d939a0a |
(float)scrp->monitor->maxPixClock / 1000.0);
|
|
|
d939a0a |
}
|
|
|
d939a0a |
}
|
|
|
d939a0a |
--
|
|
|
d939a0a |
1.7.3.1
|
|
|
d939a0a |
|