Module Name: src Committed By: riastradh Date: Sun Jan 26 20:49:22 UTC 2025
Modified Files: src/sys/external/bsd/drm2/dist/drm/i915/gem: i915_gem_mman.c Log Message: i915: Fix sense of conditional for i915_gem_mmap_ioctl ABI hack. Original issue and fix described here: https://mail-index.netbsd.org/source-changes/2018/08/27/msg098501.html This was broken in the merge in 2021, and I tried to restore it but got the sense of the conditional wrong: https://mail-index.netbsd.org/source-changes/2021/12/19/msg135215.html To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 \ 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/gem/i915_gem_mman.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c:1.27 src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c:1.28 --- src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c:1.27 Sun Jun 23 19:37:11 2024 +++ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c Sun Jan 26 20:49:22 2025 @@ -1,4 +1,4 @@ -/* $NetBSD: i915_gem_mman.c,v 1.27 2024/06/23 19:37:11 riastradh Exp $ */ +/* $NetBSD: i915_gem_mman.c,v 1.28 2025/01/26 20:49:22 riastradh Exp $ */ /* * SPDX-License-Identifier: MIT @@ -7,7 +7,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i915_gem_mman.c,v 1.27 2024/06/23 19:37:11 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i915_gem_mman.c,v 1.28 2025/01/26 20:49:22 riastradh Exp $"); #include <linux/anon_inodes.h> #include <linux/mman.h> @@ -83,7 +83,7 @@ i915_gem_mmap_ioctl(struct drm_device *d #ifdef __NetBSD__ struct drm_i915_private *i915 = to_i915(obj->base.dev); - if (i915->quirks & QUIRK_NETBSD_VERSION_CALLED) + if ((i915->quirks & QUIRK_NETBSD_VERSION_CALLED) == 0) args->flags = 0; #endif