Skip to content

Commit 4d66d84

Browse files
committed
drm/display: Make DisplayPort AUX Chardev Kconfig name consistent
While most display helpers Kconfig symbols have the DRM_DISPLAY prefix, the DisplayPort-AUX chardev interface uses DRM_DP_AUX_CHARDEV. 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 f6c7454 commit 4d66d84

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

drivers/gpu/drm/display/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ config DRM_DISPLAY_HDMI_HELPER
5050
help
5151
DRM display helpers for HDMI.
5252

53-
config DRM_DP_AUX_CHARDEV
53+
config DRM_DISPLAY_DP_AUX_CHARDEV
5454
bool "DRM DP AUX Interface"
5555
depends on DRM && DRM_DISPLAY_HELPER
5656
select DRM_DISPLAY_DP_HELPER

drivers/gpu/drm/display/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ drm_display_helper-$(CONFIG_DRM_DISPLAY_HDCP_HELPER) += drm_hdcp_helper.o
1414
drm_display_helper-$(CONFIG_DRM_DISPLAY_HDMI_HELPER) += \
1515
drm_hdmi_helper.o \
1616
drm_scdc_helper.o
17-
drm_display_helper-$(CONFIG_DRM_DP_AUX_CHARDEV) += drm_dp_aux_dev.o
17+
drm_display_helper-$(CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV) += drm_dp_aux_dev.o
1818
drm_display_helper-$(CONFIG_DRM_DP_CEC) += drm_dp_cec.o
1919

2020
obj-$(CONFIG_DRM_DISPLAY_HELPER) += drm_display_helper.o

drivers/gpu/drm/display/drm_dp_helper.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2113,7 +2113,7 @@ EXPORT_SYMBOL(drm_dp_aux_init);
21132113
* drm_dp_aux_register() in &drm_connector_funcs.late_register, and likewise to
21142114
* call drm_dp_aux_unregister() in &drm_connector_funcs.early_unregister.
21152115
* Functions which don't follow this will likely Oops when
2116-
* %CONFIG_DRM_DP_AUX_CHARDEV is enabled.
2116+
* %CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is enabled.
21172117
*
21182118
* For devices where the AUX channel is a device that exists independently of
21192119
* the &drm_device that uses it, such as SoCs and bridge devices, it is

drivers/gpu/drm/display/drm_dp_helper_internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
struct drm_dp_aux;
77

8-
#ifdef CONFIG_DRM_DP_AUX_CHARDEV
8+
#ifdef CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV
99
int drm_dp_aux_dev_init(void);
1010
void drm_dp_aux_dev_exit(void);
1111
int drm_dp_aux_register_devnode(struct drm_dp_aux *aux);

drivers/gpu/drm/i915/Kconfig.debug

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ config DRM_I915_DEBUG
2727
select REF_TRACKER
2828
select STACKDEPOT
2929
select STACKTRACE
30-
select DRM_DP_AUX_CHARDEV
30+
select DRM_DISPLAY_DP_AUX_CHARDEV
3131
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)

0 commit comments

Comments
 (0)