All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jason Ekstrand <jason@jlekstrand.net>
To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
	Jason Ekstrand <jason@jlekstrand.net>
Subject: [PATCH 15/29] drm/i915: Add gem/i915_gem_context.h to the docs
Date: Thu, 27 May 2021 11:26:36 -0500	[thread overview]
Message-ID: <20210527162650.1182544-16-jason@jlekstrand.net> (raw)
In-Reply-To: <20210527162650.1182544-1-jason@jlekstrand.net>

In order to prevent kernel doc warnings, also fill out docs for any
missing fields and fix those that forgot the "@".

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 Documentation/gpu/i915.rst                    |  2 +
 .../gpu/drm/i915/gem/i915_gem_context_types.h | 43 ++++++++++++++++---
 2 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst
index 486c720f38907..0529e5183982e 100644
--- a/Documentation/gpu/i915.rst
+++ b/Documentation/gpu/i915.rst
@@ -422,6 +422,8 @@ Batchbuffer Parsing
 User Batchbuffer Execution
 --------------------------
 
+.. kernel-doc:: drivers/gpu/drm/i915/gem/i915_gem_context_types.h
+
 .. kernel-doc:: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
    :doc: User command execution
 
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context_types.h b/drivers/gpu/drm/i915/gem/i915_gem_context_types.h
index df76767f0c41b..5f0673a2129f9 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_context_types.h
+++ b/drivers/gpu/drm/i915/gem/i915_gem_context_types.h
@@ -30,19 +30,39 @@ struct i915_address_space;
 struct intel_timeline;
 struct intel_ring;
 
+/**
+ * struct i915_gem_engines - A set of engines
+ */
 struct i915_gem_engines {
 	union {
+		/** @link: Link in i915_gem_context::stale::engines */
 		struct list_head link;
+
+		/** @rcu: RCU to use when freeing */
 		struct rcu_head rcu;
 	};
+
+	/** @fence: Fence used for delayed destruction of engines */
 	struct i915_sw_fence fence;
+
+	/** @ctx: i915_gem_context backpointer */
 	struct i915_gem_context *ctx;
+
+	/** @num_engines: Number of engines in this set */
 	unsigned int num_engines;
+
+	/** @engines: Array of engines */
 	struct intel_context *engines[];
 };
 
+/**
+ * struct i915_gem_engines_iter - Iterator for an i915_gem_engines set
+ */
 struct i915_gem_engines_iter {
+	/** @idx: Index into i915_gem_engines::engines */
 	unsigned int idx;
+
+	/** @engines: Engine set being iterated */
 	const struct i915_gem_engines *engines;
 };
 
