diff options
| author |   Rémi Cardona <remi@gentoo.org> | 2008-11-12 08:18:22 +0000 |
|---|---|---|
| committer | Rémi Cardona <remi@gentoo.org> | 2008-11-12 08:18:22 +0000 |
| commit | eb7338e4ab1c0a09084f04944510e1d20f93931e (patch) | |
| tree | 0eb945ed223a65ea64c5754fada14dbd9a13dada /x11-libs/libdrm/files | |
| parent | Marked ~hppa (bug #239847). (diff) | |
| download | gentoo-2-eb7338e4ab1c0a09084f04944510e1d20f93931e.tar.gz gentoo-2-eb7338e4ab1c0a09084f04944510e1d20f93931e.tar.bz2 gentoo-2-eb7338e4ab1c0a09084f04944510e1d20f93931e.zip | |
x11-libs/libdrm: bump to 2.4.1 with a patch from git master
(Portage version: 2.2_rc14/cvs/Linux 2.6.26-gentoo-r1 i686)
Diffstat (limited to 'x11-libs/libdrm/files')
| -rw-r--r-- | x11-libs/libdrm/files/2.4.1-intel-Restart-on-interrupt-of-bo_wait_rendering-ins.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/x11-libs/libdrm/files/2.4.1-intel-Restart-on-interrupt-of-bo_wait_rendering-ins.patch b/x11-libs/libdrm/files/2.4.1-intel-Restart-on-interrupt-of-bo_wait_rendering-ins.patch new file mode 100644 index 000000000000..d333fbed079f --- /dev/null +++ b/x11-libs/libdrm/files/2.4.1-intel-Restart-on-interrupt-of-bo_wait_rendering-ins.patch @@ -0,0 +1,27 @@ +From 930c0e7cf4f4776f7a69e7acc6fedeed7addb235 Mon Sep 17 00:00:00 2001 +From: Eric Anholt <eric@anholt.net> +Date: Fri, 7 Nov 2008 12:58:52 -0800 +Subject: [PATCH 2/2] intel: Restart on interrupt of bo_wait_rendering instead of complaining. + +--- + libdrm/intel/intel_bufmgr_gem.c | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/libdrm/intel/intel_bufmgr_gem.c b/libdrm/intel/intel_bufmgr_gem.c +index 5eaf5f5..9cb3359 100644 +--- a/libdrm/intel/intel_bufmgr_gem.c ++++ b/libdrm/intel/intel_bufmgr_gem.c +@@ -658,7 +658,9 @@ drm_intel_gem_bo_wait_rendering(drm_intel_bo *bo) + set_domain.handle = bo_gem->gem_handle; + set_domain.read_domains = I915_GEM_DOMAIN_GTT; + set_domain.write_domain = 0; +- ret = ioctl (bufmgr_gem->fd, DRM_IOCTL_I915_GEM_SET_DOMAIN, &set_domain); ++ do { ++ ret = ioctl(bufmgr_gem->fd, DRM_IOCTL_I915_GEM_SET_DOMAIN, &set_domain); ++ } while (ret == -1 && errno == EINTR); + if (ret != 0) { + fprintf (stderr, "%s:%d: Error setting memory domains %d (%08x %08x): %s .\n", + __FILE__, __LINE__, +-- +1.6.0.3 + |