From nobody Thu Apr 2 20:21:30 2026 Received: from mail-oo1-f43.google.com (mail-oo1-f43.google.com [209.85.161.43]) (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 3339342882D for ; Thu, 26 Mar 2026 18:55:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774551339; cv=none; b=muqxnw162KhSrQAJMj9rnLhObVB476tX16wduzIq2kAkR3SX3qUeS/tu8SYyAg4kDyFTyBrgagrCNVcrBYaD5mDymfSdDk/F/mfZhzEKhKeh9yLq6WbTMUykjcwFu+9iUNr7aHNZL888sVUoJoDSB+9fAqltX0p0/imWhtfcLaI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774551339; c=relaxed/simple; bh=doahK3euwSwH3hEueyi8Mitvhv84R/5qSjOPxkfWLnA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=c9vi75rH5dvZtQJ7Ev5XPISnxFQvNZNvoHbME14Db6k2K0mapvc/Jq5rYDJPMWcNuqymkXxSLXjdjr+m+Tl0IafkoE5598xdtS+aJMtboSmYo0xuyT3jyCbyk4ZjtxWWEeqVc7krBblz5A/2vwYrhp9xBGDTQaOy0ZkLzwCFu8I= 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=Gw9kEWJz; arc=none smtp.client-ip=209.85.161.43 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="Gw9kEWJz" Received: by mail-oo1-f43.google.com with SMTP id 006d021491bc7-67e0ac36d87so562493eaf.1 for ; Thu, 26 Mar 2026 11:55:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774551337; x=1775156137; 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=jaS+vAPe+o14cf01tnHTOxQ9DFEqgjCQ99ScUUNb7AU=; b=Gw9kEWJzx2WlvUf2Ici3H1f30K0jp4l3kVrDlNAPMijnYHHOPG1yqPVwVoXPhMM0Rf G+2iIah5kQye12HGDqiBs+wlEYf1F53LjWkExd+XZy3XjTJvhh+D8+CP99eyVtZlgT2N 5XWUappQ5ReTuvvBpDGzOSuN4YZhWKMDd82Apfe7/qiCeINHTIAVHXf7hw/8q9EJ0fXl WRHZrq4eyTHKJt1f2+ZNWHTrdChqJdspcrdN7+IiUO1dyj5BZ00DP8/epFbkbfOs+s7u oMZ+uNp/PrOJdte7qt9cx+P3Y2fFI2s35zstBt1vavcydTo4zeteaxqZDvsiI+L6mmr2 s3Mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774551337; x=1775156137; 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=jaS+vAPe+o14cf01tnHTOxQ9DFEqgjCQ99ScUUNb7AU=; b=Xrorpq7KfZNY3WkfEL85wu8UE5cU0tgku8DjHOCDt2VFYfniszLwWnjPgo0A1a3nho i1kiKDyz8H3XiNggxHMX9L9QWtcA/3hWdvibsNwJV4n+oY2JhGkfKPpkJOS4req5UhwJ ae36ntHO6uZYavY00qU85HLr3CRL7hlfwy/n2+MET8nHrUXsO1lwV884fx5WeQEqNKuk RNTmN6uyP8jUhoD2234Op8r8EZWhc8q8hG53bzS1KqK/+xwmuNCcUKCBAYCl/ZPcxLBj 3PzD7FSydO02bdKp2cZzXgx2gkvDusTSy227/BBR6dgkBClWaaUtCWXAQGl5ybk/843f X5fg== X-Gm-Message-State: AOJu0YzNw9k/NCCRApy5LkC+BRq4Hk4wJee2XRiQNoRXZQjtxjOluqel 1XHFlGxed8lYg6eYB5TVSUJtwSyhkBcQ0KM3YjArbqIsWmYR/D62UY7SNxTB5w== X-Gm-Gg: ATEYQzy5MyLK5AleRhqROQifJIm+8BoFl0nocqNkUFp9U0iwqJu+T6Ahny85Rk4jSep 7BHtJdN6TQyOuFizNt04x+GuRukbooUuacQRjZmC8MnY5GstLsC9f3NZn0CNg+FXdi5/HYsFCO8 c7X6MBPMcpwgCIRBtb9Ta6O5AfLjNizuJgb4fH0xqt5wtxolyH9Y34vk9D8gJ34dNED8vWcMdon I0fp8W4blz5Fcav6IpekqC5G5FsKp/u31VKUwy5xAYcuIZrMcg+YxH0+FcJP0/qt4LybyVivFcx prYrOk0o6w/0v3fjVBmYgJpHw2ajZPUZ/BmNtues87JHHz5qJwB+VOOJec/f8VdXrymsUci9Kit vC+jBqiaaOocXYNdStnt9Jv2lS1IEZcfZiHrTluiUEHXRlqE9CFrGgm8HFQYdGwNhz9oomQRQg7 jDA9fx0IP2YeIFrvnnyVzNu07ojT/T8t9ytzqSzlFptUkdQQlT X-Received: by 2002:a05:6820:338a:20b0:67e:f8c:6bcf with SMTP id 006d021491bc7-67e0f8c6db0mr1039841eaf.21.1774551337025; Thu, 26 Mar 2026 11:55:37 -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 586e51a60fabf-41cc7760c08sm3075171fac.4.2026.03.26.11.55.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2026 11:55:36 -0700 (PDT) From: Jim Cromie To: linux-kernel@vger.kernel.org, airlied@gmail.com, simona@ffwll.ch, jbaron@akamai.com, gregkh@linuxfoundation.org Cc: jim.cromie@gmail.com, mripard@kernel.org, tzimmermann@suse.de, maarten.lankhorst@linux.intel.com, 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, dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, amd-gfx@lists.freedesktop.org Subject: [PATCH v12 42/69] drm-dyndbg: adapt drm core to use dyndbg classmaps-v2 Date: Thu, 26 Mar 2026 12:53:46 -0600 Message-ID: <20260326185413.1205870-43-jim.cromie@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260326185413.1205870-1-jim.cromie@gmail.com> References: <20260326185413.1205870-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 9b622345e2eb..c0ec866f31dd 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