From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4EE5AECD6F7 for ; Thu, 12 Feb 2026 00:15:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 86D6A10E685; Thu, 12 Feb 2026 00:15:12 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hreQjwTd"; dkim-atps=neutral Received: from mail-oa1-f65.google.com (mail-oa1-f65.google.com [209.85.160.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9EB1410E688 for ; Thu, 12 Feb 2026 00:14:50 +0000 (UTC) Received: by mail-oa1-f65.google.com with SMTP id 586e51a60fabf-40945a682b5so2863757fac.1 for ; Wed, 11 Feb 2026 16:14:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770855290; x=1771460090; darn=lists.freedesktop.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ctYWbn5zpBxXKFAUFmjBfsapEiOXJnCJVZtfjZFl2eo=; b=hreQjwTdS86ijy+aDi2VTNMLTsH5xlicpAID+DrqzIQ0M5kXqNsCEpHLOshVQ559cb NKOqtLrvqLSVbRxZP5o2naCD9QOxKsc7MM99oThHhQjkoPYLohfDh07Has4NnQfclcSs TGq3GxK5OtcmzwJNrnkORJV+/SXN0mviBytMxRMqSobY0TZ/wattI6A4+p/DjIetTixU lCXUmBbh3gj8xTyxsBWjxo4vH66CB5MttOEgBA73rephSWMue/lBpKCcPOwlaBkX0Gwe H8LyD5ILsIt0I+7PsrE9j8TBD1Tlf85yY1YgWKI8If4YhZ/PJWhiN1HVqJ8I3+aNVoCa XjYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770855290; x=1771460090; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ctYWbn5zpBxXKFAUFmjBfsapEiOXJnCJVZtfjZFl2eo=; b=HlblwKr8nR9e+fsH1Ojfx9lTxqsII6xVJXoZnm8dWVobvZhLRpu/MHmgyMLX+LAPd5 FC7hrYoXBKkQ1nuxnhs0Ajs6jGgVPdN00zWC16EmuzXDSI+XZS+/lFy/Q/rdLUDWWJir TEpz1thguJBerxUEWsgGUmEnoKLvI5eKJk8zTL/MmzQNkfRbCdR4pJwGCbv/2WLOGynj /m7UfDp/mJILbIGpLUj6gO4IU+hqNBJ5yzj1nogmqhhjcZWKL3MMaPqzcT2plzm/O7A5 9jUVvR6Fb3mgpcTzPM13/WBa2++DJaYqBmVLsX2xFvPBMCunkbW0LRmvYr1kWBu63QBT x3kA== X-Gm-Message-State: AOJu0Ywns/5YXxd+HutMlk3lhk0zoIbkGaUAPdez409n0AfVAj90MG+a LS9AmUZ/SR4G96YtZ8Fg2g1v6uTFfAxh+XAtCcIUPfpVQxnlc8WJ+sUUalLzHKDb X-Gm-Gg: AZuq6aKsUFTBd0yM8Gokomh+JX4PaVTEoq/Ab9aSq8lp6tj3HfKVpW1THcG8Xp0k7oi 3ObhZUdF7AvVgak4dWomiO0kXmMqSxVMhtuJnVy+948arT7z91hiecQcgj0LDzt9FOApXsa5tg0 MKJ7hweMZYot2jrd0RRF3u6M1KMcp3ohAQCeSbO63BV+4Ljq3m7eGcX/AwOEdZSwWLJLqYdtipx CQRFYDlPPhUIOqbX6hlMxFZyRygCAr4IG+h/2lWvCjJz07EgpmP0kAQH6+wU2Wrz6B0um7WS37V hG4Stba9cA/Tk4aaq2PEiqch2T0GSSp+mMfNL+SkD+Ct0yWubvZGYuGe52gA8xu4f78O3/esRHm HqTwP4J/1YA5AU8MkrIUZpxommPONVgVTstbYn3surV98FSOxzoXgZh6PbyTxL0xRgm7OdeqVY2 wGD0VvOMz3kfjbEUHPiU2/yhc9OTw89rPTv3N9V4gmm6wpag1jtCvG X-Received: by 2002:a05:6870:41c1:b0:409:e025:a467 with SMTP id 586e51a60fabf-40ec7219f82mr524376fac.56.1770855289632; Wed, 11 Feb 2026 16:14:49 -0800 (PST) Received: from godzilla (c-98-38-17-99.hsd1.co.comcast.net. [98.38.17.99]) by smtp.googlemail.com with ESMTPSA id 586e51a60fabf-40eaf1062ffsm2331939fac.13.2026.02.11.16.14.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Feb 2026 16:14:49 -0800 (PST) From: Jim Cromie To: dri-devel@lists.freedesktop.org, intel-gfx-trybot@lists.freedesktop.org Cc: Jim Cromie , Louis Chauvet Subject: [PATCH 34/61] drm-dyndbg: adapt drm core to use dyndbg classmaps-v2 Date: Wed, 11 Feb 2026 17:13:29 -0700 Message-ID: <20260212001359.97296-35-jim.cromie@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260212001359.97296-34-jim.cromie@gmail.com> References: <20260212001359.97296-1-jim.cromie@gmail.com> <20260212001359.97296-2-jim.cromie@gmail.com> <20260212001359.97296-3-jim.cromie@gmail.com> <20260212001359.97296-4-jim.cromie@gmail.com> <20260212001359.97296-5-jim.cromie@gmail.com> <20260212001359.97296-6-jim.cromie@gmail.com> <20260212001359.97296-7-jim.cromie@gmail.com> <20260212001359.97296-8-jim.cromie@gmail.com> <20260212001359.97296-9-jim.cromie@gmail.com> <20260212001359.97296-10-jim.cromie@gmail.com> <20260212001359.97296-11-jim.cromie@gmail.com> <20260212001359.97296-12-jim.cromie@gmail.com> <20260212001359.97296-13-jim.cromie@gmail.com> <20260212001359.97296-14-jim.cromie@gmail.com> <20260212001359.97296-15-jim.cromie@gmail.com> <20260212001359.97296-16-jim.cromie@gmail.com> <20260212001359.97296-17-jim.cromie@gmail.com> <20260212001359.97296-18-jim.cromie@gmail.com> <20260212001359.97296-19-jim.cromie@gmail.com> <20260212001359.97296-20-jim.cromie@gmail.com> <20260212001359.97296-21-jim.cromie@gmail.com> <20260212001359.97296-22-jim.cromie@gmail.com> <20260212001359.97296-23-jim.cromie@gmail.com> <20260212001359.97296-24-jim.cromie@gmail.com> <20260212001359.97296-25-jim.cromie@gmail.com> <20260212001359.97296-26-jim.cromie@gmail.com> <20260212001359.97296-27-jim.cromie@gmail.com> <20260212001359.97296-28-jim.cromie@gmail.com> <20260212001359.97296-29-jim.cromie@gmail.com> <20260212001359.97296-30-jim.cromie@gmail.com> <20260212001359.97296-31-jim.cromie@gmail.com> <20260212001359.97296-32-jim.cromie@gmail.com> <20260212001359.97296-33-jim.cromie@gmail.com> <20260212001359.97296-34-jim.cromie@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" dyndbg's CLASSMAP-v1 api was broken; DECLARE_DYNDBG_CLASSMAP tried to do too much. Its replaced by DYNAMIC_DEBUG_CLASSMAP_DEFINE which creates & EXPORTs a classmap, and DYNAMIC_DEBUG_CLASSMAP_USE which refers to that exported classmap, creating a module dependency. DRM gets DRM_CLASSMAP_* wrappers to hide the DRM_USE_DYNAMIC_DEBUG ifdef. The drivers still use DECLARE_DYNDBG_CLASSMAP for now, so they still redundantly re-declare the classmap, but we can convert the drivers later to DYNDBG_CLASSMAP_USE, at which point they'll respond to the echo class FOO >control commands. Signed-off-by: Jim Cromie Reviewed-by: Louis Chauvet --- this ignored a checkpatch WARNING: Argument 'name' is not used in function-like macro #70: FILE: include/drm/drm_print.h:148: +#define DRM_CLASSMAP_USE(name) the macro is empty, and correct. only 1 arg is expected. v++: fix old CLASSBITS/CLASSMAP comment --- drivers/gpu/drm/drm_print.c | 25 +++++++++++++------------ include/drm/drm_print.h | 13 ++++++++++++- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c index ded9461df5f2..d07e7953c9fc 100644 --- a/drivers/gpu/drm/drm_print.c +++ b/drivers/gpu/drm/drm_print.c @@ -56,18 +56,19 @@ MODULE_PARM_DESC(debug, "Enable debug output, where each bit enables a debug cat #if !defined(CONFIG_DRM_USE_DYNAMIC_DEBUG) module_param_named(debug, __drm_debug, ulong, 0600); #else -/* classnames must match vals of enum drm_debug_category */ -DECLARE_DYNDBG_CLASSMAP(drm_debug_classes, DD_CLASS_TYPE_DISJOINT_BITS, 0, - "DRM_UT_CORE", - "DRM_UT_DRIVER", - "DRM_UT_KMS", - "DRM_UT_PRIME", - "DRM_UT_ATOMIC", - "DRM_UT_VBL", - "DRM_UT_STATE", - "DRM_UT_LEASE", - "DRM_UT_DP", - "DRM_UT_DRMRES"); +/* classnames must match value-symbols of enum drm_debug_category */ +DRM_CLASSMAP_DEFINE(drm_debug_classes, DD_CLASS_TYPE_DISJOINT_BITS, + DRM_UT_CORE, + "DRM_UT_CORE", + "DRM_UT_DRIVER", + "DRM_UT_KMS", + "DRM_UT_PRIME", + "DRM_UT_ATOMIC", + "DRM_UT_VBL", + "DRM_UT_STATE", + "DRM_UT_LEASE", + "DRM_UT_DP", + "DRM_UT_DRMRES"); static struct ddebug_class_param drm_debug_bitmap = { .bits = &__drm_debug, diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h index ab017b05e175..b743ee3f8f5e 100644 --- a/include/drm/drm_print.h +++ b/include/drm/drm_print.h @@ -96,7 +96,10 @@ extern unsigned long __drm_debug; * */ enum drm_debug_category { - /* These names must match those in DYNAMIC_DEBUG_CLASSBITS */ + /* + * These enum-names are reused in DRM_CLASSMAP_DEFINE to + * expose them as classes in /proc/dynamic_debug/control + */ /** * @DRM_UT_CORE: Used in the generic drm code: drm_ioctl.c, drm_mm.c, * drm_memory.c, ... @@ -141,6 +144,14 @@ enum drm_debug_category { DRM_UT_DRMRES }; +#ifdef CONFIG_DRM_USE_DYNAMIC_DEBUG +#define DRM_CLASSMAP_DEFINE(...) DYNAMIC_DEBUG_CLASSMAP_DEFINE(__VA_ARGS__) +#define DRM_CLASSMAP_USE(name) DYNAMIC_DEBUG_CLASSMAP_USE(name) +#else +#define DRM_CLASSMAP_DEFINE(...) +#define DRM_CLASSMAP_USE(name) +#endif + static inline bool drm_debug_enabled_raw(enum drm_debug_category category) { return unlikely(__drm_debug & BIT(category)); -- 2.53.0