From nobody Tue Apr 7 12:55:32 2026 Received: from mail-oi1-f182.google.com (mail-oi1-f182.google.com [209.85.167.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 799153A63E2 for ; Fri, 13 Mar 2026 13:24:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773408254; cv=none; b=PpG/XAOy61wGC2+KZAsJkqjQKQVWmlvrIjgJopbnVFijxrAv74oYiSk7U2A7QzIzgbhyKaJJGkD/In8acv7BTULx+6gelZMy8qpX2nxt593DYen8AwEBtHBK0+VXp1ZHU9A2tqW4zHQfIkM+ltVPaRSAMhzcSFdT6p/M43zYDY0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773408254; c=relaxed/simple; bh=5YpNEAU9yD4pFs1dEI0OtOw9q7fet7iB15qvtenR1tg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NP3K2GBeRE50+dqrzDb1Dldclo2fQVzNxajIShYzjaYbbcUH3KQRlRIBi2OK2OuIkEXakgkZNplpnwHVnzqS9CqrLq5xzb6wBlyeeHOfATQEphLITIyOzw7sxbEPKn7Wwh+pmGwQ70UccwmX6FeKT5Rkj389d/vS9TGrDCA2Q94= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Rog7afNN; arc=none smtp.client-ip=209.85.167.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Rog7afNN" Received: by mail-oi1-f182.google.com with SMTP id 5614622812f47-467161c4ba7so1423855b6e.0 for ; Fri, 13 Mar 2026 06:24:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773408252; x=1774013052; darn=vger.kernel.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=Rog7afNNoFHx64+kMVogz9117D2mlmCQHG1wwJrx/6GAni+oPgZAXeA+btma9xjdgw +GWiBJVAfW5yUk6L7N6L4H/KToaPYCQ7tb8wKsJ0QBguxVKg+h2v7RCTzHexJK4VrsGg Z2U086MTZS5zcGJuF4c0KtGv8miAp7kBgddPa388JwDqfNbKYWykFar/hvqVaHNcRFtD hBqctufRqPZVMei9i58BOZtefVzHdi63KaS+5YO5DNfvrEmSvoYfur2jf7ydfNuHRoe5 j4WvR1Nlu33kWbocgu10gncAPwujUugsPdN8QxlinYrrRpTWNtcviXXFUpQV6fQkPCse vTMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773408252; x=1774013052; 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=SnOVrFRNLqk11CJa7YXeHCH05mqNBXkLOGOjsBU3y2bjmTWII/RbmUHAAWWRO9/LF8 MeL2MLNA2p21DJLZ1duUSLfOJA4Ze0FJFWAwM93eavSIwySzNMzlu1f1tdr796eisjkd yoZN+yfoXgTfcfZekSUaJQmCFpsStbNhBM/7Q3gL/Meqzgx25i1RMjqF4Hf4o97nzuDt MtNTuSFukVvI805fyB2zNoE8fGCaH1YizDtIT0PZ0CLPIfCU/2hvOOuylZHw7NQUI7g/ 3CJhUrbwFxA7NH7OgRPrF/ZHgItthRP8TxQZc0pVmHI9il2+emQqbGXmsgpfGjE8XbOa SRqQ== X-Forwarded-Encrypted: i=1; AJvYcCVqqLGdp9vdWkDaKf21JO3SeoaVu2fIUsB/FVPu6pL0IDnW6MbsWTbyUUaMTChacu1kyeLt6K8Lrm+cZmQ=@vger.kernel.org X-Gm-Message-State: AOJu0YzWO5qlK9q9vtduI4quKQx/ERf8n9c1YBsRqpVmiiqxf6qnllJU 0GJlOXJEmvbS9HiT0f5INZKE12owZuNWQE90afVsejX00emoeIarYAEC X-Gm-Gg: ATEYQzw96rbhTT4MPEiRnJkb2rgJRa5LXdHjGvVhODWxZMv9icMmYKXJlRgLa21fclu jWk0AoT9OxpZaGe+XtiVycHOj1ahCGu04lJP6WEBxE+hW20TLis8YBxbY8sVCGFDTyDJGZ9k7Gf 3QOcg6hHGet2+dQ0EpEvxy9Je2LioioGZYpZ8D1BdJFOrxwB1Fp2JiSe5djMCTcZVtYsYD4Xrn1 55E9jP8a6qDxoHG4y5C/9mE8vIpI7ypNjKYw1Jw74LJzhwW69cjiZJAaDq0mJk4TtaR1flc2UxC ckPmw/RHuYozG6LGpwDiUSxuDVcEuAdW92EP1akuHQG+Zo0QPy67XD90yHnoAA5MWDY4ZQqwrdH 6pl6navud41xB0/2YmLVkHg+NbOGxwEfKV5ye7o4uyq+pfp5iPhxgYJSP6YuLXllQKmDtFGGdOS KRNZR9NRNUMo+EzyTlowID+QhCpdSwOkH1ofC43duuvQsCfP/O X-Received: by 2002:a05:6808:14c8:b0:467:5f1:fcac with SMTP id 5614622812f47-4675552aa1cmr1830167b6e.5.1773408252422; Fri, 13 Mar 2026 06:24:12 -0700 (PDT) Received: from frodo (c-98-38-17-99.hsd1.co.comcast.net. [98.38.17.99]) by smtp.googlemail.com with ESMTPSA id 5614622812f47-4673434a35csm4795987b6e.20.2026.03.13.06.24.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2026 06:24:11 -0700 (PDT) From: Jim Cromie To: airlied@gmail.com, simona@ffwll.ch, jbaron@akamai.com, gregkh@linuxfoundation.org, Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Jim Cromie , jani.nikula@intel.com, ville.syrjala@linux.intel.com, christian.koenig@amd.com, matthew.auld@intel.com, arunpravin.paneerselvam@amd.com, louis.chauvet@bootlin.com, skhan@linuxfoundation.org, pmladek@suse.com, ukaszb@chromium.org, intel-gfx@lists.freedesktop.org, amd-gfx@lists.freedesktop.org Subject: [PATCH v11 35/65] drm-dyndbg: adapt drm core to use dyndbg classmaps-v2 Date: Fri, 13 Mar 2026 07:20:00 -0600 Message-ID: <20260313132103.2529746-36-jim.cromie@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260313132103.2529746-1-jim.cromie@gmail.com> References: <20260313132103.2529746-1-jim.cromie@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 eac= h 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"); =20 static struct ddebug_class_param drm_debug_bitmap =3D { .bits =3D &__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 }; =20 +#ifdef CONFIG_DRM_USE_DYNAMIC_DEBUG +#define DRM_CLASSMAP_DEFINE(...) DYNAMIC_DEBUG_CLASSMAP_DEFINE(__VA_ARG= S__) +#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)); --=20 2.53.0