Accepting request 208677 from X11:XOrg

Update to 2.4.49 + upstream crashfix (forwarded request 208594 from sumski)

OBS-URL: https://build.opensuse.org/request/show/208677
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libdrm?expand=0&rev=88

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 <michel.daenzer@amd.com>
+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 <arek.rusi@gmail.com>
+---
+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

libdrm-2.4.48.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f9bb0bbed8f0ac69de3e7c935afe632274a2aa9f1341102b485b123e57a44c9e
-size 558325

libdrm-2.4.49.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:25d7d3fd30d8c350d3b87b3048f1c0cf0be295a40197a49acc374d4f4ae97a7d
+size 563591

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
 

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"