Skip to content

Commit f6c7454

Browse files
committed
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: Jani Nikula <[email protected]> Reviewed-by: Lucas De Marchi <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Maxime Ripard <[email protected]>
1 parent 671b6c9 commit f6c7454

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

drivers/gpu/drm/display/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ config DRM_DISPLAY_DP_TUNNEL
2525
DP tunnel features like the Bandwidth Allocation mode to maximize the
2626
BW utilization for display streams on Thunderbolt links.
2727

28-
config DRM_DISPLAY_DEBUG_DP_TUNNEL_STATE
28+
config DRM_DISPLAY_DP_TUNNEL_STATE_DEBUG
2929
bool "Enable debugging the DP tunnel state"
3030
depends on REF_TRACKER
3131
depends on DRM_DISPLAY_DP_TUNNEL

drivers/gpu/drm/display/drm_dp_tunnel.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ struct drm_dp_tunnel_mgr {
191191
struct drm_dp_tunnel_group *groups;
192192
wait_queue_head_t bw_req_queue;
193193

194-
#ifdef CONFIG_DRM_DISPLAY_DEBUG_DP_TUNNEL_STATE
194+
#ifdef CONFIG_DRM_DISPLAY_DP_TUNNEL_STATE_DEBUG
195195
struct ref_tracker_dir ref_tracker;
196196
#endif
197197
};
@@ -385,7 +385,7 @@ static void tunnel_put(struct drm_dp_tunnel *tunnel)
385385
kref_put(&tunnel->kref, free_tunnel);
386386
}
387387

388-
#ifdef CONFIG_DRM_DISPLAY_DEBUG_DP_TUNNEL_STATE
388+
#ifdef CONFIG_DRM_DISPLAY_DP_TUNNEL_STATE_DEBUG
389389
static void track_tunnel_ref(struct drm_dp_tunnel *tunnel,
390390
struct ref_tracker **tracker)
391391
{
@@ -1603,7 +1603,7 @@ static void cleanup_group(struct drm_dp_tunnel_group *group)
16031603
drm_atomic_private_obj_fini(&group->base);
16041604
}
16051605

1606-
#ifdef CONFIG_DRM_DISPLAY_DEBUG_DP_TUNNEL_STATE
1606+
#ifdef CONFIG_DRM_DISPLAY_DP_TUNNEL_STATE_DEBUG
16071607
static void check_unique_stream_ids(const struct drm_dp_tunnel_group_state *group_state)
16081608
{
16091609
const struct drm_dp_tunnel_state *tunnel_state;
@@ -1881,7 +1881,7 @@ static void destroy_mgr(struct drm_dp_tunnel_mgr *mgr)
18811881
drm_WARN_ON(mgr->dev, !list_empty(&mgr->groups[i].tunnels));
18821882
}
18831883

1884-
#ifdef CONFIG_DRM_DISPLAY_DEBUG_DP_TUNNEL_STATE
1884+
#ifdef CONFIG_DRM_DISPLAY_DP_TUNNEL_STATE_DEBUG
18851885
ref_tracker_dir_exit(&mgr->ref_tracker);
18861886
#endif
18871887

@@ -1918,7 +1918,7 @@ drm_dp_tunnel_mgr_create(struct drm_device *dev, int max_group_count)
19181918
return NULL;
19191919
}
19201920

1921-
#ifdef CONFIG_DRM_DISPLAY_DEBUG_DP_TUNNEL_STATE
1921+
#ifdef CONFIG_DRM_DISPLAY_DP_TUNNEL_STATE_DEBUG
19221922
ref_tracker_dir_init(&mgr->ref_tracker, 16, "dptun");
19231923
#endif
19241924

drivers/gpu/drm/i915/Kconfig.debug

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ config DRM_I915_DEBUG
2828
select STACKDEPOT
2929
select STACKTRACE
3030
select DRM_DP_AUX_CHARDEV
31-
select DRM_DISPLAY_DEBUG_DP_TUNNEL_STATE if DRM_I915_DP_TUNNEL
31+
select DRM_DISPLAY_DP_TUNNEL_STATE_DEBUG if DRM_I915_DP_TUNNEL
3232
select X86_MSR # used by igt/pm_rpm
3333
select DRM_VGEM # used by igt/prime_vgem (dmabuf interop checks)
3434
select DRM_DEBUG_MM if DRM=y

0 commit comments

Comments
 (0)