Module Name: src
Committed By: riastradh
Date: Sun Dec 19 10:24:52 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_getparam.c
src/sys/external/bsd/drm2/dist/drm/i915/gem: i915_gem_mman.c
Log Message:
Restore mmap ioctl version ABI hack that was lost in merge.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_getparam.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_getparam.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_getparam.c:1.2 src/sys/external/bsd/drm2/dist/drm/i915/i915_getparam.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_getparam.c:1.2 Sat Dec 18 23:45:28 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_getparam.c Sun Dec 19 10:24:52 2021
@@ -1,11 +1,11 @@
-/* $NetBSD: i915_getparam.c,v 1.2 2021/12/18 23:45:28 riastradh Exp $ */
+/* $NetBSD: i915_getparam.c,v 1.3 2021/12/19 10:24:52 riastradh Exp $ */
/*
* SPDX-License-Identifier: MIT
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_getparam.c,v 1.2 2021/12/18 23:45:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_getparam.c,v 1.3 2021/12/19 10:24:52 riastradh Exp $");
#include "gem/i915_gem_mman.h"
#include "gt/intel_engine_user.h"
@@ -116,6 +116,9 @@ int i915_getparam_ioctl(struct drm_devic
break;
case I915_PARAM_MMAP_VERSION:
+#ifdef __NetBSD__
+ dev_priv->quirks |= QUIRK_NETBSD_VERSION_CALLED;
+#endif
/* Remember to bump this if the version changes! */
case I915_PARAM_HAS_GEM:
case I915_PARAM_HAS_PAGEFLIPPING:
Index: src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c:1.2 src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c:1.2 Sat Dec 18 23:45:30 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c Sun Dec 19 10:24:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_mman.c,v 1.2 2021/12/18 23:45:30 riastradh Exp $ */
+/* $NetBSD: i915_gem_mman.c,v 1.3 2021/12/19 10:24:52 riastradh Exp $ */
/*
* SPDX-License-Identifier: MIT
@@ -7,7 +7,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_mman.c,v 1.2 2021/12/18 23:45:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_mman.c,v 1.3 2021/12/19 10:24:52 riastradh Exp $");
#include <linux/anon_inodes.h>
#include <linux/mman.h>
@@ -75,6 +75,12 @@ i915_gem_mmap_ioctl(struct drm_device *d
if (!obj)
return -ENOENT;
+#ifdef __NetBSD__
+ struct drm_i915_private *i915 = to_i915(obj->base.dev);
+ if (dev->quirks & QUIRK_NETBSD_VERSION_CALLED)
+ args->flags = 0;
+#endif
+
/* prime objects have no backing filp to GEM mmap
* pages from.
*/
