Unverified Commit 4d66d841 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

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: 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-3-eafee11b84b3@kernel.org


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

drivers/gpu/drm/display/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ config DRM_DISPLAY_HDMI_HELPER 
	help

	  DRM display helpers for HDMI.



config DRM_DP_AUX_CHARDEV

config DRM_DISPLAY_DP_AUX_CHARDEV

	bool "DRM DP AUX Interface"

	depends on DRM && DRM_DISPLAY_HELPER

	select DRM_DISPLAY_DP_HELPER

drivers/gpu/drm/display/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ drm_display_helper-$(CONFIG_DRM_DISPLAY_HDCP_HELPER) += drm_hdcp_helper.o 
drm_display_helper-$(CONFIG_DRM_DISPLAY_HDMI_HELPER) += \

	drm_hdmi_helper.o \

	drm_scdc_helper.o

drm_display_helper-$(CONFIG_DRM_DP_AUX_CHARDEV) += drm_dp_aux_dev.o

drm_display_helper-$(CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV) += drm_dp_aux_dev.o

drm_display_helper-$(CONFIG_DRM_DP_CEC) += drm_dp_cec.o



obj-$(CONFIG_DRM_DISPLAY_HELPER) += drm_display_helper.o

drivers/gpu/drm/display/drm_dp_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -2113,7 +2113,7 @@ EXPORT_SYMBOL(drm_dp_aux_init); 
 * drm_dp_aux_register() in &drm_connector_funcs.late_register, and likewise to

 * call drm_dp_aux_unregister() in &drm_connector_funcs.early_unregister.

 * Functions which don't follow this will likely Oops when

 * %CONFIG_DRM_DP_AUX_CHARDEV is enabled.

 * %CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV is enabled.

 *

 * For devices where the AUX channel is a device that exists independently of

 * the &drm_device that uses it, such as SoCs and bridge devices, it is

drivers/gpu/drm/display/drm_dp_helper_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


struct drm_dp_aux;



#ifdef CONFIG_DRM_DP_AUX_CHARDEV

#ifdef CONFIG_DRM_DISPLAY_DP_AUX_CHARDEV

int drm_dp_aux_dev_init(void);

void drm_dp_aux_dev_exit(void);

int drm_dp_aux_register_devnode(struct drm_dp_aux *aux);

drivers/gpu/drm/i915/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ config DRM_I915_DEBUG 
	select REF_TRACKER

	select STACKDEPOT

	select STACKTRACE

	select DRM_DP_AUX_CHARDEV

	select DRM_DISPLAY_DP_AUX_CHARDEV

	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)