Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <jani.nikula@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://lore.kernel.org/r/20240327-kms-kconfig-helpers-v3-3-eafee11b84b3@kernel.org
Signed-off-by: Maxime Ripard <mripard@kernel.org>

+5 -5
+1 -1
drivers/gpu/drm/display/Kconfig
··· 50 50 help 51 51 DRM display helpers for HDMI. 52 52 53 - config DRM_DP_AUX_CHARDEV 53 + config DRM_DISPLAY_DP_AUX_CHARDEV 54 54 bool "DRM DP AUX Interface" 55 55 depends on DRM && DRM_DISPLAY_HELPER 56 56 select DRM_DISPLAY_DP_HELPER
+1 -1
drivers/gpu/drm/display/Makefile
··· 14 14 drm_display_helper-$(CONFIG_DRM_DISPLAY_HDMI_HELPER) += \ 15 15 drm_hdmi_helper.o \ 16 16 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 18 18 drm_display_helper-$(CONFIG_DRM_DP_CEC) += drm_dp_cec.o 19 19 20 20 obj-$(CONFIG_DRM_DISPLAY_HELPER) += drm_display_helper.o
+1 -1
drivers/gpu/drm/display/drm_dp_helper.c
··· 2113 2113 * drm_dp_aux_register() in &drm_connector_funcs.late_register, and likewise to 2114 2114 * call drm_dp_aux_unregister() in &drm_connector_funcs.early_unregister. 2115 2115 * 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. 2117 2117 * 2118 2118 * For devices where the AUX channel is a device that exists independently of 2119 2119 * the &drm_device that uses it, such as SoCs and bridge devices, it is
+1 -1
drivers/gpu/drm/display/drm_dp_helper_internal.h
··· 5 5 6 6 struct drm_dp_aux; 7 7 8 - #ifdef CONFIG_DRM_DP_AUX_CHARDEV 8 + #ifdef CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV 9 9 int drm_dp_aux_dev_init(void); 10 10 void drm_dp_aux_dev_exit(void); 11 11 int drm_dp_aux_register_devnode(struct drm_dp_aux *aux);
+1 -1
drivers/gpu/drm/i915/Kconfig.debug
··· 27 27 select REF_TRACKER 28 28 select STACKDEPOT 29 29 select STACKTRACE 30 - select DRM_DP_AUX_CHARDEV 30 + select DRM_DISPLAY_DP_AUX_CHARDEV 31 31 select DRM_DISPLAY_DP_TUNNEL_STATE_DEBUG if DRM_I915_DP_TUNNEL 32 32 select X86_MSR # used by igt/pm_rpm 33 33 select DRM_VGEM # used by igt/prime_vgem (dmabuf interop checks)