xf86-video-intel: Branch 'drm-gem' - src/i830_batchbuffer.c

[Eric Anholt]

 src/i830_batchbuffer.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit d775ddc64dc8349b8ef9e85b0be9e93cb1997fea
Author: Eric Anholt <eric at anholt.net>
Date:   Fri Jun 13 10:03:24 2008 -0700

    [gem] Catch -EINTR from blocking GEM ioctl and restart.

diff --git a/src/i830_batchbuffer.c b/src/i830_batchbuffer.c
index 2f53d2f..07ea082 100644
--- a/src/i830_batchbuffer.c
+++ b/src/i830_batchbuffer.c
@@ -111,8 +111,10 @@ intel_batch_flush(ScrnInfoPtr pScrn)
 	exec->DR1 = 0;
 	exec->DR4 = 0xffffffff;
 
-	ret = drmCommandWriteRead(pI830->drmSubFD, DRM_I915_GEM_EXECBUFFER,
-				  exec, sizeof(*exec));
+	do {
+	    ret = drmCommandWriteRead(pI830->drmSubFD, DRM_I915_GEM_EXECBUFFER,
+				      exec, sizeof(*exec));
+	} while (ret == -EINTR);
 	if (ret != 0)
 	    FatalError("Failed to submit batchbuffer: %s\n", strerror(errno));
     } else {