Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:56:52 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_drv.c
src/sys/external/bsd/drm2/dist/drm/i915/gem: i915_gem_mman.c
i915_gem_mman.h
Log Message:
i915: Define i915_gem_uvm_ops.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c \
src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.h
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_drv.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.42 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.43
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.42 Sun Dec 19 11:54:10 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c Sun Dec 19 11:56:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_drv.c,v 1.42 2021/12/19 11:54:10 riastradh Exp $ */
+/* $NetBSD: i915_drv.c,v 1.43 2021/12/19 11:56:52 riastradh Exp $ */
/* i915_drv.c -- i830,i845,i855,i865,i915 driver -*- linux-c -*-
*/
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.42 2021/12/19 11:54:10 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.43 2021/12/19 11:56:52 riastradh Exp $");
#include <linux/acpi.h>
#include <linux/device.h>
@@ -2875,7 +2875,7 @@ static struct drm_driver driver = {
.free_irq = drm_pci_free_irq,
.mmap_object = &i915_gem_mmap_object,
- .gem_uvm_ops = NULL,
+ .gem_uvm_ops = &i915_gem_uvm_ops,
#endif
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.7 src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c:1.8
--- src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c:1.7 Sun Dec 19 11:33:30 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c Sun Dec 19 11:56:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_mman.c,v 1.7 2021/12/19 11:33:30 riastradh Exp $ */
+/* $NetBSD: i915_gem_mman.c,v 1.8 2021/12/19 11:56: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.7 2021/12/19 11:33:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_mman.c,v 1.8 2021/12/19 11:56:52 riastradh Exp $");
#include <linux/anon_inodes.h>
#include <linux/mman.h>
@@ -833,6 +833,12 @@ i915_gem_mmap_offset_ioctl(struct drm_de
#ifdef __NetBSD__
+const struct uvm_pagerops i915_gem_uvm_ops = {
+ .pgo_reference = drm_gem_pager_reference,
+ .pgo_detach = drm_gem_pager_detach,
+ .pgo_fault = i915_gem_fault,
+};
+
int
i915_gem_mmap_object(struct drm_device *dev, off_t byte_offset, size_t nbytes,
int prot, struct uvm_object **uobjp, voff_t *uoffsetp, struct file *fp)
Index: src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.h:1.7 src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.h:1.8
--- src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.h:1.7 Sun Dec 19 11:50:17 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.h Sun Dec 19 11:56:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_mman.h,v 1.7 2021/12/19 11:50:17 riastradh Exp $ */
+/* $NetBSD: i915_gem_mman.h,v 1.8 2021/12/19 11:56:52 riastradh Exp $ */
/*
* SPDX-License-Identifier: MIT
@@ -21,7 +21,7 @@ struct mutex;
int i915_gem_mmap_gtt_version(void);
#ifdef __NetBSD__
-extern const struct uvm_pagerops *const i915_gem_uvm_ops;
+extern const struct uvm_pagerops i915_gem_uvm_ops;
int i915_gem_mmap_object(struct drm_device *, off_t, size_t, int,
struct uvm_object **, voff_t *, struct file *);
#else
