Commit 4fc8cb47 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/display: Move HDMI helpers into display-helper module 



Move DRM's HMDI helpers into the display/ subdirectoy and add it
to DRM's display helpers. Update all affected drivers. No functional
changes.

The HDMI helpers were implemented in the EDID and connector code, but
are actually unrelated. With the move to the display-helper library, we
can remove the dependency on drm_edid.{c,h} in some driver's HDMI source
files.

Several of the HDMI helpers remain in EDID code because both share parts
of their implementation internally. With better refractoring of the EDID
code, those HDMI helpers could be moved into the display-helper library
as well.

v3:
	* fix Kconfig dependencies (Javier)
v2:
	* reduce HDMI helpers to avoid exporting functions (Jani)
	* fix include statements (Jani, Javier)
	* update Kconfig symbols

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220421073108.19226-8-tzimmermann@suse.de
parent 6a99099f

drivers/gpu/drm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -246,6 +246,7 @@ config DRM_AMDGPU 
	depends on DRM && PCI && MMU

	select FW_LOADER

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HDMI_HELPER

	select DRM_DISPLAY_HELPER

	select DRM_KMS_HELPER

	select DRM_SCHED

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ 
#include <linux/component.h>



#include <drm/display/drm_dp_mst_helper.h>

#include <drm/display/drm_hdmi_helper.h>

#include <drm/drm_atomic.h>

#include <drm/drm_atomic_uapi.h>

#include <drm/drm_atomic_helper.h>

drivers/gpu/drm/bridge/synopsys/Kconfig

+2 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

config DRM_DW_HDMI

	tristate

	select DRM_DISPLAY_HDMI_HELPER

	select DRM_DISPLAY_HELPER

	select DRM_KMS_HELPER

	select REGMAP_MMIO

	select CEC_CORE if CEC_NOTIFIER

drivers/gpu/drm/bridge/synopsys/dw-hdmi.c

+1 −1
Original line number Diff line number Diff line
@@ -25,10 +25,10 @@ 
#include <uapi/linux/videodev2.h>



#include <drm/bridge/dw_hdmi.h>

#include <drm/display/drm_hdmi_helper.h>

#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_bridge.h>

#include <drm/drm_edid.h>

#include <drm/drm_of.h>

#include <drm/drm_print.h>

#include <drm/drm_probe_helper.h>

drivers/gpu/drm/display/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -23,6 +23,12 @@ config DRM_DISPLAY_HDCP_HELPER 
	help

	  DRM display helpers for HDCP.



config DRM_DISPLAY_HDMI_HELPER

	bool

	depends on DRM_DISPLAY_HELPER

	help

	  DRM display helpers for HDMI.



config DRM_DP_AUX_CHARDEV

	bool "DRM DP AUX Interface"

	depends on DRM