debian/changelog | 7 ++++ debian/patches/series | 1 debian/patches/xf86setdesired-hybrid.patch | 44 +++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+)
New commits: commit be5f18186421afda7f99d4e49c603e92655fddcb Author: Maarten Lankhorst <[email protected]> Date: Mon Apr 29 11:28:50 2013 +0200 Add patch to run on outputless hybrid systems again. xf86setdesired-hybrid.patch diff --git a/debian/changelog b/debian/changelog index e9a8e9e..2a94fe7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xorg-server (2:1.14.1-0ubuntu0.2) UNRELEASED; urgency=low + + * Add patch to run on outputless hybrid systems again. + - xf86setdesired-hybrid.patch + + -- Maarten Lankhorst <[email protected]> Mon, 29 Apr 2013 11:27:55 +0200 + xorg-server (2:1.14.1-0ubuntu0.1) raring; urgency=low [ Timo Aaltonen ] diff --git a/debian/patches/series b/debian/patches/series index 309f5e0..d4eb4ae 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -19,6 +19,7 @@ xfree86-no-xv-for-gpuscreens.patch xephyr-glx-register.patch no-nv.patch +xf86setdesired-hybrid.patch ## waiting for review by upstream 111_armel-drv-fallbacks.patch diff --git a/debian/patches/xf86setdesired-hybrid.patch b/debian/patches/xf86setdesired-hybrid.patch new file mode 100644 index 0000000..037556e --- /dev/null +++ b/debian/patches/xf86setdesired-hybrid.patch @@ -0,0 +1,44 @@ +Subject: [PATCH] hw/xfree86: Allow xf86SetDesiredModes to succeed if no crtc's are enabled. +From: Maarten Lankhorst <[email protected]> + +Fixes regression on xserver 1.14 introduced by 6703a7c7cf1a. +"hw/xfree86: Require only one working CRTC to start the server." + +https://bugs.freedesktop.org/show_bug.cgi?id=62916 + +Without any crtc's enabled, 1.13 worked correctly, but the logic in +xf86SetDesiredModes will now return false instead. Fix this to +return success if all outputs were already disabled. + +Signed-off-by: Maarten Lankhorst <[email protected]> +--- +diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +index f9ae465..eb72f0e 100644 +--- a/hw/xfree86/modes/xf86Crtc.c ++++ b/hw/xfree86/modes/xf86Crtc.c +@@ -2599,7 +2599,7 @@ xf86SetDesiredModes(ScrnInfoPtr scrn) + xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); + xf86CrtcPtr crtc = config->crtc[0]; + int c; +- int enabled = 0; ++ int enabled = 0, failed = 0; + + /* A driver with this hook will take care of this */ + if (!crtc->funcs->set_mode_major) { +@@ -2659,11 +2659,12 @@ xf86SetDesiredModes(ScrnInfoPtr scrn) + if (config->output[o]->crtc == crtc) + config->output[o]->crtc = NULL; + crtc->enabled = FALSE; +- } ++ failed++; ++ } + } + + xf86DisableUnusedFunctions(scrn); +- return enabled != 0; ++ return enabled != 0 || !failed; + } + + /** + + -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
