xserver-xorg-video-intel: Changes to 'debian-unstable'
debian/changelog | 7 +++++++
src/intel_display.c | 6 +++++-
2 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit c2636a1b8c2cfa889860a4e3f947348f3529c3fc
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Oct 17 11:15:30 2010 +0200
Add changelog entry
diff --git a/debian/changelog b/debian/changelog
index 506734d..9c87668 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.12.0+shadow-3) UNRELEASED; urgency=low
+
+ * Cherry-pick: display: do not report failure for setting unrecognised
+ properties. This unbreaks EDID reporting.
+
+ -- Julien Cristau <jcristau@debian.org> Sun, 17 Oct 2010 11:14:48 +0200
+
xserver-xorg-video-intel (2:2.12.0+shadow-2) unstable; urgency=low
* UMS is gone, this means Linux-only (closes: 597845).
commit 63d58e20b0ede39816daaa8696fa6a4223b12b8e
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun Oct 17 09:21:06 2010 +0100
display: do not report failure for setting unrecognised properties
We need to accept any changes to properties not handled by ourselves -- we
can't validate the changes ourselves. Denying those changes breaks EDID
reporting, for example.
Reported-by: Elvis Pranskevichus <el@prans.net>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
(cherry picked from commit 33133a1d38a4dce60d2e135663b545895fc85abc)
diff --git a/src/intel_display.c b/src/intel_display.c
index 5d85baa..780b204 100644
--- a/src/intel_display.c
+++ b/src/intel_display.c
@@ -1155,7 +1155,11 @@ intel_output_set_property(xf86OutputPtr output, Atom property,
}
}
- return FALSE;
+ /* We didn't recognise this property, just report success in order
+ * to allow the set to continue, otherwise we break setting of
+ * common properties like EDID.
+ */
+ return TRUE;
}
static Bool
Reply to: