xorg-server: Changes to 'ubuntu'
debian/changelog | 7 ++
debian/patches/disable-rotation-transform-gpuscreens.patch | 36 ++++++++-----
2 files changed, 30 insertions(+), 13 deletions(-)
New commits:
commit 6e30360f9a6cd950b7acf7164cee0aacbede9d29
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Wed Sep 2 16:17:14 2015 +0300
release to wily
diff --git a/debian/changelog b/debian/changelog
index c124287..fe8c4d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xorg-server (2:1.17.2-1ubuntu5) UNRELEASED; urgency=medium
+xorg-server (2:1.17.2-1ubuntu5) wily; urgency=medium
* disable-rotation-transform-gpuscreens.patch: Revert back to disabling
rotations on GPU screens. It won't work before 1.18. (LP: #1489696)
- -- Timo Aaltonen <tjaalton@debian.org> Wed, 02 Sep 2015 15:39:08 +0300
+ -- Timo Aaltonen <tjaalton@debian.org> Wed, 02 Sep 2015 15:56:03 +0300
xorg-server (2:1.17.2-1ubuntu4) wily; urgency=medium
commit 586a8b1ff752312d869982f7308cf60f585caece
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Wed Sep 2 15:47:48 2015 +0300
disable-rotation-transform-gpuscreens.patch:
Revert back to disabling rotations on GPU screens.
It won't work before 1.18. (LP: #1489696)
diff --git a/debian/changelog b/debian/changelog
index 5d373f1..c124287 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.17.2-1ubuntu5) UNRELEASED; urgency=medium
+
+ * disable-rotation-transform-gpuscreens.patch: Revert back to disabling
+ rotations on GPU screens. It won't work before 1.18. (LP: #1489696)
+
+ -- Timo Aaltonen <tjaalton@debian.org> Wed, 02 Sep 2015 15:39:08 +0300
+
xorg-server (2:1.17.2-1ubuntu4) wily; urgency=medium
* debian/patches/xmir-rootless.patch:
diff --git a/debian/patches/disable-rotation-transform-gpuscreens.patch b/debian/patches/disable-rotation-transform-gpuscreens.patch
index fb83137..6fd829c 100644
--- a/debian/patches/disable-rotation-transform-gpuscreens.patch
+++ b/debian/patches/disable-rotation-transform-gpuscreens.patch
@@ -2,17 +2,27 @@ Description: Disable support for rotations and transforms on gpu screens.
Author: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
Bug-Ubuntu: https://launchpad.net/bugs/1386620
Bug-Ubuntu: https://launchpad.net/bugs/1308515
+Bug-Ubuntu: https://launchpad.net/bugs/1489696
-diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index a441fd1..9147a26 100644
---- a/hw/xfree86/modes/xf86Crtc.c
-+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -778,7 +778,7 @@ xf86CrtcScreenInit(ScreenPtr screen)
- if (!crtc->funcs->shadow_allocate || !crtc->funcs->shadow_create)
- break;
- }
-- if (c == config->num_crtc) {
-+ if (c == config->num_crtc && !screen->isGPU) {
- xf86RandR12SetRotations(screen, RR_Rotate_0 | RR_Rotate_90 |
- RR_Rotate_180 | RR_Rotate_270 |
- RR_Reflect_X | RR_Reflect_Y);
+--- a/hw/xfree86/modes/xf86RandR12.c
++++ b/hw/xfree86/modes/xf86RandR12.c
+@@ -927,6 +927,9 @@ xf86RandR12SetRotations(ScreenPtr pScree
+ if (xf86RandR12Key == NULL)
+ return;
+
++ if (pScreen->isGPU)
++ rotations = RR_Rotate_0;
++
+ randrp = XF86RANDRINFO(pScreen);
+ #if RANDR_12_INTERFACE
+ for (c = 0; c < config->num_crtc; c++) {
+@@ -947,6 +950,9 @@ xf86RandR12SetTransformSupport(ScreenPtr
+ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
+ #endif
+
++ if (pScreen->isGPU)
++ transforms = FALSE;
++
+ if (xf86RandR12Key == NULL)
+ return;
+
Reply to: