Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:19:55 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/i915drm: files.i915drmkms i915_sw_fence.h
Log Message:
i915: Touch up local i915_sw_fence stubs to make it compile.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/i915drm/i915_sw_fence.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/i915drm/files.i915drmkms
diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.64 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.65
--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.64 Sun Dec 19 11:19:47 2021
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sun Dec 19 11:19:55 2021
@@ -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/i91
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
Index: src/sys/external/bsd/drm2/i915drm/i915_sw_fence.h
diff -u src/sys/external/bsd/drm2/i915drm/i915_sw_fence.h:1.3 src/sys/external/bsd/drm2/i915drm/i915_sw_fence.h:1.4
--- src/sys/external/bsd/drm2/i915drm/i915_sw_fence.h:1.3 Sun Dec 19 01:46:32 2021
+++ src/sys/external/bsd/drm2/i915drm/i915_sw_fence.h Sun Dec 19 11:19:55 2021
@@ -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 @@ struct i915_sw_fence_wait {
char dummy;
};
+struct i915_sw_dma_fence_cb {
+ char dummy;
+};
+
enum i915_sw_fence_notify {
FENCE_COMPLETE,
FENCE_FREE,
@@ -63,7 +68,7 @@ void i915_sw_fence_fini(struct i915_sw_f
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 *);
