libdrm: Changes to 'debian-unstable'
ChangeLog | 10 ++++++++++
debian/changelog | 8 ++++++++
radeon/radeon_surface.c | 2 +-
3 files changed, 19 insertions(+), 1 deletion(-)
New commits:
commit 12d21e30df0b497466ed1ac35ba4bc86bfe4a1c3
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Tue Nov 26 15:26:06 2013 +0100
release to unstable
diff --git a/debian/changelog b/debian/changelog
index 41875e4..46db1b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libdrm (2.4.49-2) UNRELEASED; urgency=low
+libdrm (2.4.49-2) unstable; urgency=low
* Cherry-pick a commit from upstream to fix a radeonsi regression.
- c8a437f4c76: radeon: Update unaligned offset for 2D->1D tiling
transition on SI
- -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Tue, 26 Nov 2013 15:20:22 +0100
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Tue, 26 Nov 2013 15:25:45 +0100
libdrm (2.4.49-1) unstable; urgency=low
commit 76b99fc1966ecaca4bb1a1f3939c58440481b8da
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Tue Nov 26 15:24:20 2013 +0100
Add changelog entry.
diff --git a/ChangeLog b/ChangeLog
index 763bfac..dbac022 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+commit c8a437f4c76527b3c8385699ccee07f35fe3f166
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date: Tue Nov 26 18:16:03 2013 +0900
+
+ radeon: Update unaligned offset for 2D->1D tiling transition on SI
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71983
+
+ Tested-by: Arek Ruśniak <arek.rusi@gmail.com>
+
commit 7ddc98f92f92560e2b52287ae8cf816ca4a057de
Author: Marek Olšák <marek.olsak@amd.com>
Date: Sat Nov 23 01:27:57 2013 +0100
diff --git a/debian/changelog b/debian/changelog
index 5521f67..41875e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libdrm (2.4.49-2) UNRELEASED; urgency=low
+
+ * Cherry-pick a commit from upstream to fix a radeonsi regression.
+ - c8a437f4c76: radeon: Update unaligned offset for 2D->1D tiling
+ transition on SI
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Tue, 26 Nov 2013 15:20:22 +0100
+
libdrm (2.4.49-1) unstable; urgency=low
* New upstream release.
commit c707ca1bf6603d67ea0903c8392e792cbc918a7d
Author: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue Nov 26 18:16:03 2013 +0900
radeon: Update unaligned offset for 2D->1D tiling transition on SI
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71983
Tested-by: Arek Ruśniak <arek.rusi@gmail.com>
(cherry picked from commit c8a437f4c76527b3c8385699ccee07f35fe3f166)
diff --git a/radeon/radeon_surface.c b/radeon/radeon_surface.c
index b528a48..dcbbfdc 100644
--- a/radeon/radeon_surface.c
+++ b/radeon/radeon_surface.c
@@ -1667,7 +1667,7 @@ static int si_surface_init_2d(struct radeon_surface_manager *surf_man,
return si_surface_init_1d(surf_man, surf, level, bpe, tile_mode, offset, i);
}
/* level0 and first mipmap need to have alignment */
- aligned_offset = surf->bo_size;
+ aligned_offset = offset = surf->bo_size;
if ((i == 0)) {
aligned_offset = ALIGN(aligned_offset, surf->bo_alignment);
}
Reply to: