From patchwork Mon Mar 25 12:52:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 13602047 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 1CD53C54E64 for ; Mon, 25 Mar 2024 12:52:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6729B10E846; Mon, 25 Mar 2024 12:52:27 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="FtlAydSq"; dkim-atps=neutral Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by gabe.freedesktop.org (Postfix) with ESMTPS id 374BE10E846 for ; Mon, 25 Mar 2024 12:52:26 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id B7F21CE17E2; Mon, 25 Mar 2024 12:52:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A0612C433F1; Mon, 25 Mar 2024 12:52:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711371142; bh=i2Tyc1b13pVs3fjhESYVAvccxk8BcG5KRMtAAH5glbY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=FtlAydSqKUFP5oE8UYheYvlaBaUH1AGCmFPAtUx2HdwjiHTAeFAzSTjeQfF91gjIb d8ExugUk+FaEH03P7y3y90wOHqzmyh4sy3IVx3jInLsGZWlzHFFEfFopKkRJ8JNinq xXYgVVLfeOxun4vGZXDqHpFf7Y2koOD/rHmirx0r0HkOmtz2rDPVrKsR3ntmFJigw6 xaeeplfE0zLdEbjq0x3J/Z5iAWf5SYhgusHPZKHCxN79oZlurcDwSTQYb/+0eSh9Fw yTyQ273P1Zr8C2Ks3k8y7X9BgqeXDE6nI1b1R20y6Wwuy7h0eL0O90WVePUSi1emcv +bbaCMR+kv1nA== From: Maxime Ripard Date: Mon, 25 Mar 2024 13:52:04 +0100 Subject: [PATCH 02/12] drm/display: Make DisplayPort tunnel debug Kconfig name consistent MIME-Version: 1.0 Message-Id: <20240325-kms-kconfig-helpers-v1-2-bfec6949d9c3@kernel.org> References: <20240325-kms-kconfig-helpers-v1-0-bfec6949d9c3@kernel.org> In-Reply-To: <20240325-kms-kconfig-helpers-v1-0-bfec6949d9c3@kernel.org> To: Maarten Lankhorst , Thomas Zimmermann , David Airlie , Daniel Vetter Cc: Jani Nikula , dri-devel@lists.freedesktop.org, Maxime Ripard X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=4290; i=mripard@kernel.org; h=from:subject:message-id; bh=i2Tyc1b13pVs3fjhESYVAvccxk8BcG5KRMtAAH5glbY=; b=owGbwMvMwCmsHn9OcpHtvjLG02pJDGmMxeWR5jMTVff+Eo+bn+O8U+m41c+pW9Z4mnY37XzG+ tPsz5ljHVNZGIQ5GWTFFFmeyISdXt6+uMrBfuUPmDmsTCBDGLg4BWAivGqMDZ/XZmbO7C3ZoWw/ XfEDx2L9STLVZde+PhRntTt8+dVyjusRu+3y2zudO9LWXLLdvUfsJWOdzbOlnpsTm5fsZle8826 P1cuLOjOmM+gLH/tepvpeNzT718TugL2XFP5fb5aSXrJ0yve3AA== X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D 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" While most display helpers Kconfig symbols have the DRM_DISPLAY prefix, the DisplayPort Tunnel debugging uses DRM_DISPLAY_DEBUG_DP_TUNNEL_STATE. Since the number of users is limited and it's a selected symbol, we can easily rename it to make it consistent. Signed-off-by: Maxime Ripard --- drivers/gpu/drm/display/Kconfig | 2 +- drivers/gpu/drm/display/drm_dp_tunnel.c | 10 +++++----- drivers/gpu/drm/i915/Kconfig.debug | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/display/Kconfig b/drivers/gpu/drm/display/Kconfig index 843d74db1dce..0d350e9db807 100644 --- a/drivers/gpu/drm/display/Kconfig +++ b/drivers/gpu/drm/display/Kconfig @@ -23,11 +23,11 @@ config DRM_DISPLAY_DP_TUNNEL help Enable support for DisplayPort tunnels. This allows drivers to use DP tunnel features like the Bandwidth Allocation mode to maximize the BW utilization for display streams on Thunderbolt links. -config DRM_DISPLAY_DEBUG_DP_TUNNEL_STATE +config DRM_DISPLAY_DP_TUNNEL_STATE_DEBUG bool "Enable debugging the DP tunnel state" depends on REF_TRACKER depends on DRM_DISPLAY_DP_TUNNEL depends on DEBUG_KERNEL depends on EXPERT diff --git a/drivers/gpu/drm/display/drm_dp_tunnel.c b/drivers/gpu/drm/display/drm_dp_tunnel.c index 120e0de674c1..2a91e9b11d03 100644 --- a/drivers/gpu/drm/display/drm_dp_tunnel.c +++ b/drivers/gpu/drm/display/drm_dp_tunnel.c @@ -189,11 +189,11 @@ struct drm_dp_tunnel_mgr { int group_count; struct drm_dp_tunnel_group *groups; wait_queue_head_t bw_req_queue; -#ifdef CONFIG_DRM_DISPLAY_DEBUG_DP_TUNNEL_STATE +#ifdef CONFIG_DRM_DISPLAY_DP_TUNNEL_STATE_DEBUG struct ref_tracker_dir ref_tracker; #endif }; /* @@ -383,11 +383,11 @@ static void free_tunnel(struct kref *kref) static void tunnel_put(struct drm_dp_tunnel *tunnel) { kref_put(&tunnel->kref, free_tunnel); } -#ifdef CONFIG_DRM_DISPLAY_DEBUG_DP_TUNNEL_STATE +#ifdef CONFIG_DRM_DISPLAY_DP_TUNNEL_STATE_DEBUG static void track_tunnel_ref(struct drm_dp_tunnel *tunnel, struct ref_tracker **tracker) { ref_tracker_alloc(&tunnel->group->mgr->ref_tracker, tracker, GFP_KERNEL); @@ -1601,11 +1601,11 @@ static bool init_group(struct drm_dp_tunnel_mgr *mgr, struct drm_dp_tunnel_group static void cleanup_group(struct drm_dp_tunnel_group *group) { drm_atomic_private_obj_fini(&group->base); } -#ifdef CONFIG_DRM_DISPLAY_DEBUG_DP_TUNNEL_STATE +#ifdef CONFIG_DRM_DISPLAY_DP_TUNNEL_STATE_DEBUG static void check_unique_stream_ids(const struct drm_dp_tunnel_group_state *group_state) { const struct drm_dp_tunnel_state *tunnel_state; u32 stream_mask = 0; @@ -1879,11 +1879,11 @@ static void destroy_mgr(struct drm_dp_tunnel_mgr *mgr) for (i = 0; i < mgr->group_count; i++) { cleanup_group(&mgr->groups[i]); drm_WARN_ON(mgr->dev, !list_empty(&mgr->groups[i].tunnels)); } -#ifdef CONFIG_DRM_DISPLAY_DEBUG_DP_TUNNEL_STATE +#ifdef CONFIG_DRM_DISPLAY_DP_TUNNEL_STATE_DEBUG ref_tracker_dir_exit(&mgr->ref_tracker); #endif kfree(mgr->groups); kfree(mgr); @@ -1916,11 +1916,11 @@ drm_dp_tunnel_mgr_create(struct drm_device *dev, int max_group_count) kfree(mgr); return NULL; } -#ifdef CONFIG_DRM_DISPLAY_DEBUG_DP_TUNNEL_STATE +#ifdef CONFIG_DRM_DISPLAY_DP_TUNNEL_STATE_DEBUG ref_tracker_dir_init(&mgr->ref_tracker, 16, "dptun"); #endif for (i = 0; i < max_group_count; i++) { if (!init_group(mgr, &mgr->groups[i])) { diff --git a/drivers/gpu/drm/i915/Kconfig.debug b/drivers/gpu/drm/i915/Kconfig.debug index bc18e2d9ea05..5ae02c1cd25c 100644 --- a/drivers/gpu/drm/i915/Kconfig.debug +++ b/drivers/gpu/drm/i915/Kconfig.debug @@ -26,11 +26,11 @@ config DRM_I915_DEBUG select I2C_CHARDEV select REF_TRACKER select STACKDEPOT select STACKTRACE select DRM_DP_AUX_CHARDEV - select DRM_DISPLAY_DEBUG_DP_TUNNEL_STATE if DRM_I915_DP_TUNNEL + select DRM_DISPLAY_DP_TUNNEL_STATE_DEBUG if DRM_I915_DP_TUNNEL select X86_MSR # used by igt/pm_rpm select DRM_VGEM # used by igt/prime_vgem (dmabuf interop checks) select DRM_DEBUG_MM if DRM=y select DRM_EXPORT_FOR_TESTS if m select DRM_DEBUG_SELFTEST