From fbd1d9f2ca48549661dbf3ea222798036f8211c343d41d85a0d19a723d930e00 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 27 Nov 2013 13:06:17 +0000 Subject: [PATCH] Accepting request 208594 from home:sumski:sr Update to 2.4.49 + upstream crashfix OBS-URL: https://build.opensuse.org/request/show/208594 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libdrm?expand=0&rev=153 --- ...et-for-2D-1D-tiling-transition-on-SI.patch | 24 +++++++++++++++++++ libdrm-2.4.48.tar.bz2 | 3 --- libdrm-2.4.49.tar.bz2 | 3 +++ libdrm.changes | 13 ++++++++++ libdrm.spec | 6 ++++- 5 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 U_update-unaligned-offset-for-2D-1D-tiling-transition-on-SI.patch delete mode 100644 libdrm-2.4.48.tar.bz2 create mode 100644 libdrm-2.4.49.tar.bz2 diff --git a/U_update-unaligned-offset-for-2D-1D-tiling-transition-on-SI.patch b/U_update-unaligned-offset-for-2D-1D-tiling-transition-on-SI.patch new file mode 100644 index 0000000..fc955f2 --- /dev/null +++ b/U_update-unaligned-offset-for-2D-1D-tiling-transition-on-SI.patch @@ -0,0 +1,24 @@ +From c8a437f4c76527b3c8385699ccee07f35fe3f166 Mon Sep 17 00:00:00 2001 +From: Michel Dänzer +Date: Tue, 26 Nov 2013 09:16:03 +0000 +Subject: 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 +--- +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); + } +-- +cgit v0.9.0.2-2-gbebe diff --git a/libdrm-2.4.48.tar.bz2 b/libdrm-2.4.48.tar.bz2 deleted file mode 100644 index d3777b4..0000000 --- a/libdrm-2.4.48.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f9bb0bbed8f0ac69de3e7c935afe632274a2aa9f1341102b485b123e57a44c9e -size 558325 diff --git a/libdrm-2.4.49.tar.bz2 b/libdrm-2.4.49.tar.bz2 new file mode 100644 index 0000000..9a4e16f --- /dev/null +++ b/libdrm-2.4.49.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25d7d3fd30d8c350d3b87b3048f1c0cf0be295a40197a49acc374d4f4ae97a7d +size 563591 diff --git a/libdrm.changes b/libdrm.changes index 310f621..dff376f 100644 --- a/libdrm.changes +++ b/libdrm.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Nov 25 17:15:43 UTC 2013 - hrvoje.senjan@gmail.com + +- Update to version 2.4.49: + + intel: Use memset instead of VG_CLEAR + + radeon: implement 2D tiling for CIK + + radeon: handle P16 pipe configs for Hawaii + + radeon: fix mipmap level 0 and 1 alignment for SI and CIK + + radeon: don't overallocate stencil by 4 on SI and CIK + + libdrm/mode: Update the encoder and connector defines +- Added U_update-unaligned-offset-for-2D-1D-tiling-transition-on-SI.patch: + fdo#71983, resolves crasing on radeon SI chips wth 2.4.49 + ------------------------------------------------------------------- Sat Nov 16 18:43:00 UTC 2013 - hrvoje.senjan@gmail.com diff --git a/libdrm.spec b/libdrm.spec index a3a9300..5b8300e 100644 --- a/libdrm.spec +++ b/libdrm.spec @@ -18,7 +18,7 @@ Name: libdrm Url: http://dri.freedesktop.org/ -Version: 2.4.48 +Version: 2.4.49 Release: 0 Provides: libdrm23 = %{version} Obsoletes: libdrm23 < %{version} @@ -39,6 +39,9 @@ Source2: baselibs.conf # PATCH-FIX-UPSTREAM libdrm-implicit-defs.diff fdo#48599 -- Fix compiler warnings in tests/radeon/radeon_ttm.c Patch1: libdrm-implicit-defs.diff Patch2: u_Fix-compilation-on-systems-that-don-t-provide-O_CLOE.patch +# PATCH-FIX-UPSTREAM U_update-unaligned-offset-for-2D-1D-tiling-transition-on-SI.patch -- fdo#71983, resolves crasing on radeon +# SI chips wth 2.4.49 +Patch3: U_update-unaligned-offset-for-2D-1D-tiling-transition-on-SI.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf >= 2.63 @@ -156,6 +159,7 @@ Group: System/Libraries %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"