[src/trunk]: src/sys/external/bsd/drm2/i915drm i915: Touch up local i915_sw_f...

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

details:   https://anonhg.NetBSD.org/src/rev/23ea39f95b23
branches:  trunk
changeset: 1028562:23ea39f95b23
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:19:55 2021 +0000

description:
i915: Touch up local i915_sw_fence stubs to make it compile.

diffstat:

 sys/external/bsd/drm2/i915drm/files.i915drmkms |   4 ++--
 sys/external/bsd/drm2/i915drm/i915_sw_fence.h  |  11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diffs (58 lines):

diff -r dd0d9fc041d9 -r 23ea39f95b23 sys/external/bsd/drm2/i915drm/files.i915drmkms
--- a/sys/external/bsd/drm2/i915drm/files.i915drmkms    Sun Dec 19 11:19:47 2021 +0000
+++ b/sys/external/bsd/drm2/i915drm/files.i915drmkms    Sun Dec 19 11:19:55 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.i915drmkms,v 1.64 2021/12/19 11:19:47 riastradh Exp $
+#      $NetBSD: files.i915drmkms,v 1.65 2021/12/19 11:19:55 riastradh Exp $
 
 version        20180827
 
@@ -203,7 +203,7 @@
 file   external/bsd/drm2/dist/drm/i915/i915_scatterlist.c      i915drmkms
 file   external/bsd/drm2/dist/drm/i915/i915_scheduler.c        i915drmkms
 file   external/bsd/drm2/dist/drm/i915/i915_suspend.c  i915drmkms
-file   external/bsd/drm2/dist/drm/i915/i915_sw_fence.c i915drmkms
+#file  external/bsd/drm2/dist/drm/i915/i915_sw_fence.c i915drmkms
 file   external/bsd/drm2/dist/drm/i915/i915_sw_fence_work.c    i915drmkms
 file   external/bsd/drm2/dist/drm/i915/i915_switcheroo.c       i915drmkms
 file   external/bsd/drm2/dist/drm/i915/i915_syncmap.c  i915drmkms
diff -r dd0d9fc041d9 -r 23ea39f95b23 sys/external/bsd/drm2/i915drm/i915_sw_fence.h
--- a/sys/external/bsd/drm2/i915drm/i915_sw_fence.h     Sun Dec 19 11:19:47 2021 +0000
+++ b/sys/external/bsd/drm2/i915drm/i915_sw_fence.h     Sun Dec 19 11:19:55 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_sw_fence.h,v 1.3 2021/12/19 01:46:32 riastradh Exp $      */
+/*     $NetBSD: i915_sw_fence.h,v 1.4 2021/12/19 11:19:55 riastradh Exp $      */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -38,8 +38,9 @@
 #include <linux/gfp.h>
 
 struct dma_fence_ops;
+struct dma_resv;
 struct i915_sw_fence;
-struct reservation_object;
+struct i915_sw_fence_cb;
 
 struct i915_sw_fence {
        char dummy;
@@ -49,6 +50,10 @@
        char dummy;
 };
 
+struct i915_sw_dma_fence_cb {
+       char dummy;
+};
+
 enum i915_sw_fence_notify {
        FENCE_COMPLETE,
        FENCE_FREE,
@@ -63,7 +68,7 @@
 bool   i915_sw_fence_signaled(struct i915_sw_fence *);
 
 void   i915_sw_fence_await_reservation(struct i915_sw_fence *,
-           struct reservation_object *, const struct dma_fence_ops *, bool,
+           struct dma_resv *, const struct dma_fence_ops *, bool,
            unsigned long, gfp_t);
 void   i915_sw_fence_await_sw_fence(struct i915_sw_fence *,
            struct i915_sw_fence *, struct i915_sw_fence_wait *);