Module Name: src Committed By: riastradh Date: Mon May 20 11:34:45 UTC 2024
Modified Files: src/sys/external/bsd/drm2/dist/drm/i915/gem: i915_gem_dmabuf.c Log Message: i915: Fix dmabuf mmap object. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_dmabuf.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_dmabuf.c diff -u src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_dmabuf.c:1.6 src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_dmabuf.c:1.7 --- src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_dmabuf.c:1.6 Sun Dec 19 11:33:30 2021 +++ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_dmabuf.c Mon May 20 11:34:45 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: i915_gem_dmabuf.c,v 1.6 2021/12/19 11:33:30 riastradh Exp $ */ +/* $NetBSD: i915_gem_dmabuf.c,v 1.7 2024/05/20 11:34:45 riastradh Exp $ */ /* * SPDX-License-Identifier: MIT @@ -7,7 +7,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: i915_gem_dmabuf.c,v 1.6 2021/12/19 11:33:30 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: i915_gem_dmabuf.c,v 1.7 2024/05/20 11:34:45 riastradh Exp $"); #include <linux/dma-buf.h> #include <linux/highmem.h> @@ -126,10 +126,9 @@ static int i915_gem_dmabuf_mmap(struct d return -EINVAL; if (!obj->base.filp) return -ENODEV; - /* XXX review mmap refcount */ - drm_gem_object_get(&obj->base); + uao_reference(obj->base.filp); *advicep = UVM_ADV_RANDOM; - *uobjp = &obj->base.gemo_uvmobj; + *uobjp = obj->base.filp; *maxprotp = prot; #else if (obj->base.size < vma->vm_end - vma->vm_start)