Commit 644edf52 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/display: Move SCDC helpers into display-helper library 



SCDC is the Status and Control Data Channel for HDMI. Move the SCDC
helpers into display/ and split the header into files for core and
helpers. Update all affected drivers. No functional changes.

To avoid the proliferation of Kconfig options, SCDC is part of DRM's
support for HDMI. If necessary, a new option could make SCDC an
independent feature.

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-9-tzimmermann@suse.de
parent 4fc8cb47

Documentation/gpu/drm-kms-helpers.rst

+3 −3
Original line number Diff line number Diff line
@@ -356,13 +356,13 @@ EDID Helper Functions Reference 
SCDC Helper Functions Reference

===============================



.. kernel-doc:: drivers/gpu/drm/drm_scdc_helper.c

.. kernel-doc:: drivers/gpu/drm/display/drm_scdc_helper.c

   :doc: scdc helpers



.. kernel-doc:: include/drm/drm_scdc_helper.h

.. kernel-doc:: include/drm/display/drm_scdc_helper.h

   :internal:



.. kernel-doc:: drivers/gpu/drm/drm_scdc_helper.c

.. kernel-doc:: drivers/gpu/drm/display/drm_scdc_helper.c

   :export:



HDMI Infoframes Helper Reference

drivers/gpu/drm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ drm_kms_helper-y := drm_bridge_connector.o drm_crtc_helper.o \ 
		drm_plane_helper.o drm_atomic_helper.o \

		drm_kms_helper_common.o \

		drm_simple_kms_helper.o drm_modeset_helper.o \

		drm_scdc_helper.o drm_gem_atomic_helper.o \

		drm_gem_atomic_helper.o \

		drm_gem_framebuffer_helper.o \

		drm_atomic_state_helper.o drm_damage_helper.o \

		drm_format_helper.o drm_self_refresh_helper.o drm_rect.o

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

+1 −1
Original line number Diff line number Diff line
@@ -26,13 +26,13 @@ 


#include <drm/bridge/dw_hdmi.h>

#include <drm/display/drm_hdmi_helper.h>

#include <drm/display/drm_scdc_helper.h>

#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_bridge.h>

#include <drm/drm_of.h>

#include <drm/drm_print.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_scdc_helper.h>



#include "dw-hdmi-audio.h"

#include "dw-hdmi-cec.h"

drivers/gpu/drm/display/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ drm_display_helper-$(CONFIG_DRM_DISPLAY_DP_HELPER) += drm_dp_dual_mode_helper.o 
						      drm_dp_mst_topology.o \

						      drm_dsc_helper.o

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_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_DP_CEC) += drm_dp_cec.o

drivers/gpu/drm/drm_scdc_helper.c→drivers/gpu/drm/display/drm_scdc_helper.c

+2 −1
Original line number Diff line number Diff line
@@ -21,11 +21,12 @@ 
 * DEALINGS IN THE SOFTWARE.

 */



#include <linux/i2c.h>

#include <linux/slab.h>

#include <linux/delay.h>



#include <drm/display/drm_scdc_helper.h>

#include <drm/drm_print.h>

#include <drm/drm_scdc_helper.h>



/**

 * DOC: scdc helpers