From 99b35439eb0f8367acf9f988b3e51ee38b15918c20e4fbd6c6c5b3b98eb1ec45 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Fri, 11 Oct 2013 19:23:21 +0000
Subject: [PATCH] Accepting request 203004 from home:sumski:branches:X11:XOrg

Update to version 2.4.47

OBS-URL: https://build.opensuse.org/request/show/203004
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libdrm?expand=0&rev=147
---
 U_radeon-pad-CS-to-8-DW.patch | 31 -------------------------------
 libdrm-2.4.46.tar.bz2         |  3 ---
 libdrm-2.4.47.tar.bz2         |  3 +++
 libdrm.changes                | 18 ++++++++++++++++++
 libdrm.spec                   |  6 +-----
 5 files changed, 22 insertions(+), 39 deletions(-)
 delete mode 100644 U_radeon-pad-CS-to-8-DW.patch
 delete mode 100644 libdrm-2.4.46.tar.bz2
 create mode 100644 libdrm-2.4.47.tar.bz2

diff --git a/U_radeon-pad-CS-to-8-DW.patch b/U_radeon-pad-CS-to-8-DW.patch
deleted file mode 100644
index 06317a3..0000000
--- a/U_radeon-pad-CS-to-8-DW.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 58d008883165ba35c83041fa9ed84937163d5f76 Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexander.deucher@amd.com>
-Date: Fri, 6 Sep 2013 15:58:56 -0400
-Subject: [PATCH 1/1] radeon: pad CS to 8 DW
-
-Aligns the IB to 8 DWs.  The aligns the IB to the
-CP fetch size.  r6xx also require at least 4 DW
-alignment to avoid a hw bug.
-
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
----
- radeon/radeon_cs_gem.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/radeon/radeon_cs_gem.c b/radeon/radeon_cs_gem.c
-index b963140..b87c6b1 100644
---- a/radeon/radeon_cs_gem.c
-+++ b/radeon/radeon_cs_gem.c
-@@ -425,6 +425,9 @@ static int cs_gem_emit(struct radeon_cs_int *cs)
-     unsigned i;
-     int r;
- 
-+    while (cs->cdw & 7)
-+	radeon_cs_write_dword((struct radeon_cs *)cs, 0x80000000);
-+
- #if CS_BOF_DUMP
-     cs_gem_dump_bof(cs);
- #endif
--- 
-1.8.4
-
diff --git a/libdrm-2.4.46.tar.bz2 b/libdrm-2.4.46.tar.bz2
deleted file mode 100644
index d607eea..0000000
--- a/libdrm-2.4.46.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:33cf320dad4e8060768714792e12643ddf6756a719d262ba7d60b39c2b2650f1
-size 554190
diff --git a/libdrm-2.4.47.tar.bz2 b/libdrm-2.4.47.tar.bz2
new file mode 100644
index 0000000..bc9e3bd
--- /dev/null
+++ b/libdrm-2.4.47.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c2dac2250adbcea23efb18fa8cf484c0f43c8ffbf5064ec82678bc410084f8e7
+size 552911
diff --git a/libdrm.changes b/libdrm.changes
index e4ae383..90d18eb 100644
--- a/libdrm.changes
+++ b/libdrm.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Fri Oct 11 17:42:15 UTC 2013 - hrvoje.senjan@gmail.com
+
+- Update to version 2.4.47:
+  + libdrm: add missing DRM_CAP_TIMESTAMP_MONOTONIC
+  + modetest fixes
+  + radeon: add berlin pci ids
+  + intel: Update package name and description in libdrm_intel.pc
+  + freedreno fixes
+  + radeon: Fix tiling mode index for 1D tiled depth/stencil 
+    surfaces on CIK
+  + radeon: fix pitch alignment for non-power-of-two mipmaps on SI
+  + drm: Synchronize the stereo 3D mode flags from the kernel headers
+  + drm: Sync the DRM_SET_CLIENT_CAP ioctl definition
+  + drm: Introduce a drmSetClientCap() wrapper
+  + intel: Set bo size from lseek if kernel supports it
+- Droped U_radeon-pad-CS-to-8-DW.patch, included in this release
+
 -------------------------------------------------------------------
 Tue Sep 17 17:49:28 UTC 2013 - hrvoje.senjan@gmail.com
 
diff --git a/libdrm.spec b/libdrm.spec
index d4333c6..6d0b3c1 100644
--- a/libdrm.spec
+++ b/libdrm.spec
@@ -18,7 +18,7 @@
 
 Name:           libdrm
 Url:            http://dri.freedesktop.org/
-Version:        2.4.46
+Version:        2.4.47
 Release:        0
 Provides:       libdrm23 = %{version}
 Obsoletes:      libdrm23 < %{version}
@@ -39,9 +39,6 @@ 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_radeon-pad-CS-to-8-DW.patch -- Aligns the IB to 8 DWs. r6xx also require at least 4 DW
-# alignment to avoid a hw bug.
-Patch3:         U_radeon-pad-CS-to-8-DW.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf >= 2.63
@@ -159,7 +156,6 @@ Group:          System/Libraries
 %setup -q
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"