From 3f6dba9d5f2f46a966e07a0a7f764ae9e0128385e03bfaad942a7bc3cfcb8e99 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 10 Mar 2007 23:18:00 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=17 --- xf86crtc_allowdual.diff | 23 +++++++++++++++++++++++ xorg-x11-server.changes | 7 +++++++ xorg-x11-server.spec | 8 +++++++- 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 xf86crtc_allowdual.diff diff --git a/xf86crtc_allowdual.diff b/xf86crtc_allowdual.diff new file mode 100644 index 0000000..9e9f6b5 --- /dev/null +++ b/xf86crtc_allowdual.diff @@ -0,0 +1,23 @@ +--- xorg-server-1.2.99.901/hw/xfree86/modes/xf86Crtc.c.orig 2007-03-05 04:10:32.000000000 +0100 ++++ xorg-server-1.2.99.901/hw/xfree86/modes/xf86Crtc.c 2007-03-08 17:08:56.000000000 +0100 +@@ -1099,9 +1099,6 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, + */ + output->status = (*output->funcs->detect)(output); + +- if (output->status == XF86OutputStatusDisconnected) +- continue; +- + memset (&mon_rec, '\0', sizeof (mon_rec)); + + conf_monitor = output->conf_monitor; +@@ -1273,6 +1270,10 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, + output->name); + } + #endif ++ ++ if (output->status == XF86OutputStatusDisconnected) ++ continue; ++ + for (mode = output->probed_modes; mode != NULL; mode = mode->next) + { + /* The code to choose the best mode per pipe later on will require diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 2a3aa84..daaa2ff 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Mar 9 16:10:23 CET 2007 - sndirsch@suse.de + +- xf86crtc_allowdual.diff: + * allows dualhead even when the second monitor is not yet + connected during Xserver start + ------------------------------------------------------------------- Tue Mar 6 11:42:23 CET 2007 - sndirsch@suse.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index daa81e7..c79cdce 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -21,7 +21,7 @@ BuildRequires: libjpeg-devel URL: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.2 -Release: 56 +Release: 58 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -82,6 +82,7 @@ Patch42: bug227111-ddc_screensize.diff Patch43: bug-211314_mesa-context.diff Patch44: bug-211314_p_drawable_privclean.diff Patch45: bug-197858_dpms.diff +Patch46: xf86crtc_allowdual.diff Patch334: p_pci-domain.diff Patch357: p_pci-ce-x.diff @@ -177,6 +178,7 @@ pushd ../Mesa popd %patch44 -p0 %patch45 -p0 +%patch46 -p1 %build autoreconf -fi @@ -507,6 +509,10 @@ exit 0 %endif %changelog +* Fri Mar 09 2007 - sndirsch@suse.de +- xf86crtc_allowdual.diff: + * allows dualhead even when the second monitor is not yet + connected during Xserver start * Tue Mar 06 2007 - sndirsch@suse.de - %%post: replace "i810beta" with "intel" in existing xorg.conf * Mon Mar 05 2007 - sndirsch@suse.de