From: Jani Nikula <jani.nikula@intel.com>
To: Jani Nikula <jani.nikula@intel.com>, dri-devel@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org,
David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
Masahiro Yamada <masahiroy@kernel.org>,
lucas.demarchi@intel.com,
Christian Koenig <christian.koenig@amd.com>,
Huang Rui <ray.huang@amd.com>
Subject: [PATCH v3] drm/ttm: fix ttm_bo.h kernel-doc warnings
Date: Fri, 8 Mar 2024 18:07:50 +0200 [thread overview]
Message-ID: <20240308160750.3741833-1-jani.nikula@intel.com> (raw)
In-Reply-To: <bf51b87689f0c5c5f2343c75e14b984afcb6a58c.1709898638.git.jani.nikula@intel.com>
Some renames, some formatting fixes, add some missing documentation.
v3: Fix struct ttm_buffer_object .sg documentation (Christian)
Cc: Christian Koenig <christian.koenig@amd.com>
Cc: Huang Rui <ray.huang@amd.com>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
include/drm/ttm/ttm_bo.h | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/include/drm/ttm/ttm_bo.h b/include/drm/ttm/ttm_bo.h
index 0223a41a64b2..6ccf96c91f3a 100644
--- a/include/drm/ttm/ttm_bo.h
+++ b/include/drm/ttm/ttm_bo.h
@@ -83,6 +83,9 @@ enum ttm_bo_type {
* @resource: structure describing current placement.
* @ttm: TTM structure holding system pages.
* @deleted: True if the object is only a zombie and already deleted.
+ * @bulk_move: The bulk move object.
+ * @priority: Priority for LRU, BOs with lower priority are evicted first.
+ * @pin_count: Pin count.
*
* Base class for TTM buffer object, that deals with data placement and CPU
* mappings. GPU mappings are really up to the driver, but for simpler GPUs
@@ -128,26 +131,27 @@ struct ttm_buffer_object {
struct work_struct delayed_delete;
/**
- * Special members that are protected by the reserve lock
- * and the bo::lock when written to. Can be read with
- * either of these locks held.
+ * @sg: external source of pages and DMA addresses, protected by the
+ * reservation lock.
*/
struct sg_table *sg;
};
+#define TTM_BO_MAP_IOMEM_MASK 0x80
+
/**
* struct ttm_bo_kmap_obj
*
* @virtual: The current kernel virtual address.
* @page: The page when kmap'ing a single page.
* @bo_kmap_type: Type of bo_kmap.
+ * @bo: The TTM BO.
*
* Object describing a kernel mapping. Since a TTM bo may be located
* in various memory types with various caching policies, the
* mapping can either be an ioremap, a vmap, a kmap or part of a
* premapped region.
*/
-#define TTM_BO_MAP_IOMEM_MASK 0x80
struct ttm_bo_kmap_obj {
void *virtual;
struct page *page;
@@ -171,6 +175,7 @@ struct ttm_bo_kmap_obj {
* @force_alloc: Don't check the memory account during suspend or CPU page
* faults. Should only be used by TTM internally.
* @resv: Reservation object to allow reserved evictions with.
+ * @bytes_moved: Statistics on how many bytes have been moved.
*
* Context for TTM operations like changing buffer placement or general memory
* allocation.
@@ -264,7 +269,7 @@ static inline int ttm_bo_reserve(struct ttm_buffer_object *bo,
* ttm_bo_reserve_slowpath:
* @bo: A pointer to a struct ttm_buffer_object.
* @interruptible: Sleep interruptible if waiting.
- * @sequence: Set (@bo)->sequence to this value after lock
+ * @ticket: Ticket used to acquire the ww_mutex.
*
* This is called after ttm_bo_reserve returns -EAGAIN and we backed off
* from all our other reservations. Because there are no other reservations
@@ -303,7 +308,7 @@ static inline void ttm_bo_assign_mem(struct ttm_buffer_object *bo,
}
/**
- * ttm_bo_move_null = assign memory for a buffer object.
+ * ttm_bo_move_null - assign memory for a buffer object.
* @bo: The bo to assign the memory to
* @new_mem: The memory to be assigned.
*
--
2.39.2
next prev parent reply other threads:[~2024-03-08 16:08 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-08 11:55 [PATCH v2 00/16] drm: fix headers, add header test facility Jani Nikula
2024-03-08 11:55 ` [PATCH v2 01/16] drm: add missing header guards to drm_crtc_internal.h Jani Nikula
2024-03-08 17:19 ` Alex Deucher
2024-03-08 11:55 ` [PATCH v2 02/16] drm: add missing header guards to drm_crtc_helper_internal.h Jani Nikula
2024-03-08 17:21 ` Alex Deucher
2024-03-08 11:55 ` [PATCH v2 03/16] drm/encoder: improve drm_encoder_slave.h kernel-doc Jani Nikula
2024-03-08 17:21 ` Alex Deucher
2024-03-08 11:55 ` [PATCH v2 04/16] drm/i2c: silence ch7006.h and sil164.h kernel-doc warnings Jani Nikula
2024-03-08 11:55 ` [PATCH v2 05/16] drm/i915: fix i915_gsc_proxy_mei_interface.h kernel-doc Jani Nikula
2024-03-08 11:55 ` [PATCH v2 06/16] drm/i915/hdcp: fix i915_hdcp_interface.h kernel-doc warnings Jani Nikula
2024-03-08 11:55 ` [PATCH v2 07/16] drm/i915/pxp: fix i915_pxp_tee_interface.h " Jani Nikula
2024-03-08 15:10 ` Lucas De Marchi
2024-03-08 11:55 ` [PATCH v2 08/16] m68k: pgtable: Add missing #include <asm/page.h> Jani Nikula
2024-03-08 11:55 ` [PATCH v2 09/16] drm/ttm: fix ttm_bo.h kernel-doc warnings Jani Nikula
2024-03-08 13:03 ` Christian König
2024-03-08 16:07 ` Jani Nikula [this message]
2024-03-08 11:55 ` [PATCH v2 10/16] drm/ttm: make ttm_caching.h self-contained Jani Nikula
2024-03-08 17:22 ` Alex Deucher
2024-03-08 11:55 ` [PATCH v2 11/16] drm/ttm: fix ttm_execbuf_util.h kernel-doc warnings Jani Nikula
2024-03-08 11:55 ` [PATCH v2 12/16] drm/ttm: fix ttm_kmap_iter.h " Jani Nikula
2024-03-08 11:55 ` [PATCH v2 13/16] drm/ttm: make ttm_pool.h self-contained Jani Nikula
2024-03-08 17:22 ` Alex Deucher
2024-03-08 11:55 ` [PATCH v2 14/16] drm/dp_mst: avoid includes in drm_dp_mst_topology_internal.h Jani Nikula
2024-03-08 15:12 ` Lucas De Marchi
2024-03-08 11:55 ` [PATCH v2 15/16] drm: avoid includes in drm_crtc_helper_internal.h Jani Nikula
2024-03-08 15:12 ` Lucas De Marchi
2024-03-08 11:55 ` [PATCH v2 16/16] drm: ensure drm headers are self-contained and pass kernel-doc Jani Nikula
2024-03-11 12:33 ` Jani Nikula
2025-03-02 15:46 ` Masahiro Yamada
2024-03-08 13:50 ` ✓ CI.Patch_applied: success for drm: fix headers, add header test facility Patchwork
2024-03-08 13:51 ` ✗ CI.checkpatch: warning " Patchwork
2024-03-08 13:52 ` ✓ CI.KUnit: success " Patchwork
2024-03-08 14:02 ` ✓ CI.Build: " Patchwork
2024-03-08 14:03 ` ✓ CI.Hooks: " Patchwork
2024-03-08 14:04 ` ✗ CI.checksparse: warning " Patchwork
2024-03-08 14:39 ` ✓ CI.BAT: success " Patchwork
2024-03-08 17:38 ` ✓ CI.Patch_applied: success for drm: fix headers, add header test facility (rev2) Patchwork
2024-03-08 17:38 ` ✗ CI.checkpatch: warning " Patchwork
2024-03-08 17:39 ` ✓ CI.KUnit: success " Patchwork
2024-03-08 17:49 ` ✓ CI.Build: " Patchwork
2024-03-08 17:50 ` ✓ CI.Hooks: " Patchwork
2024-03-08 17:51 ` ✗ CI.checksparse: warning " Patchwork
2024-03-08 18:26 ` ✓ CI.BAT: success " Patchwork
2024-03-11 12:35 ` [PATCH v2 00/16] drm: fix headers, add header test facility Jani Nikula
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=20240308160750.3741833-1-jani.nikula@intel.com \
--to=jani.nikula@intel.com \
--cc=airlied@gmail.com \
--cc=christian.koenig@amd.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=lucas.demarchi@intel.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=masahiroy@kernel.org \
--cc=mripard@kernel.org \
--cc=ray.huang@amd.com \
--cc=tzimmermann@suse.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox