debian/changelog | 6 +++++ debian/patches/xmir.patch | 50 +++++++++++++++++++++++----------------------- 2 files changed, 32 insertions(+), 24 deletions(-)
New commits: commit 8672ed63dcd915ca91c5137906bc479f4ca8e0cd Author: Christopher James Halse Rogers <r...@ubuntu.com> Date: Thu Aug 15 10:32:02 2013 +1000 Add 1D tiling support in XMir patch. Fixes display corruption on systems which... use 1D tiling ☺ diff --git a/debian/changelog b/debian/changelog index 3fb33b0..896c006 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-video-ati (1:7.2.0-0ubuntu3) saucy; urgency=low + + * xmir.patch: Also support 1D tiling. (LP: #1195425) + + -- Christopher James Halse Rogers <r...@ubuntu.com> Thu, 15 Aug 2013 10:31:16 +1000 + xserver-xorg-video-ati (1:7.2.0-0ubuntu2) saucy; urgency=low * Fold in build fixes for non-XMir xservers accidentally dropped in last diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch index 30f7680..8e81f76 100644 --- a/debian/patches/xmir.patch +++ b/debian/patches/xmir.patch @@ -8,9 +8,9 @@ Date: Mon Jul 22 17:02:17 2013 +1000 Index: xf86-video-ati/src/drmmode_display.c =================================================================== ---- xf86-video-ati.orig/src/drmmode_display.c 2013-08-06 12:20:08.282997173 +1000 -+++ xf86-video-ati/src/drmmode_display.c 2013-08-06 12:20:08.270997173 +1000 -@@ -1887,7 +1887,7 @@ +--- xf86-video-ati.orig/src/drmmode_display.c 2013-08-15 09:44:05.626352176 +1000 ++++ xf86-video-ati/src/drmmode_display.c 2013-08-15 09:44:05.622352176 +1000 +@@ -1941,7 +1941,7 @@ if (!miCreateDefColormap(pScreen)) return FALSE; /* all radeons support 10 bit CLUTs */ @@ -21,8 +21,8 @@ Index: xf86-video-ati/src/drmmode_display.c #if 0 /* This option messes up text mode! (e...@suse.de) */ Index: xf86-video-ati/src/radeon.h =================================================================== ---- xf86-video-ati.orig/src/radeon.h 2013-08-06 12:20:08.282997173 +1000 -+++ xf86-video-ati/src/radeon.h 2013-08-06 12:20:08.270997173 +1000 +--- xf86-video-ati.orig/src/radeon.h 2013-08-15 09:44:05.626352176 +1000 ++++ xf86-video-ati/src/radeon.h 2013-08-15 09:44:05.622352176 +1000 @@ -87,6 +87,14 @@ #include "picturestr.h" #endif @@ -53,8 +53,8 @@ Index: xf86-video-ati/src/radeon.h /* radeon_accel.c */ Index: xf86-video-ati/src/radeon_bo_helper.c =================================================================== ---- xf86-video-ati.orig/src/radeon_bo_helper.c 2013-08-06 12:20:08.282997173 +1000 -+++ xf86-video-ati/src/radeon_bo_helper.c 2013-08-06 12:20:08.270997173 +1000 +--- xf86-video-ati.orig/src/radeon_bo_helper.c 2013-08-15 09:44:05.626352176 +1000 ++++ xf86-video-ati/src/radeon_bo_helper.c 2013-08-15 10:00:04.206385137 +1000 @@ -201,19 +201,25 @@ } @@ -84,7 +84,7 @@ Index: xf86-video-ati/src/radeon_bo_helper.c if (info->ChipFamily >= CHIP_FAMILY_R600 && info->surf_man) { -@@ -229,7 +235,12 @@ +@@ -229,7 +235,14 @@ /* we are requiring a recent enough libdrm version */ surface->flags |= RADEON_SURF_HAS_TILE_MODE_INDEX; surface->flags |= RADEON_SURF_SET(RADEON_SURF_TYPE_2D, TYPE); @@ -92,19 +92,21 @@ Index: xf86-video-ati/src/radeon_bo_helper.c + + if (*tiling_flags & RADEON_TILING_MACRO) + surface->flags |= RADEON_SURF_SET(RADEON_SURF_MODE_2D, MODE); ++ else if (*tiling_flags & RADEON_TILING_MICRO) ++ surface->flags |= RADEON_SURF_SET(RADEON_SURF_MODE_1D, MODE); + else + surface->flags |= RADEON_SURF_SET(RADEON_SURF_MODE_LINEAR, MODE); + if (radeon_surface_best(info->surf_man, surface)) { return FALSE; } -@@ -238,8 +249,11 @@ +@@ -238,8 +251,11 @@ } /* we have to post hack the surface to reflect the actual size of the shared pixmap */ - surface->level[0].pitch_bytes = ppix->devKind; - surface->level[0].nblk_x = ppix->devKind / surface->bpe; -+ if (*tiling_flags & RADEON_TILING_MACRO) ++ if (*tiling_flags & (RADEON_TILING_MACRO | RADEON_TILING_MICRO)) + surface->level[0].pitch_bytes = *pitch; + else + surface->level[0].pitch_bytes = *pitch = ppix->devKind; @@ -114,8 +116,8 @@ Index: xf86-video-ati/src/radeon_bo_helper.c Index: xf86-video-ati/src/radeon_bo_helper.h =================================================================== ---- xf86-video-ati.orig/src/radeon_bo_helper.h 2013-08-06 12:20:08.282997173 +1000 -+++ xf86-video-ati/src/radeon_bo_helper.h 2013-08-06 12:20:08.270997173 +1000 +--- xf86-video-ati.orig/src/radeon_bo_helper.h 2013-08-15 09:44:05.626352176 +1000 ++++ xf86-video-ati/src/radeon_bo_helper.h 2013-08-15 09:44:05.622352176 +1000 @@ -33,6 +33,7 @@ extern Bool @@ -127,8 +129,8 @@ Index: xf86-video-ati/src/radeon_bo_helper.h #endif /* RADEON_BO_HELPER_H */ Index: xf86-video-ati/src/radeon_dri2.c =================================================================== ---- xf86-video-ati.orig/src/radeon_dri2.c 2013-08-06 12:20:08.282997173 +1000 -+++ xf86-video-ati/src/radeon_dri2.c 2013-08-06 12:20:08.270997173 +1000 +--- xf86-video-ati.orig/src/radeon_dri2.c 2013-08-15 09:44:05.626352176 +1000 ++++ xf86-video-ati/src/radeon_dri2.c 2013-08-15 09:44:05.622352176 +1000 @@ -1535,6 +1535,18 @@ #endif /* USE_DRI2_SCHEDULING */ @@ -171,8 +173,8 @@ Index: xf86-video-ati/src/radeon_dri2.c dri2_info.CreateBuffer2 = radeon_dri2_create_buffer2; Index: xf86-video-ati/src/radeon_exa.c =================================================================== ---- xf86-video-ati.orig/src/radeon_exa.c 2013-08-06 12:20:08.282997173 +1000 -+++ xf86-video-ati/src/radeon_exa.c 2013-08-06 12:20:08.274997173 +1000 +--- xf86-video-ati.orig/src/radeon_exa.c 2013-08-15 09:44:05.626352176 +1000 ++++ xf86-video-ati/src/radeon_exa.c 2013-08-15 09:44:05.622352176 +1000 @@ -326,12 +326,12 @@ Bool RADEONEXASetSharedPixmapBacking(PixmapPtr ppix, void *fd_handle) { @@ -190,8 +192,8 @@ Index: xf86-video-ati/src/radeon_exa.c #endif Index: xf86-video-ati/src/radeon_glamor.c =================================================================== ---- xf86-video-ati.orig/src/radeon_glamor.c 2013-08-06 12:20:08.282997173 +1000 -+++ xf86-video-ati/src/radeon_glamor.c 2013-08-06 12:20:08.274997173 +1000 +--- xf86-video-ati.orig/src/radeon_glamor.c 2013-08-15 09:44:05.626352176 +1000 ++++ xf86-video-ati/src/radeon_glamor.c 2013-08-15 09:44:05.622352176 +1000 @@ -277,14 +277,15 @@ ScrnInfoPtr scrn = xf86ScreenToScrn(screen); struct radeon_surface surface; @@ -213,8 +215,8 @@ Index: xf86-video-ati/src/radeon_glamor.c xf86DrvMsg(scrn->scrnIndex, X_ERROR, Index: xf86-video-ati/src/radeon_kms.c =================================================================== ---- xf86-video-ati.orig/src/radeon_kms.c 2013-08-06 12:20:08.282997173 +1000 -+++ xf86-video-ati/src/radeon_kms.c 2013-08-06 12:27:33.602977722 +1000 +--- xf86-video-ati.orig/src/radeon_kms.c 2013-08-15 09:44:05.626352176 +1000 ++++ xf86-video-ati/src/radeon_kms.c 2013-08-15 09:44:05.626352176 +1000 @@ -220,7 +220,11 @@ return FALSE; pScreen->CreateScreenResources = RADEONCreateScreenResources_KMS; @@ -501,8 +503,8 @@ Index: xf86-video-ati/src/radeon_kms.c int c; Index: xf86-video-ati/src/radeon_probe.c =================================================================== ---- xf86-video-ati.orig/src/radeon_probe.c 2013-08-06 12:20:08.282997173 +1000 -+++ xf86-video-ati/src/radeon_probe.c 2013-08-06 12:20:08.274997173 +1000 +--- xf86-video-ati.orig/src/radeon_probe.c 2013-08-15 09:44:05.626352176 +1000 ++++ xf86-video-ati/src/radeon_probe.c 2013-08-15 09:44:05.626352176 +1000 @@ -40,6 +40,7 @@ * KMS support - Dave Airlie <airl...@redhat.com> */ @@ -609,8 +611,8 @@ Index: xf86-video-ati/src/radeon_probe.c Index: xf86-video-ati/src/radeon_video.c =================================================================== ---- xf86-video-ati.orig/src/radeon_video.c 2013-08-06 12:20:08.282997173 +1000 -+++ xf86-video-ati/src/radeon_video.c 2013-08-06 12:20:08.274997173 +1000 +--- xf86-video-ati.orig/src/radeon_video.c 2013-08-15 09:44:05.626352176 +1000 ++++ xf86-video-ati/src/radeon_video.c 2013-08-15 09:44:05.626352176 +1000 @@ -70,7 +70,10 @@ Bool radeon_crtc_is_enabled(xf86CrtcPtr crtc) { -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1v9lcx-0008lk...@vasks.debian.org