Attachment #225476 for bug #256354

View | Details | Raw Unified | Return to bug 256354
Collapse All | Expand All

Lines 3-8 Link Here

(-)b/x11-drivers/xf86-video-intel/Makefile (+1 lines)
3	PORTNAME= xf86-video-intel	3	PORTNAME= xf86-video-intel
4	DISTVERSION= 2.99.917-916	4	DISTVERSION= 2.99.917-916
5	DISTVERSIONSUFFIX= -g${GL_COMMIT:C/(.{12}).*/\1/}	5	DISTVERSIONSUFFIX= -g${GL_COMMIT:C/(.{12}).*/\1/}
		6	PORTREVISION= 1
6	PORTEPOCH= 1	7	PORTEPOCH= 1
7	CATEGORIES= x11-drivers	8	CATEGORIES= x11-drivers
8		9




--- src/sna/kgem.c.orig	2021-01-15 20:59:05 UTC
+++ src/sna/kgem.c
@@ -1189,13 +1189,18 @@ static int gem_param(struct kgem *kgem, int name)
 static bool test_has_execbuffer2(struct kgem *kgem)
 {
 	struct drm_i915_gem_execbuffer2 execbuf;
+	int ret;
 
 	memset(&execbuf, 0, sizeof(execbuf));
 	execbuf.buffer_count = 1;
 
-	return do_ioctl(kgem->fd,
-			 DRM_IOCTL_I915_GEM_EXECBUFFER2,
-			 &execbuf) == -EFAULT;
+	ret = do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, &execbuf);
+#ifdef __FreeBSD__
+	/* XXX FreeBSD returns ENOENT instead of EFAULT. */
+	if (ret == -ENOENT)
+		return true;
+#endif
+	return ret == -EFAULT;
 }
 
 static bool test_has_no_reloc(struct kgem *kgem)

Return to bug 256354

Added Link Here

(-)b/x11-drivers/xf86-video-intel/files/patch-src_sna_kgem.c (+24 lines)
1	--- src/sna/kgem.c.orig 2021-01-15 20:59:05 UTC
2	+++ src/sna/kgem.c
3	@@ -1189,13 +1189,18 @@ static int gem_param(struct kgem *kgem, int name)
4	static bool test_has_execbuffer2(struct kgem *kgem)
5	{
6	struct drm_i915_gem_execbuffer2 execbuf;
7	+ int ret;
8
9	memset(&execbuf, 0, sizeof(execbuf));
10	execbuf.buffer_count = 1;
11
12	- return do_ioctl(kgem->fd,
13	- DRM_IOCTL_I915_GEM_EXECBUFFER2,
14	- &execbuf) == -EFAULT;
15	+ ret = do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_EXECBUFFER2, &execbuf);
16	+#ifdef __FreeBSD__
17	+ /* XXX FreeBSD returns ENOENT instead of EFAULT. */
18	+ if (ret == -ENOENT)
19	+ return true;
20	+#endif
21	+ return ret == -EFAULT;
22	}
23
24	static bool test_has_no_reloc(struct kgem *kgem)