debian/changelog | 8 ++++
debian/patches/no-surfaces-kms.patch | 17 ---------
debian/patches/qxl-kms-disable-composite.patch | 43 -------------------------
debian/patches/series | 2 -
4 files changed, 8 insertions(+), 62 deletions(-)
New commits:
commit cf72e3c45109782ce7371297c9c7ef00d5ea1a1a
Author: Laurent Bigonville <bi...@debian.org>
Date: Tue Dec 20 10:09:38 2016 +0100
New upstream release
* New upstream release
- Drop debian/patches/no-surfaces-kms.patch and
debian/patches/qxl-kms-disable-composite.patch, applied upstream
diff --git a/debian/changelog b/debian/changelog
index 5930be3..7c2384d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-qxl (0.1.5-1) UNRELEASED; urgency=medium
+
+ * New upstream release
+ - Drop debian/patches/no-surfaces-kms.patch and
+ debian/patches/qxl-kms-disable-composite.patch, applied upstream
+
+ -- Laurent Bigonville <bi...@debian.org> Tue, 20 Dec 2016 10:09:00 +0100
+
xserver-xorg-video-qxl (0.1.4+20161126git4d7160c-1) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/no-surfaces-kms.patch
b/debian/patches/no-surfaces-kms.patch
deleted file mode 100644
index efe824b..0000000
--- a/debian/patches/no-surfaces-kms.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Disable surfaces when KMS is used
- This is not working properly at the moment.
-Author: Dave Airlie <airl...@redhat.com>
-Origin: vendor,
http://pkgs.fedoraproject.org/cgit/rpms/xorg-x11-drv-qxl.git/tree/no-surfaces-kms.patch
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=801081
-
---- a/src/qxl_uxa.c
-+++ b/src/qxl_uxa.c
-@@ -414,6 +414,8 @@ qxl_create_pixmap (ScreenPtr screen, int
- ErrorF ("Create pixmap: %d %d @ %d (usage: %d)\n", w, h, depth, usage);
- #endif
-
-+ if (qxl->kms_enabled)
-+ goto fallback;
- if (uxa_swapped_out (screen))
- goto fallback;
-
diff --git a/debian/patches/qxl-kms-disable-composite.patch
b/debian/patches/qxl-kms-disable-composite.patch
deleted file mode 100644
index dd56f76..0000000
--- a/debian/patches/qxl-kms-disable-composite.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Description: Disable composite/a8 surfaces for KMS
- This should help with bug rh#974198
-Author: From: Dave Airlie <airl...@redhat.com>
-Origin: vendor,
http://pkgs.fedoraproject.org/cgit/rpms/xorg-x11-drv-qxl.git/tree/qxl-kms-disable-composite.patch
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=801081
-
-diff -up xf86-video-qxl-20130514/src/qxl_kms.c.da
xf86-video-qxl-20130514/src/qxl_kms.c
-diff -up xf86-video-qxl-20130514/src/qxl_uxa.c.da
xf86-video-qxl-20130514/src/qxl_uxa.c
---- xf86-video-qxl-20130514/src/qxl_uxa.c.da 2013-06-18 10:08:56.113709355
+1000
-+++ xf86-video-qxl-20130514/src/qxl_uxa.c 2013-06-18 10:10:08.775610941
+1000
-@@ -222,11 +222,15 @@ qxl_has_composite (qxl_screen_t *qxl)
- #ifdef XF86DRM_MODE
- if (qxl->kms_enabled) {
-+#if 0 /* KMS Composite support seems broken - needs better hw support */
- static Bool result, checked;
- if (!checked) {
- result = qxl_kms_check_cap(qxl, SPICE_DISPLAY_CAP_COMPOSITE);
- checked = TRUE;
- }
- return result;
-+#else
-+ return FALSE;
-+#endif
- }
- #endif
- #ifndef XSPICE
-@@ -244,12 +248,16 @@ qxl_has_a8_surfaces (qxl_screen_t *qxl)
- {
- #ifdef XF86DRM_MODE
- if (qxl->kms_enabled) {
-+#if 0 /* KMS Composite support seems broken - needs better hw support */
- static Bool result, checked;
- if (!checked) {
- result = qxl_kms_check_cap(qxl, SPICE_DISPLAY_CAP_A8_SURFACE);
- checked = TRUE;
- }
- return result;
-+#else
-+ return FALSE;
-+#endif
- }
- #endif
- #ifndef XSPICE
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 765829c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-no-surfaces-kms.patch
-qxl-kms-disable-composite.patch
