diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 1001b27..1022337 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -30,7 +30,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.9.0 -Release: 13%{?gitdate:.%{gitdate}}%{dist} +Release: 14%{?gitdate:.%{gitdate}}%{dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -103,6 +103,7 @@ Patch7001: xserver-1.9.0-tcflush-fix.patch Patch7002: xserver-1.9.0-vbe-panelid-sanity.patch # misc Patch7003: xserver-1.9.0-vbe-insanity.patch +Patch7004: xserver-1.9.0-classic-default-mode.patch %define moduledir %{_libdir}/xorg/modules %define drimoduledir %{_libdir}/dri @@ -560,6 +561,10 @@ rm -rf $RPM_BUILD_ROOT %{xserver_source_dir} %changelog +* Mon Oct 11 2010 Adam Jackson 1.9.0-14 +- xserver-1.9.0-classic-default-mode.patch: Bump classic driver default + mode size to 1024x768. + * Tue Oct 05 2010 Adam Jackson 1.9.0-13 - xserver-1.9.0-vbe-insanity.patch: Fix thinko. diff --git a/xserver-1.9.0-classic-default-mode.patch b/xserver-1.9.0-classic-default-mode.patch new file mode 100644 index 0000000..2650ec3 --- /dev/null +++ b/xserver-1.9.0-classic-default-mode.patch @@ -0,0 +1,71 @@ +From 69603b8dea3a165daaf3d04c1281918626e68956 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Mon, 11 Oct 2010 17:09:19 -0400 +Subject: [PATCH] xfree86: Bump classic driver default to 1024x768 + +Signed-off-by: Adam Jackson +--- + hw/xfree86/common/xf86Mode.c | 21 ++++++++++++++++----- + 1 files changed, 16 insertions(+), 5 deletions(-) + +diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c +index 7bdf79a..a167df1 100644 +--- a/hw/xfree86/common/xf86Mode.c ++++ b/hw/xfree86/common/xf86Mode.c +@@ -1402,6 +1402,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes, + strategy &= ~LOOKUP_OPTIONAL_TOLERANCES; + } else { + const char *type = ""; ++ Bool specified = FALSE; + + if (scrp->monitor->nHsync <= 0) { + if (numTimings > 0) { +@@ -1412,11 +1413,13 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes, + } + } else { + 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; + } + type = "default "; +- } ++ } else { ++ specified = TRUE; ++ } + for (i = 0; i < scrp->monitor->nHsync; i++) { + if (scrp->monitor->hsync[i].lo == scrp->monitor->hsync[i].hi) + xf86DrvMsg(scrp->scrnIndex, X_INFO, +@@ -1445,7 +1448,9 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes, + scrp->monitor->nVrefresh = 1; + } + type = "default "; +- } ++ } else { ++ specified = TRUE; ++ } + for (i = 0; i < scrp->monitor->nVrefresh; i++) { + if (scrp->monitor->vrefresh[i].lo == scrp->monitor->vrefresh[i].hi) + xf86DrvMsg(scrp->scrnIndex, X_INFO, +@@ -1459,10 +1464,16 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes, + scrp->monitor->vrefresh[i].lo, + scrp->monitor->vrefresh[i].hi); + } ++ ++ type = ""; ++ if (!scrp->monitor->maxPixClock && !specified) { ++ type = "default "; ++ scrp->monitor->maxPixClock = 65000.0; ++ } + if (scrp->monitor->maxPixClock) { + xf86DrvMsg(scrp->scrnIndex, X_INFO, +- "%s: Using maximum pixel clock of %.2f MHz\n", +- scrp->monitor->id, ++ "%s: Using %smaximum pixel clock of %.2f MHz\n", ++ scrp->monitor->id, type, + (float)scrp->monitor->maxPixClock / 1000.0); + } + } +-- +1.7.3.1 +