@@ -53,10 +73,10 @@ struct i915_gem_engines_iter {
  * logical hardware state for a particular client.
  */
 struct i915_gem_context {
-	/** i915: i915 device backpointer */
+	/** @i915: i915 device backpointer */
 	struct drm_i915_private *i915;
 
-	/** file_priv: owning file descriptor */
+	/** @file_priv: owning file descriptor */
 	struct drm_i915_file_private *file_priv;
 
 	/**
@@ -81,7 +101,9 @@ struct i915_gem_context {
 	 * CONTEXT_USER_ENGINES flag is set).
 	 */
 	struct i915_gem_engines __rcu *engines;
-	struct mutex engines_mutex; /* guards writes to engines */
+
+	/** @engines_mutex: guards writes to engines */
+	struct mutex engines_mutex;
 
 	/**
 	 * @syncobj: Shared timeline syncobj
@@ -118,7 +140,7 @@ struct i915_gem_context {
 	 */
 	struct pid *pid;
 
-	/** link: place with &drm_i915_private.context_list */
+	/** @link: place with &drm_i915_private.context_list */
 	struct list_head link;
 
 	/**
@@ -153,11 +175,13 @@ struct i915_gem_context {
 #define CONTEXT_CLOSED			0
 #define CONTEXT_USER_ENGINES		1
 
+	/** @mutex: guards everything that isn't engines or handles_vma */
 	struct mutex mutex;
 
+	/** @sched: scheduler parameters */
 	struct i915_sched_attr sched;
 
-	/** guilty_count: How many times this context has caused a GPU hang. */
+	/** @guilty_count: How many times this context has caused a GPU hang. */
 	atomic_t guilty_count;
 	/**
 	 * @active_count: How many times this context was active during a GPU
@@ -171,15 +195,17 @@ struct i915_gem_context {
 	unsigned long hang_timestamp[2];
 #define CONTEXT_FAST_HANG_JIFFIES (120 * HZ) /* 3 hangs within 120s? Banned! */
 
-	/** remap_slice: Bitmask of cache lines that need remapping */
+	/** @remap_slice: Bitmask of cache lines that need remapping */
 	u8 remap_slice;
 
 	/**
-	 * handles_vma: rbtree to look up our context specific obj/vma for
+	 * @handles_vma: rbtree to look up our context specific obj/vma for
 	 * the user handle. (user handles are per fd, but the binding is
 	 * per vm, which may be one per context or shared with the global GTT)
 	 */
 	struct radix_tree_root handles_vma;
+
+	/** @lut_mutex: Locks handles_vma */
 	struct mutex lut_mutex;
 
 	/**
@@ -191,8 +217,11 @@ struct i915_gem_context {
 	 */
 	char name[TASK_COMM_LEN + 8];
 
+	/** @stale: tracks stale engines to be destroyed */
 	struct {
+		/** @lock: guards engines */
 		spinlock_t lock;
+		/** @engines: list of stale engines */
 		struct list_head engines;
 	} stale;
 };
-- 
2.31.1


WARNING: multiple messages have this Message-ID (diff)
From: Jason Ekstrand <jason@jlekstrand.net>
To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: [Intel-gfx] [PATCH 15/29] drm/i915: Add gem/i915_gem_context.h to the docs
Date: Thu, 27 May 2021 11:26:36 -0500	[thread overview]
Message-ID: <20210527162650.1182544-16-jason@jlekstrand.net> (raw)
In-Reply-To: <20210527162650.1182544-1-jason@jlekstrand.net>

In order to prevent kernel doc warnings, also fill out docs for any
missing fields and fix those that forgot the "@".

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 Documentation/gpu/i915.rst                    |  2 +
 .../gpu/drm/i915/gem/i915_gem_context_types.h | 43 ++++++++++++++++---
 2 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst
index 486c720f38907..0529e5183982e 100644
--- a/Documentation/gpu/i915.rst
+++ b/Documentation/gpu/i915.rst
@@ -422,6 +422,8 @@ Batchbuffer Parsing
 User Batchbuffer Execution
 --------------------------
 
+.. kernel-doc:: drivers/gpu/drm/i915/gem/i915_gem_context_types.h
+
 .. kernel-doc:: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
    :doc: User command execution
 
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context_types.h b/drivers/gpu/drm/i915/gem/i915_gem_context_types.h
index df76767f0c41b..5f0673a2129f9 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_context_types.h
+++ b/drivers/gpu/drm/i915/gem/i915_gem_context_types.h
@@ -30,19 +30,39 @@ struct i915_address_space;
 struct intel_timeline;
 struct intel_ring;
 
+/**
+ * struct i915_gem_engines - A set of engines
+ */
 struct i915_gem_engines {
 	union {
+		/** @link: Link in i915_gem_context::stale::engines */
 		struct list_head link;
+
+		/** @rcu: RCU to use when freeing */
 		struct rcu_head rcu;
 	};
+
+	/** @fence: Fence used for delayed destruction of engines */
 	struct i915_sw_fence fence;
+
+	/** @ctx: i915_gem_context backpointer */
 	struct i915_gem_context *ctx;
+
+	/** @num_engines: Number of engines in this set */
 	unsigned int num_engines;
+
+	/** @engines: Array of engines */
 	struct intel_context *engines[];
 };
 
+/**
+ * struct i915_gem_engines_iter - Iterator for an i915_gem_engines set
+ */
 struct i915_gem_engines_iter {
+	/** @idx: Index into i915_gem_engines::engines */
 	unsigned int idx;
+
+	/** @engines: Engine set being iterated */
 	const struct i915_gem_engines *engines;
 };
 
@@ -53,10 +73,10 @@ struct i915_gem_engines_iter {
  * logical hardware state for a particular client.
  */
 struct i915_gem_context {
-	/** i915: i915 device backpointer */
+	/** @i915: i915 device backpointer */
 	struct drm_i915_private *i915;
 
-	/** file_priv: owning file descriptor */
+	/** @file_priv: owning file descriptor */
 	struct drm_i915_file_private *file_priv;
 
 	/**
@@ -81,7 +101,9 @@ struct i915_gem_context {
 	 * CONTEXT_USER_ENGINES flag is set).
 	 */
 	struct i915_gem_engines __rcu *engines;
-	struct mutex engines_mutex; /* guards writes to engines */
+
+	/** @engines_mutex: guards writes to engines */
+	struct mutex engines_mutex;
 
 	/**
 	 * @syncobj: Shared timeline syncobj
@@ -118,7 +140,7 @@ struct i915_gem_context {
 	 */
 	struct pid *pid;
 
-	/** link: place with &drm_i915_private.context_list */
+	/** @link: place with &drm_i915_private.context_list */
 	struct list_head link;
 
 	/**
@@ -153,11 +175,13 @@ struct i915_gem_context {
 #define CONTEXT_CLOSED			0
 #define CONTEXT_USER_ENGINES		1
 
+	/** @mutex: guards everything that isn't engines or handles_vma */
 	struct mutex mutex;
 
+	/** @sched: scheduler parameters */
 	struct i915_sched_attr sched;
 
-	/** guilty_count: How many times this context has caused a GPU hang. */
+	/** @guilty_count: How many times this context has caused a GPU hang. */
 	atomic_t guilty_count;
 	/**
 	 * @active_count: How many times this context was active during a GPU
@@ -171,15 +195,17 @@ struct i915_gem_context {
 	unsigned long hang_timestamp[2];
 #define CONTEXT_FAST_HANG_JIFFIES (120 * HZ) /* 3 hangs within 120s? Banned! */
 
-	/** remap_slice: Bitmask of cache lines that need remapping */
+	/** @remap_slice: Bitmask of cache lines that need remapping */
 	u8 remap_slice;
 
 	/**
-	 * handles_vma: rbtree to look up our context specific obj/vma for
+	 * @handles_vma: rbtree to look up our context specific obj/vma for
 	 * the user handle. (user handles are per fd, but the binding is
 	 * per vm, which may be one per context or shared with the global GTT)
 	 */
 	struct radix_tree_root handles_vma;
+
+	/** @lut_mutex: Locks handles_vma */
 	struct mutex lut_mutex;
 
 	/**
@@ -191,8 +217,11 @@ struct i915_gem_context {
 	 */
 	char name[TASK_COMM_LEN + 8];
 
+	/** @stale: tracks stale engines to be destroyed */
 	struct {
+		/** @lock: guards engines */
 		spinlock_t lock;
+		/** @engines: list of stale engines */
 		struct list_head engines;
 	} stale;
 };
-- 
2.31.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2021-05-27 16:27 UTC|newest]

Thread overview: 95+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-27 16:26 [PATCH 00/29] drm/i915/gem: ioctl clean-ups (v6) Jason Ekstrand
2021-05-27 16:26 ` [Intel-gfx] " Jason Ekstrand
2021-05-27 16:26 ` [PATCH 01/29] drm/i915: Drop I915_CONTEXT_PARAM_RINGSIZE Jason Ekstrand
2021-05-27 16:26   ` [Intel-gfx] " Jason Ekstrand
2021-05-27 16:26 ` [PATCH 02/29] drm/i915: Stop storing the ring size in the ring pointer (v2) Jason Ekstrand
2021-05-27 16:26   ` [Intel-gfx] " Jason Ekstrand
2021-05-27 16:26 ` [PATCH 03/29] drm/i915: Drop I915_CONTEXT_PARAM_NO_ZEROMAP Jason Ekstrand
2021-05-27 16:26   ` [Intel-gfx] " Jason Ekstrand
2021-05-27 16:26 ` [PATCH 04/29] drm/i915/gem: Set the watchdog timeout directly in intel_context_set_gem (v2) Jason Ekstrand
2021-05-27 16:26   ` [Intel-gfx] " Jason Ekstrand
2021-05-27 16:26 ` [PATCH 05/29] drm/i915/gem: Return void from context_apply_all Jason Ekstrand
2021-05-27 16:26   ` [Intel-gfx] " Jason Ekstrand
2021-05-27 16:26 ` [PATCH 06/29] drm/i915: Drop the CONTEXT_CLONE API (v2) Jason Ekstrand
2021-05-27 16:26   ` [Intel-gfx] " Jason Ekstrand
2021-05-27 16:26 ` [PATCH 07/29] drm/i915: Implement SINGLE_TIMELINE with a syncobj (v4) Jason Ekstrand
2021-05-27 16:26   ` [Intel-gfx] " Jason Ekstrand
2021-05-27 16:26 ` [PATCH 08/29] drm/i915: Drop getparam support for I915_CONTEXT_PARAM_ENGINES Jason Ekstrand
2021-05-27 16:26   ` [Intel-gfx] " Jason Ekstrand
2021-05-27 16:26 ` [PATCH 09/29] drm/i915/gem: Disallow bonding of virtual engines (v3) Jason Ekstrand
2021-05-27 16:26   ` [Intel-gfx] " Jason Ekstrand
2021-05-27 16:26 ` [PATCH 10/29] drm/i915/gem: Remove engine auto-magic with FENCE_SUBMIT (v2) Jason Ekstrand
2021-05-27 16:26   ` [Intel-gfx] " Jason Ekstrand
2021-05-27 16:26 ` [PATCH 11/29] drm/i915/request: Remove the hook from await_execution Jason Ekstrand
2021-05-27 16:26   ` [Intel-gfx] " Jason Ekstrand
2021-05-27 16:26 ` [PATCH 12/29] drm/i915/gem: Disallow creating contexts with too many engines Jason Ekstrand
2021-05-27 16:26   ` [Intel-gfx] " Jason Ekstrand
2021-05-27 16:26 ` [PATCH 13/29] drm/i915: Stop manually RCU banging in reset_stats_ioctl (v2) Jason Ekstrand
2021-05-27 16:26   ` [Intel-gfx] " Jason Ekstrand
2021-05-27 16:26 ` [PATCH 14/29] drm/i915/gem: Add a separate validate_priority helper Jason Ekstrand
2021-05-27 16:26   ` [Intel-gfx] " Jason Ekstrand
2021-05-27 16:26 ` Jason Ekstrand [this message]
2021-05-27 16:26   ` [Intel-gfx] [PATCH 15/29] drm/i915: Add gem/i915_gem_context.h to the docs Jason Ekstrand
2021-05-27 16:26 ` [PATCH 16/29] drm/i915/gem: Add an intermediate proto_context struct Jason Ekstrand
2021-05-27 16:26   ` [Intel-gfx] " Jason Ekstrand
2021-05-31  8:47   ` Daniel Vetter
2021-05-31  8:47     ` Daniel Vetter
2021-06-02 21:24     ` Jason Ekstrand
2021-06-02 21:24       ` Jason Ekstrand
2021-06-03  7:09       ` Daniel Vetter
2021-06-03  7:09         ` Daniel Vetter
2021-05-27 16:26 ` [PATCH 17/29] drm/i915/gem: Rework error handling in default_engines Jason Ekstrand
2021-05-27 16:26   ` [Intel-gfx] " Jason Ekstrand
2021-05-27 16:26 ` [PATCH 18/29] drm/i915/gem: Optionally set SSEU in intel_context_set_gem Jason Ekstrand
2021-05-27 16:26   ` [Intel-gfx] " Jason Ekstrand
2021-05-31  8:48   ` Daniel Vetter
2021-05-31  8:48     ` [Intel-gfx] " Daniel Vetter
2021-06-02 22:05     ` Jason Ekstrand
2021-06-02 22:05       ` [Intel-gfx] " Jason Ekstrand
2021-05-27 16:26 ` [PATCH 19/29] drm/i915: Add an i915_gem_vm_lookup helper Jason Ekstrand
2021-05-27 16:26   ` [Intel-gfx] " Jason Ekstrand
2021-05-27 18:30   ` Daniel Vetter
2021-05-27 18:30     ` [Intel-gfx] " Daniel Vetter
2021-05-27 16:26 ` [PATCH 20/29] drm/i915/gem: Make an alignment check more sensible Jason Ekstrand
2021-05-27 16:26   ` [Intel-gfx] " Jason Ekstrand
2021-05-27 18:31   ` Daniel Vetter
2021-05-27 18:31     ` [Intel-gfx] " Daniel Vetter
2021-05-27 16:26 ` [PATCH 21/29] drm/i915/gem: Use the proto-context to handle create parameters (v2) Jason Ekstrand
2021-05-27 16:26   ` [Intel-gfx] " Jason Ekstrand
2021-05-31  9:11   ` Daniel Vetter
2021-05-31  9:11     ` [Intel-gfx] " Daniel Vetter
2021-06-02 22:23     ` Jason Ekstrand
2021-06-02 22:23       ` [Intel-gfx] " Jason Ekstrand
2021-06-03  7:32       ` Daniel Vetter
2021-06-03  7:32         ` [Intel-gfx] " Daniel Vetter
2021-06-03 16:29         ` Jason Ekstrand
2021-06-03 16:29           ` [Intel-gfx] " Jason Ekstrand
2021-05-27 16:26 ` [PATCH 22/29] drm/i915/gem: Return an error ptr from context_lookup Jason Ekstrand
2021-05-27 16:26   ` [Intel-gfx] " Jason Ekstrand
2021-05-27 16:26 ` [PATCH 23/29] drm/i915/gt: Drop i915_address_space::file (v2) Jason Ekstrand
2021-05-27 16:26   ` [Intel-gfx] " Jason Ekstrand
2021-05-27 16:26 ` [PATCH 24/29] drm/i915/gem: Delay context creation Jason Ekstrand
2021-05-27 16:26   ` [Intel-gfx] " Jason Ekstrand
2021-05-31  9:50   ` Daniel Vetter
2021-05-31  9:50     ` [Intel-gfx] " Daniel Vetter
2021-06-02 22:55     ` Jason Ekstrand
2021-06-02 22:55       ` [Intel-gfx] " Jason Ekstrand
2021-06-03  7:26       ` Daniel Vetter
2021-06-03  7:26         ` [Intel-gfx] " Daniel Vetter
2021-05-27 16:26 ` [PATCH 25/29] drm/i915/gem: Don't allow changing the VM on running contexts (v2) Jason Ekstrand
2021-05-27 16:26   ` [Intel-gfx] " Jason Ekstrand
2021-05-31 14:08   ` Daniel Vetter
2021-05-31 14:08     ` [Intel-gfx] " Daniel Vetter
2021-05-27 16:26 ` [PATCH 26/29] drm/i915/gem: Don't allow changing the engine set " Jason Ekstrand
2021-05-27 16:26   ` [Intel-gfx] " Jason Ekstrand
2021-05-31 13:58   ` Daniel Vetter
2021-05-31 13:58     ` Daniel Vetter
2021-05-27 16:26 ` [PATCH 27/29] drm/i915/selftests: Take a VM in kernel_context() Jason Ekstrand
2021-05-27 16:26   ` [Intel-gfx] " Jason Ekstrand
2021-05-27 16:26 ` [PATCH 28/29] i915/gem/selftests: Assign the VM at context creation in igt_shared_ctx_exec Jason Ekstrand
2021-05-27 16:26   ` [Intel-gfx] " Jason Ekstrand
2021-05-27 16:26 ` [PATCH 29/29] drm/i915/gem: Roll all of context creation together Jason Ekstrand
2021-05-27 16:26   ` [Intel-gfx] " Jason Ekstrand
2021-05-31 14:18   ` Daniel Vetter
2021-05-31 14:18     ` Daniel Vetter
2021-05-27 21:17 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/gem: ioctl clean-ups (rev5) Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210527162650.1182544-16-jason@jlekstrand.net \
    --to=jason@jlekstrand.net \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.