rpms/xorg-x11-server
5
0
Fork 0
Code Issues Pull Requests Releases Activity

* Fri Aug 21 2009 Adam Jackson <ajax@redhat.com> 1.6.99-39.20090820

Browse Source 
- xserver-1.6.99-default-modes.patch: Don't add default modes to the pool if
  the driver returned real modes (and has no EDID).
This commit is contained in:
Adam Jackson 2009-08-21 18:33:32 +00:00
parent d7382b0550
commit 50f2416669
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xorg-x11-server.spec
View File

@ -19,7 +19,7 @@
Summary: X.Org X11 X server Summary: X.Org X11 X server
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.6.99 Version: 1.6.99
Release: 38.%{gitdate}%{?dist} Release: 39.%{gitdate}%{?dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT License: MIT
Group: User Interface/X Group: User Interface/X
@ -80,6 +80,7 @@ Patch6028: xserver-1.6.99-randr-error-debugging.patch
Patch6030: xserver-1.6.99-right-of.patch Patch6030: xserver-1.6.99-right-of.patch
Patch6031: xserver-1.6.99-dri2-crash-fixes.patch Patch6031: xserver-1.6.99-dri2-crash-fixes.patch
Patch6032: xserver-1.6.99-dri2-swapbuffers-fallback.patch Patch6032: xserver-1.6.99-dri2-swapbuffers-fallback.patch
Patch6033: xserver-1.6.99-default-modes.patch
%define moduledir %{_libdir}/xorg/modules %define moduledir %{_libdir}/xorg/modules
%define drimoduledir %{_libdir}/dri %define drimoduledir %{_libdir}/dri
@ -506,6 +507,10 @@ rm -rf $RPM_BUILD_ROOT
%{xserver_source_dir} %{xserver_source_dir}
%changelog %changelog
* Fri Aug 21 2009 Adam Jackson <ajax@redhat.com> 1.6.99-39.20090820
- xserver-1.6.99-default-modes.patch: Don't add default modes to the pool if
the driver returned real modes (and has no EDID).
* Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 1.6.99-38.20090820 * Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 1.6.99-38.20090820
- rebuilt with new openssl - rebuilt with new openssl

35
xserver-1.6.99-default-modes.patch Normal file
View File

@ -0,0 +1,35 @@
From 50552b0ee81b23b997bebd798b19b4a7e234a55f Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 21 Aug 2009 13:51:45 -0400
Subject: [PATCH] tweak default mode list yet again
---
hw/xfree86/modes/xf86Crtc.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 4f14a75..c6fd910 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -1567,7 +1567,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
int min_clock = 0;
int max_clock = 0;
double clock;
- Bool add_default_modes = TRUE;
+ Bool add_default_modes;
enum { sync_config, sync_edid, sync_default } sync_source = sync_default;
while (output->probed_modes != NULL)
@@ -1610,6 +1610,9 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
}
output_modes = (*output->funcs->get_modes) (output);
+
+ /* if the driver found modes, don't second-guess it */
+ add_default_modes = (output_modes == NULL);
edid_monitor = output->MonInfo;
--
1.6.4