From: Jim Cromie <jim.cromie@gmail.com>
To: dri-devel@lists.freedesktop.org, intel-gfx-trybot@lists.freedesktop.org
Cc: Jim Cromie <jim.cromie@gmail.com>
Subject: [PATCH 57/59] accel/ivpu: implement IVPU_DBG_* as a dyndbg classmap
Date: Wed, 11 Feb 2026 17:13:53 -0700 [thread overview]
Message-ID: <20260212001359.97296-59-jim.cromie@gmail.com> (raw)
In-Reply-To: <20260212001359.97296-58-jim.cromie@gmail.com>
Invoke DRM_CLASSMAP_DEFINE to create a classmap of
class-ids/categories for ivpu_dbg().
This brings static-key optimized-off benefits to the ivpu_dbg()
callsites. DRM_CLASSMAP_PARAM_REF wires the sysfs kparam to the
classmap.
This is the 1st real-world example of a module avoiding another
module's classmap's class_id range reservation.
Its also something of an oddity: it "is" a DRM module only cuz
1. CONFIG_DRM_ACCEL_IVPU exists.
2. code therefore uses CONFIG_DRM_USE_DYNAMIC_DEBUG, so must also use
it's dependent wrappers: DRM_CLASSMAP_*
accel/amdxdna is already using drm.debug via dev_dbg(), so it is more
fully DRM but iirc its a single call.
Anyway, to play nice with DRM, we change all the constants, from
macros calling BIT(X), to an explicit "enum ivpu_dbg_category"
starting at 16 to avoid DRM_UT_CORE..RES. This is all in an indef to
avoid changing the constants for the non-dyndbg case.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
---
drivers/accel/ivpu/ivpu_drv.c | 27 +++++++++++++++++++--
drivers/accel/ivpu/ivpu_drv.h | 45 ++++++++++++++++++++++++++++++-----
2 files changed, 64 insertions(+), 8 deletions(-)
diff --git a/drivers/accel/ivpu/ivpu_drv.c b/drivers/accel/ivpu/ivpu_drv.c
index 3d6fccdefdd6..1c7bb6de78cc 100644
--- a/drivers/accel/ivpu/ivpu_drv.c
+++ b/drivers/accel/ivpu/ivpu_drv.c
@@ -3,6 +3,7 @@
* Copyright (C) 2020-2025 Intel Corporation
*/
+#include <linux/dynamic_debug.h>
#include <linux/firmware.h>
#include <linux/module.h>
#include <linux/pci.h>
@@ -37,8 +38,30 @@
#define DRIVER_VERSION_STR "1.0.0 " UTS_RELEASE
#endif
-int ivpu_dbg_mask;
-module_param_named(dbg_mask, ivpu_dbg_mask, int, 0644);
+long unsigned int ivpu_dbg_mask;
+
+#if !defined(CONFIG_DRM_USE_DYNAMIC_DEBUG)
+
+module_param_named(dbg_mask, ivpu_dbg_mask, ulong, 0644);
+#else
+DRM_CLASSMAP_DEFINE(ivpu_dbg_classes, DD_CLASS_TYPE_DISJOINT_BITS,
+ IVPU_DBG_REG,
+ "IVPU_DBG_REG",
+ "IVPU_DBG_IRQ",
+ "IVPU_DBG_MMU",
+ "IVPU_DBG_FILE",
+ "IVPU_DBG_MISC",
+ "IVPU_DBG_FW_BOOT",
+ "IVPU_DBG_PM",
+ "IVPU_DBG_IPC",
+ "IVPU_DBG_BO",
+ "IVPU_DBG_JOB",
+ "IVPU_DBG_JSM",
+ "IVPU_DBG_KREF",
+ "IVPU_DBG_RPM",
+ "IVPU_DBG_MMU_MAP");
+DRM_CLASSMAP_PARAM_REF(dbg_mask, ivpu_dbg_mask, ivpu_dbg_classes, p);
+#endif
MODULE_PARM_DESC(dbg_mask, "Driver debug mask. See IVPU_DBG_* macros.");
int ivpu_test_mode;
diff --git a/drivers/accel/ivpu/ivpu_drv.h b/drivers/accel/ivpu/ivpu_drv.h
index 5b34b6f50e69..5a6279705651 100644
--- a/drivers/accel/ivpu/ivpu_drv.h
+++ b/drivers/accel/ivpu/ivpu_drv.h
@@ -65,6 +65,10 @@
#define IVPU_SCHED_MODE_AUTO -1
+extern long unsigned int ivpu_dbg_mask;
+
+#if !defined(CONFIG_DRM_USE_DYNAMIC_DEBUG)
+
#define IVPU_DBG_REG BIT(0)
#define IVPU_DBG_IRQ BIT(1)
#define IVPU_DBG_MMU BIT(2)
@@ -81,6 +85,41 @@
#define IVPU_DBG_MMU_MAP BIT(13)
#define IVPU_DBG_IOCTL BIT(14)
+#define ivpu_dbg(vdev, type, fmt, args...) do { \
+ if (unlikely(IVPU_DBG_##type & ivpu_dbg_mask)) \
+ dev_dbg((vdev)->drm.dev, "[%s] " fmt, #type, ##args); \
+} while (0)
+
+#else /* !!CONFIG_DRM_USE_DYNAMIC_DEBUG */
+
+enum ivpu_dbg_category {
+ /*
+ * since accels are drm-devices (CONFIG_DRM_ACCEL_*), adjust
+ * IVPU_DBG_* to avoid DRMs 0..10 class_id reservations.
+ */
+ IVPU_DBG_REG = 16,
+ IVPU_DBG_IRQ,
+ IVPU_DBG_MMU,
+ IVPU_DBG_FILE,
+ IVPU_DBG_MISC,
+ IVPU_DBG_FW_BOOT,
+ IVPU_DBG_PM,
+ IVPU_DBG_IPC,
+ IVPU_DBG_BO,
+ IVPU_DBG_JOB,
+ IVPU_DBG_JSM,
+ IVPU_DBG_KREF,
+ IVPU_DBG_RPM,
+ IVPU_DBG_MMU_MAP,
+ IVPU_DBG_IOCTL
+};
+
+#define ivpu_dbg(vdev, type, fmt, ...) \
+ _dynamic_func_call_cls(IVPU_DBG_##type, fmt, __dynamic_dev_dbg, \
+ (vdev)->drm.dev, fmt, ##__VA_ARGS__)
+
+#endif /* !!CONFIG_DRM_USE_DYNAMIC_DEBUG */
+
#define ivpu_err(vdev, fmt, ...) \
drm_err(&(vdev)->drm, "%s(): " fmt, __func__, ##__VA_ARGS__)
@@ -95,11 +134,6 @@
#define ivpu_info(vdev, fmt, ...) drm_info(&(vdev)->drm, fmt, ##__VA_ARGS__)
-#define ivpu_dbg(vdev, type, fmt, args...) do { \
- if (unlikely(IVPU_DBG_##type & ivpu_dbg_mask)) \
- dev_dbg((vdev)->drm.dev, "[%s] " fmt, #type, ##args); \
-} while (0)
-
#define IVPU_WA(wa_name) (vdev->wa.wa_name)
#define IVPU_PRINT_WA(wa_name) do { \
@@ -197,7 +231,6 @@ struct ivpu_file_priv {
bool aborted;
};
-extern int ivpu_dbg_mask;
extern u8 ivpu_pll_min_ratio;
extern u8 ivpu_pll_max_ratio;
extern int ivpu_sched_mode;
--
2.53.0
next prev parent reply other threads:[~2026-02-12 0:15 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-12 0:12 [PATCH v10 00/61] drm/dyndbg: Fix CONFIG_DRM_USE_DYNAMIC_DEBUG=y MIME-Version: 1.0 Jim Cromie
2026-02-12 0:12 ` [PATCH 01/61] dyndbg: fix NULL ptr on i386 due to section alignment Jim Cromie
2026-02-12 0:12 ` [PATCH 02/61] dyndbg: factor ddebug_match_desc out from ddebug_change Jim Cromie
2026-02-12 0:12 ` [PATCH 03/61] dyndbg: add stub macro for DECLARE_DYNDBG_CLASSMAP Jim Cromie
2026-02-12 0:12 ` [PATCH 04/61] docs/dyndbg: update examples \012 to \n Jim Cromie
2026-02-12 0:13 ` [PATCH 05/61] docs/dyndbg: explain flags parse 1st Jim Cromie
2026-02-12 0:13 ` [PATCH 06/61] test-dyndbg: fixup CLASSMAP usage error Jim Cromie
2026-02-12 0:13 ` [PATCH 07/61] dyndbg: reword "class unknown," to "class:_UNKNOWN_" Jim Cromie
2026-02-12 0:13 ` [PATCH 08/61] dyndbg: make ddebug_class_param union members same size Jim Cromie
2026-02-12 0:13 ` [PATCH 09/61] dyndbg: drop NUM_TYPE_ARRAY Jim Cromie
2026-02-12 0:13 ` [PATCH 10/61] dyndbg: tweak pr_fmt to avoid expansion conflicts Jim Cromie
2026-02-12 0:13 ` [PATCH 11/61] dyndbg: reduce verbose/debug clutter Jim Cromie
2026-02-12 0:13 ` [PATCH 12/61] dyndbg: refactor param_set_dyndbg_classes and below Jim Cromie
2026-02-12 0:13 ` [PATCH 13/61] dyndbg: tighten fn-sig of ddebug_apply_class_bitmap Jim Cromie
2026-02-12 0:13 ` [PATCH 14/61] dyndbg: replace classmap list with a vector Jim Cromie
2026-02-12 0:13 ` [PATCH 15/61] dyndbg: macrofy a 2-index for-loop pattern Jim Cromie
2026-02-12 0:13 ` [PATCH 16/61] dyndbg,module: make proper substructs in _ddebug_info Jim Cromie
2026-02-12 0:13 ` [PATCH 17/61] dyndbg: hoist classmap-filter-by-modname up to ddebug_add_module Jim Cromie
2026-02-12 0:13 ` [PATCH 18/61] dyndbg: move mod_name down from struct ddebug_table to _ddebug_info Jim Cromie
2026-02-12 0:13 ` [PATCH 19/61] dyndbg-API: remove DD_CLASS_TYPE_(DISJOINT|LEVEL)_NAMES and code Jim Cromie
2026-02-12 0:13 ` [PATCH 20/61] selftests-dyndbg: add a dynamic_debug run_tests target Jim Cromie
2026-02-12 0:13 ` [PATCH 21/61] dyndbg: change __dynamic_func_call_cls* macros into expressions Jim Cromie
2026-02-12 0:13 ` [PATCH 22/61] dyndbg-API: replace DECLARE_DYNDBG_CLASSMAP Jim Cromie
2026-02-12 0:13 ` [PATCH 23/61] dyndbg: detect class_id reservation conflicts Jim Cromie
2026-02-12 0:13 ` [PATCH 24/61] dyndbg: check DYNAMIC_DEBUG_CLASSMAP_DEFINE args at compile-time Jim Cromie
2026-02-12 0:13 ` [PATCH 25/61] dyndbg-test: change do_prints testpoint to accept a loopct Jim Cromie
2026-02-12 0:13 ` [PATCH 26/61] dyndbg-API: promote DYNAMIC_DEBUG_CLASSMAP_PARAM to API Jim Cromie
2026-02-12 0:13 ` [PATCH 27/61] dyndbg: treat comma as a token separator Jim Cromie
2026-02-12 0:13 ` [PATCH 28/61] dyndbg: split multi-query strings with % Jim Cromie
2026-02-12 0:13 ` [PATCH 29/61] selftests-dyndbg: add test_mod_submod Jim Cromie
2026-02-12 0:13 ` [PATCH 30/61] dyndbg: resolve "protection" of class'd pr_debug Jim Cromie
2026-02-12 0:13 ` [PATCH 31/61] dyndbg: add DYNAMIC_DEBUG_CLASSMAP_USE_(dd_class_name, offset) Jim Cromie
2026-02-12 0:13 ` [PATCH 32/61] docs/dyndbg: add classmap info to howto Jim Cromie
2026-02-12 0:13 ` [PATCH 33/61] drm: use correct ccflags-y spelling Jim Cromie
2026-02-12 0:13 ` [PATCH 34/61] drm-dyndbg: adapt drm core to use dyndbg classmaps-v2 Jim Cromie
2026-02-12 0:13 ` [PATCH 35/61] drm-dyndbg: adapt DRM to invoke DYNAMIC_DEBUG_CLASSMAP_PARAM Jim Cromie
2026-02-12 0:13 ` [PATCH 36/61] drm-print: modernize an archaic comment Jim Cromie
2026-02-12 0:13 ` [PATCH 37/61] drm-print: fix config-dependent unused variable Jim Cromie
2026-02-12 0:13 ` [PATCH 38/61] drm-dyndbg: DRM_CLASSMAP_USE in amdgpu driver Jim Cromie
2026-02-12 0:13 ` [PATCH 39/61] drm-dyndbg: DRM_CLASSMAP_USE in i915 driver Jim Cromie
2026-02-12 0:13 ` [PATCH 40/61] drm-dyndbg: DRM_CLASSMAP_USE in drm_crtc_helper Jim Cromie
2026-02-12 0:13 ` [PATCH 41/61] drm-dyndbg: DRM_CLASSMAP_USE in drm_dp_helper Jim Cromie
2026-02-12 0:13 ` [PATCH 42/61] drm-dyndbg: DRM_CLASSMAP_USE in nouveau Jim Cromie
2026-02-12 0:13 ` [PATCH 43/61] drm-dyndbg: add DRM_CLASSMAP_USE to Xe driver Jim Cromie
2026-02-12 0:13 ` [PATCH 44/61] drm-dyndbg: add DRM_CLASSMAP_USE to virtio_gpu Jim Cromie
2026-02-12 0:13 ` [PATCH 45/61] drm-dyndbg: add DRM_CLASSMAP_USE to simpledrm Jim Cromie
2026-02-12 0:13 ` [PATCH 46/61] drm-dyndbg: add DRM_CLASSMAP_USE to bochs Jim Cromie
2026-02-12 0:13 ` [PATCH 47/61] drm-dyndbg: add DRM_CLASSMAP_USE to etnaviv Jim Cromie
2026-02-12 0:13 ` [PATCH 48/61] drm-dyndbg: add DRM_CLASSMAP_USE to gma500 driver Jim Cromie
2026-02-12 0:13 ` [PATCH 49/61] drm-dyndbg: add DRM_CLASSMAP_USE to radeon Jim Cromie
2026-02-12 0:13 ` [PATCH 50/61] drm-dyndbg: add DRM_CLASSMAP_USE to vmwgfx driver Jim Cromie
2026-02-12 0:13 ` [PATCH 51/61] drm-dyndbg: add DRM_CLASSMAP_USE to vkms driver Jim Cromie
2026-02-12 0:13 ` [PATCH 52/61] drm-dyndbg: add DRM_CLASSMAP_USE to udl driver Jim Cromie
2026-02-12 0:13 ` [PATCH 53/61] drm-dyndbg: add DRM_CLASSMAP_USE to mgag200 driver Jim Cromie
2026-02-12 0:13 ` [PATCH 54/61] drm-dyndbg: add DRM_CLASSMAP_USE to the gud driver Jim Cromie
2026-02-12 0:13 ` [PATCH 55/61] drm-dyndbg: add DRM_CLASSMAP_USE to the qxl driver Jim Cromie
2026-02-12 0:13 ` [PATCH 56/61] drm-dyndbg: add DRM_CLASSMAP_USE to the drm_gem_shmem_helper driver Jim Cromie
2026-02-12 0:13 ` [PATCH 57/61] accel: add -DDYNAMIC_DEBUG_MODULE to subdir-ccflags Jim Cromie
2026-02-12 0:13 ` Jim Cromie [this message]
2026-02-12 0:13 ` [PATCH 58/59] accel: add -DDYNAMIC_DEBUG_MODULE to subdir-cflags - RFC Jim Cromie
2026-02-12 0:13 ` [PATCH 58/61] accel/ivpu: implement IVPU_DBG_* as a dyndbg classmap Jim Cromie
2026-02-12 0:13 ` [PATCH 59/61] drm: restore CONFIG_DRM_USE_DYNAMIC_DEBUG un-BROKEN Jim Cromie
2026-02-12 0:13 ` [PATCH 60/61] accel/ethosu: enable drm.debug control Jim Cromie
2026-02-12 0:13 ` [PATCH 61/61] accel/rocket: " Jim Cromie
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=20260212001359.97296-59-jim.cromie@gmail.com \
--to=jim.cromie@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx-trybot@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox