Attachment #187401 for bug #221540

Lines 1-4 Link Here

(-)b/graphics/mesa-dri/files/patch-src_intel_vulkan_anv__gem.c (+21 lines)
1	- Define ETIME if missing	1	- Define ETIME if missing
		2	- Try harder to allocate userptr, see
		3	https://github.com/FreeBSDDesktop/freebsd-base-graphics/issues/132
2		4
3	--- src/intel/vulkan/anv_gem.c.orig 2017-10-23 13:21:18 UTC	5	--- src/intel/vulkan/anv_gem.c.orig 2017-10-23 13:21:18 UTC
4	+++ src/intel/vulkan/anv_gem.c	6	+++ src/intel/vulkan/anv_gem.c
Lines 12-14 Link Here
12	#include <unistd.h>	14	#include <unistd.h>
13	#include <fcntl.h>	15	#include <fcntl.h>
14		16
		17	@@ -114,9 +114,16 @@ anv_gem_userptr(struct anv_device device, void mem,
		18	.flags = 0,
		19	};
		20
		21	- int ret = anv_ioctl(device->fd, DRM_IOCTL_I915_GEM_USERPTR, &userptr);
		22	- if (ret == -1)
		23	+ int ret;
		24	+retry:
		25	+ ret = anv_ioctl(device->fd, DRM_IOCTL_I915_GEM_USERPTR, &userptr);
		26	+ if (ret == -1) {
		27	+ if (errno == ENODEV && userptr.flags == 0) {
		28	+ userptr.flags = I915_USERPTR_UNSYNCHRONIZED;
		29	+ goto retry;
		30	+ }
		31	return 0;
		32	+ }
		33
		34	return userptr.handle;
		35	}




- Define ETIME if missing
- Drop header that was never used
- Work around early timeouts with I915_USERPTR_UNSYNCHRONIZED

--- src/intel/vulkan/anv_queue.c.orig	2017-10-23 13:21:18 UTC
+++ src/intel/vulkan/anv_queue.c

 
 #include "anv_private.h"
 #include "vk_util.h"
@@ -102,7 +102,7 @@ anv_device_submit_simple_batch(struct anv_device *devi
    if (result != VK_SUCCESS)
       goto fail;
 
-   result = anv_device_wait(device, &bo, INT64_MAX);
+   result = anv_device_wait(device, &bo, INT32_MAX);
 
  fail:
    anv_bo_pool_free(&device->batch_bo_pool, &bo);

Return to bug 221540