debian/changelog | 6 ++ debian/patches/disable-rotation-transform-gpuscreens.patch | 35 ++++--------- 2 files changed, 19 insertions(+), 22 deletions(-)
New commits: commit 1d9ce2ec7aa829ba3d262a326f4c60bd998d35cf Author: Maarten Lankhorst <maarten.lankho...@ubuntu.com> Date: Thu Nov 6 12:20:14 2014 +0100 Re-enable rotation in optimus mode with SNA. (LP: #1386620) diff --git a/debian/changelog b/debian/changelog index b254535..f089574 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xorg-server (2:1.16.1.901-1ubuntu2) vivid; urgency=medium + + * Re-enable rotation in optimus mode with SNA. (LP: #1386620) + + -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Thu, 06 Nov 2014 12:19:07 +0100 + xorg-server (2:1.16.1.901-1ubuntu1) vivid; urgency=medium * Merge from released debian-unstable. diff --git a/debian/patches/disable-rotation-transform-gpuscreens.patch b/debian/patches/disable-rotation-transform-gpuscreens.patch index 9da6c65..9f95572 100644 --- a/debian/patches/disable-rotation-transform-gpuscreens.patch +++ b/debian/patches/disable-rotation-transform-gpuscreens.patch @@ -1,22 +1,13 @@ ---- a/hw/xfree86/modes/xf86RandR12.c -+++ b/hw/xfree86/modes/xf86RandR12.c -@@ -932,6 +932,9 @@ - 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++) { -@@ -954,6 +957,9 @@ - xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); - #endif - -+ if (pScreen->isGPU) -+ transforms = FALSE; -+ - if (xf86RandR12Key == NULL) - return; - +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); -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1xyzar-0004r5...@moszumanska.debian.org