[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 i915: Define i915_gem_uv...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6391be6da958
branches:  trunk
changeset: 1028753:6391be6da958
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:56:52 2021 +0000

description:
i915: Define i915_gem_uvm_ops.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c |  10 ++++++++--
 sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.h |   4 ++--
 sys/external/bsd/drm2/dist/drm/i915/i915_drv.c          |   6 +++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diffs (76 lines):

diff -r a6f0cc2be25a -r 6391be6da958 sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c
--- a/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c   Sun Dec 19 11:56:38 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c   Sun Dec 19 11:56:52 2021 +0000
@@ -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 @@
 
 #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)
diff -r a6f0cc2be25a -r 6391be6da958 sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.h
--- a/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.h   Sun Dec 19 11:56:38 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.h   Sun Dec 19 11:56:52 2021 +0000
@@ -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 @@
 
 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
diff -r a6f0cc2be25a -r 6391be6da958 sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Sun Dec 19 11:56:38 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Sun Dec 19 11:56:52 2021 +0000
@@ -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 @@
        .free_irq = drm_pci_free_irq,
 
        .mmap_object = &i915_gem_mmap_object,
-       .gem_uvm_ops = NULL,
+       .gem_uvm_ops = &i915_gem_uvm_ops,
 #endif