Author: airlied
Update of /cvs/pkgs/rpms/libdrm/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10167
Modified Files:
libdrm.spec
Added Files:
libdrm-radeon-eagain.patch
Log Message:
* Wed Dec 09 2009 Dave Airlie <airlied at redhat.com> 2.4.15-7
- radeon API from kernel change
libdrm-radeon-eagain.patch:
radeon_bo_gem.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
--- NEW FILE libdrm-radeon-eagain.patch ---
commit b84314a86ea4ad30e0f57a71b4ef0fa138fb24c6
Author: Jerome Glisse <jglisse at redhat.com>
Date: Mon Dec 7 18:30:52 2009 +0100
radeon: Use drmIoctl so we restart ioctl on EINTR or EAGAIN
This is needed as change in kernel will lead to ioctl returning
EINTR if they are interrupted.
Signed-off-by: Jerome Glisse <jglisse at redhat.com>
diff --git a/radeon/radeon_bo_gem.c b/radeon/radeon_bo_gem.c
index d34f24c..6ededcd 100644
--- a/libdrm/radeon/radeon_bo_gem.c
+++ b/libdrm/radeon/radeon_bo_gem.c
@@ -37,7 +37,6 @@
#include <stdlib.h>
#include <string.h>
#include <sys/mman.h>
-#include <sys/ioctl.h>
#include <errno.h>
#include "xf86drm.h"
#include "drm.h"
@@ -86,7 +85,7 @@ static struct radeon_bo *bo_open(struct radeon_bo_manager *bom,
memset(&open_arg, 0, sizeof(open_arg));
open_arg.name = handle;
- r = ioctl(bom->fd, DRM_IOCTL_GEM_OPEN, &open_arg);
+ r = drmIoctl(bom->fd, DRM_IOCTL_GEM_OPEN, &open_arg);
if (r != 0) {
free(bo);
return NULL;
@@ -142,7 +141,7 @@ static struct radeon_bo *bo_unref(struct radeon_bo *bo)
/* close object */
args.handle = bo->handle;
- ioctl(bo->bom->fd, DRM_IOCTL_GEM_CLOSE, &args);
+ drmIoctl(bo->bom->fd, DRM_IOCTL_GEM_CLOSE, &args);
memset(bo_gem, 0, sizeof(struct radeon_bo_gem));
free(bo_gem);
return NULL;
@@ -318,7 +317,7 @@ int radeon_gem_get_kernel_name(struct radeon_bo *bo, uint32_t *name)
int r;
flink.handle = bo->handle;
- r = ioctl(bo->bom->fd, DRM_IOCTL_GEM_FLINK, &flink);
+ r = drmIoctl(bo->bom->fd, DRM_IOCTL_GEM_FLINK, &flink);
if (r) {
return r;
}
Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/F-12/libdrm.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -p -r1.94 -r1.95
--- libdrm.spec 28 Nov 2009 06:40:37 -0000 1.94
+++ libdrm.spec 9 Dec 2009 04:39:21 -0000 1.95
@@ -3,7 +3,7 @@
Summary: Direct Rendering Manager runtime library
Name: libdrm
Version: 2.4.15
-Release: 6%{?dist}
+Release: 7%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://dri.sourceforge.net
@@ -42,6 +42,7 @@ Patch9: libdrm-radeon-fix-alloc.patch
Patch10: libdrm-radeon-add-referenced-by-cs.patch
# add api for intel/radeon dri2 drivers.
Patch11: libdrm-add-drm-gdnff.patch
+Patch12: libdrm-radeon-eagain.patch
%description
Direct Rendering Manager runtime library
@@ -68,6 +69,7 @@ Direct Rendering Manager development pac
%patch9 -p1 -b .radeon-alloc
%patch10 -p1 -b .radeon-ref-by-cs
%patch11 -p1 -b .drmapi
+%patch12 -p1 -b .rad-eagain
%build
autoreconf -v --install || exit 1
@@ -127,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/libdrm_nouveau.pc
%changelog
+* Wed Dec 09 2009 Dave Airlie <airlied at redhat.com> 2.4.15-7
+- radeon API from kernel change
+
* Sat Nov 28 2009 Dave Airlie <airlied at redhat.com> 2.4.15-6
- add new upstream API for drivers.