Unverified Commit f6c74543 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/display: Make DisplayPort tunnel debug Kconfig name consistent 



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.

Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://lore.kernel.org/r/20240327-kms-kconfig-helpers-v3-2-eafee11b84b3@kernel.org


Signed-off-by: default avatarMaxime Ripard <mripard@kernel.org>
parent 671b6c9e

drivers/gpu/drm/display/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ config DRM_DISPLAY_DP_TUNNEL 
	  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

drivers/gpu/drm/display/drm_dp_tunnel.c

+5 −5
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ struct drm_dp_tunnel_mgr { 
	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

};
@@ -385,7 +385,7 @@ 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)

{
@@ -1603,7 +1603,7 @@ 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;
@@ -1881,7 +1881,7 @@ static void destroy_mgr(struct drm_dp_tunnel_mgr *mgr) 
		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
@@ -1918,7 +1918,7 @@ drm_dp_tunnel_mgr_create(struct drm_device *dev, int max_group_count) 
		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

drivers/gpu/drm/i915/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ config DRM_I915_DEBUG 
	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