From nobody Tue Feb 10 04:03:08 2026 Received: from mail-io1-f41.google.com (mail-io1-f41.google.com [209.85.166.41]) (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 7D856215F56 for ; Sat, 25 Jan 2025 06:47:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737787644; cv=none; b=SYBDdnTtXGwRxA6OPlt3+CXdewpajjAMG5PLnk+FdM/JwNVyj1QMXVytSatjmJEVJ09pstjx68+SyAVti5HtiZBhOHqiKkn30O1l9RzXIr6SKnobABbhGygo5Eb0RnMYsOJWLRTIVv66ZPOxol/2XzFDe/KKaYmSI1fOSRtG9is= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737787644; c=relaxed/simple; bh=xxIZY+fJIyYPzMEKPuqRGcLjcSrnEj0Z8rlD/3fw0+8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WPCOL42R9c8AsUBxQcf0dzQsB6IOOsq2uXSfeR3cgNaPUuGdk/0xbKVOkmi2hD7ERrFzMLgcX66TGzC7i0wC/3uKOYyChkt92xTnC3w4BduCDVLsTfW6dpto2AMBhqy3UK4ZnsbZIiDGT4/aeJbu49ZeO1A+L0PnPMP7P4jYVQs= 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=SCqUg/rt; arc=none smtp.client-ip=209.85.166.41 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="SCqUg/rt" Received: by mail-io1-f41.google.com with SMTP id ca18e2360f4ac-844ce6d0716so215113039f.1 for ; Fri, 24 Jan 2025 22:47:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737787641; x=1738392441; 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=28x5d6xbEGUAT7PLrsu8ZHGSSAEZicMzeP2EW9a2UNQ=; b=SCqUg/rtEBpTW7BQnn+q9oyfIANLLJ/MbrEB3LLTZwrmcSW2TpYdJQRFdBLAQ7rQI4 wVyUhgEXEO0ym/BPMSfxQQhF3ewRdkTe9cl2dAx+qyp4OBjQ6NjgjGXoZTIBqGpaEDNP hod0rk6tM2hZWss1eeBLnvczu/P2qnZuHzXhy1gAyAB7mUQmUaDVOBnQBjniEmvsfkga ErGEURWcAETbfdsWvtretnFqBQUuZMX+l8Zfrdf9ANbcRFoCGv3AVGwFVgY9VVq318Zo pvPWMxQMnYsbjRv32Ttw9m/Mblpk8mghYNu/CN0LJjgtihO9dHjZTz7UgeusFKtpL+RE vH4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737787641; x=1738392441; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=28x5d6xbEGUAT7PLrsu8ZHGSSAEZicMzeP2EW9a2UNQ=; b=nLprm6uwGF+L2AGFwdbxUTSdgLl0gpdlbvmOcnh/1XapUuir7SEOSp+9GxhvVPqdEW j4ldkQI+Ch177FR0aRlwy/KbBQMLGtkWFqddQPXPCPyqtl7FaVgrJwmHzIs5OP7NzNWd F5gsHLj8m+0oSh9zjZlFnakeJmr0ncNnG1GddI7ZxjT8spGmjsjOqBJufYTp75leGVic yqYi8hCXyAWDyHgFjSgEauI8SfdG2A1YPmu78tuURML++r5R9tjs5y0Xrkuapq+tPy8d C5fc2rPaqVAporN7TSOc8cviAGdhq1jEarWEIBJJieVkinz0UqM7HyszHwNPm/4FheZf FEVw== X-Gm-Message-State: AOJu0Yzuvs86sh/GpOT77erEYB+jmPG/JDITFs7QsV0+45JFk6Mms6AQ lyYwSkoHWMgABauDAs5xFySpNu7viKVw7T9SvvdF8X0sgWn1KygYyQaocg== X-Gm-Gg: ASbGnct9GNaH7wWv4z5CgSHvSoWLBt+ZbL2xbgOFIhl5wCo/PrAxt7naSMRZs/GtskE ln8TMxsu/UEptppPZq+LRSR6gQtfqiLOWMLXsvaMoUjSjOar5OkJMn+KsmgN7xadkH+cT5+e3S4 PHn6j66CJmOrya01t4nSFtZpou0mwishm+W3/tnowyg5RBCyzjaQzn1gCDXLXvlE8WoS1C/ZLRa tb3vJD/ZqDME4WRZWnL77SYr8LGzYkrxhry3hEYGsrjDhGtXNmKLaV9pe//JbKS60XmzAGTBAy1 rUiaKcRKqi/6FAVqN5QPC0DkcTHPVhuQ9IqnPw== X-Google-Smtp-Source: AGHT+IEMKrFEKpi5SUwkWWCosuXW3ioEVtU6ebYP4sTFzqjXc9Cj2di/duqbptCHxcYLBwKuqsDHFg== X-Received: by 2002:a05:6602:2d91:b0:835:4cb5:4fa7 with SMTP id ca18e2360f4ac-851b62b1c79mr3161244539f.12.1737787641477; Fri, 24 Jan 2025 22:47:21 -0800 (PST) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id 8926c6da1cb9f-4ec1da476fesm1174144173.58.2025.01.24.22.47.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jan 2025 22:47:21 -0800 (PST) From: Jim Cromie To: linux-kernel@vger.kernel.org, jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org Cc: intel-gfx-trybot@lists.freedesktop.org, dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, intel-gvt-dev@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, daniel.vetter@ffwll.ch, tvrtko.ursulin@linux.intel.com, jani.nikula@intel.com, ville.syrjala@linux.intel.com, Jim Cromie Subject: [PATCH 41/63] drm-dyndbg: adapt drm core to use dyndbg classmaps-v2 Date: Fri, 24 Jan 2025 23:45:55 -0700 Message-ID: <20250125064619.8305-42-jim.cromie@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250125064619.8305-1-jim.cromie@gmail.com> References: <20250125064619.8305-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 DRM_CLASSMAP_DEFINE, which creates & EXPORTs a classmap (in DRM core), and DRM_CLASSMAP_USE which refers to the classmap defined elsewhere. 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 Signed-off-by: Jim Cromie --- this ignores 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. --- drivers/gpu/drm/drm_print.c | 25 +++++++++++++------------ include/drm/drm_print.h | 8 ++++++++ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c index 08cfea04e22b..8f7b2aed81ce 100644 --- a/drivers/gpu/drm/drm_print.c +++ b/drivers/gpu/drm/drm_print.c @@ -55,18 +55,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 b3906dc04388..46aa1bcee1a2 100644 --- a/include/drm/drm_print.h +++ b/include/drm/drm_print.h @@ -140,6 +140,14 @@ enum drm_debug_category { DRM_UT_DRMRES }; =20 +#ifdef CONFIG_DRM_USE_DYNAMIC_DEBUG +#define DRM_CLASSMAP_DEFINE(...) DYNDBG_CLASSMAP_DEFINE(__VA_ARGS__) +#define DRM_CLASSMAP_USE(name) DYNDBG_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.48.1