Module Name: src
Committed By: riastradh
Date: Sun Dec 19 12:10:34 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/i915drm: i915_gem_userptr.c
Log Message:
i915: Initialize userptr wq for now. Should wire this up for real!
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/i915drm/i915_gem_userptr.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/i915drm/i915_gem_userptr.c
diff -u src/sys/external/bsd/drm2/i915drm/i915_gem_userptr.c:1.4 src/sys/external/bsd/drm2/i915drm/i915_gem_userptr.c:1.5
--- src/sys/external/bsd/drm2/i915drm/i915_gem_userptr.c:1.4 Sun Dec 19 11:33:49 2021
+++ src/sys/external/bsd/drm2/i915drm/i915_gem_userptr.c Sun Dec 19 12:10:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_gem_userptr.c,v 1.4 2021/12/19 11:33:49 riastradh Exp $ */
+/* $NetBSD: i915_gem_userptr.c,v 1.5 2021/12/19 12:10:34 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,20 +30,39 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_gem_userptr.c,v 1.4 2021/12/19 11:33:49 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_gem_userptr.c,v 1.5 2021/12/19 12:10:34 riastradh Exp $");
#include "i915_drv.h"
#include "../dist/drm/i915/gem/i915_gem_ioctls.h"
+#include <linux/nbsd-namespace.h>
+
+/*
+ * XXX this file is dumb and maybe shouldn't exist; it exists because
+ * riastradh is a lazybones
+ */
+
int
-i915_gem_init_userptr(struct drm_i915_private *i915)
+i915_gem_init_userptr(struct drm_i915_private *dev_priv)
{
+ mutex_init(&dev_priv->mm_lock);
+ hash_init(dev_priv->mm_structs);
+
+ dev_priv->mm.userptr_wq =
+ alloc_workqueue("i915-userptr-acquire",
+ WQ_HIGHPRI | WQ_UNBOUND,
+ 0);
+ if (!dev_priv->mm.userptr_wq)
+ return -ENOMEM;
+
return 0;
}
void
-i915_gem_cleanup_userptr(struct drm_i915_private *i915)
+i915_gem_cleanup_userptr(struct drm_i915_private *dev_priv)
{
+ destroy_workqueue(dev_priv->mm.userptr_wq);
+ mutex_destroy(&dev_priv->mm_lock);
}
int
