xorg-server: Changes to 'ubuntu+1'
debian/changelog | 11 +++
debian/patches/series | 2
debian/patches/xf86-dont-enable-gpuscreens.patch | 64 +++++++++++++++++++++++
3 files changed, 75 insertions(+), 2 deletions(-)
New commits:
commit 25f25e3264c76efb5308b96d6e42986e2f2dd6de
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed May 1 09:41:48 2013 +0200
Add patch to fixup optimus again.
xf86-dont-enable-gpuscreens.patch
diff --git a/debian/changelog b/debian/changelog
index 9ace01e..ebef470 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.14.1-0ubuntu0.3) raring; urgency=low
+
+ * Add patch to fixup optimus again.
+ - xf86-dont-enable-gpuscreens.patch
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Wed, 01 May 2013 09:38:59 +0200
+
xorg-server (2:1.14.1-0ubuntu0.2) raring; urgency=low
* Add patch to run on outputless hybrid systems again.
diff --git a/debian/patches/series b/debian/patches/series
index d4eb4ae..518e215 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -35,6 +35,7 @@ xf86setdesired-hybrid.patch
227_null_ptr_midispcur.patch
# https://bugs.freedesktop.org/show_bug.cgi?id=24181
# Probably is just papering over issue; needs further analysis
+xf86-dont-enable-gpuscreens.patch
## upstream patches
os-use-libunwind-to-generate-backtraces.patch
@@ -50,3 +51,4 @@ dix-allow-pixmap-dirty-helper-to-be-used-for-non-sha.patch
xserver-call-CSR-for-gpus.patch
autoconfig-fixup-tell-changed-so-randr-clients-can-t.patch
config-add-no-removal.patch
+
diff --git a/debian/patches/xf86-dont-enable-gpuscreens.patch b/debian/patches/xf86-dont-enable-gpuscreens.patch
new file mode 100644
index 0000000..64531ab
--- /dev/null
+++ b/debian/patches/xf86-dont-enable-gpuscreens.patch
@@ -0,0 +1,64 @@
+From: Aaron Plattner <aplattner@nvidia.com>
+To: <xorg-devel@lists.x.org>
+Subject: [PATCH] xfree86: don't enable anything in xf86InitialConfiguration
+ for GPU screens
+Date: Tue, 30 Apr 2013 14:30:18 -0700
+
+There's no point in turning on outputs connected to GPU screens during initial
+configuration. Not only does this cause them to just display black, it also
+confuses clients when these screens are attached to a master screen and RandR
+reports that the outputs are already on.
+
+Also, don't print the warning about no outputs being found on GPU screens,
+since that's expected.
+
+Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+---
+Dave, this fixes the black screen problem with "gpu: call CreateScreenResources
+for GPU screens"
+
+ hw/xfree86/modes/xf86Crtc.c | 16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
+index 4a490c6..35845e8 100644
+--- a/hw/xfree86/modes/xf86Crtc.c
++++ b/hw/xfree86/modes/xf86Crtc.c
+@@ -1997,6 +1997,14 @@ xf86CollectEnabledOutputs(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
+ Bool any_enabled = FALSE;
+ int o;
+
++ /*
++ * Don't bother enabling outputs on GPU screens: a client needs to attach
++ * it to a source provider before setting a mode that scans out a shared
++ * pixmap.
++ */
++ if (scrn->is_gpu)
++ return FALSE;
++
+ for (o = 0; o < config->num_output; o++)
+ any_enabled |= enabled[o] = xf86OutputEnabled(config->output[o], TRUE);
+
+@@ -2466,9 +2474,11 @@ xf86InitialConfiguration(ScrnInfoPtr scrn, Bool canGrow)
+
+ ret = xf86CollectEnabledOutputs(scrn, config, enabled);
+ if (ret == FALSE && canGrow) {
+- xf86DrvMsg(i, X_WARNING,
+- "Unable to find connected outputs - setting %dx%d initial framebuffer\n",
+- NO_OUTPUT_DEFAULT_WIDTH, NO_OUTPUT_DEFAULT_HEIGHT);
++ if (!scrn->is_gpu)
++ xf86DrvMsg(i, X_WARNING,
++ "Unable to find connected outputs - setting %dx%d "
++ "initial framebuffer\n",
++ NO_OUTPUT_DEFAULT_WIDTH, NO_OUTPUT_DEFAULT_HEIGHT);
+ have_outputs = FALSE;
+ }
+ else {
+--
+1.8.2.2
+
+_______________________________________________
+xorg-devel@lists.x.org: X.Org development
+Archives: http://lists.x.org/archives/xorg-devel
+Info: http://lists.x.org/mailman/listinfo/xorg-devel
+
commit a6cc4edffb2268301d2a4c5c34bee4af01d206b0
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Mon Apr 29 11:29:22 2013 +0200
release to raring ppa
diff --git a/debian/changelog b/debian/changelog
index 2a94fe7..9ace01e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.14.1-0ubuntu0.2) UNRELEASED; urgency=low
+xorg-server (2:1.14.1-0ubuntu0.2) raring; urgency=low
* Add patch to run on outputless hybrid systems again.
- xf86setdesired-hybrid.patch
- -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 29 Apr 2013 11:27:55 +0200
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Mon, 29 Apr 2013 11:29:10 +0200
xorg-server (2:1.14.1-0ubuntu0.1) raring; urgency=low
Reply to: