Commit 6a99099f authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

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



Move DRM's HDCP helper library into the display/ subdirectory and add
it to DRM's display helpers. Split the header file into core and helpers.
Update all affected drivers. No functional changes.

v3:
	* fix Kconfig dependencies
v2:
	* 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-7-tzimmermann@suse.de
parent 2a64b147

Documentation/gpu/drm-kms-helpers.rst

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ Panel Self Refresh Helper Reference 
HDCP Helper Functions Reference

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



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

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

   :export:



Display Port Helper Functions Reference

drivers/gpu/drm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ obj-$(CONFIG_DRM_TTM_HELPER) += drm_ttm_helper.o 
#



drm_kms_helper-y := drm_bridge_connector.o drm_crtc_helper.o \

		drm_encoder_slave.o drm_flip_work.o drm_hdcp.o \

		drm_encoder_slave.o drm_flip_work.o \

		drm_probe_helper.o \

		drm_plane_helper.o drm_atomic_helper.o \

		drm_kms_helper_common.o \

drivers/gpu/drm/amd/display/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ config DRM_AMD_DC_DCN 
config DRM_AMD_DC_HDCP

	bool "Enable HDCP support in DC"

	depends on DRM_AMD_DC

	select DRM_DISPLAY_HDCP_HELPER

	help

	  Choose this option if you want to support HDCP authentication.

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

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
#include "amdgpu_dm.h"

#ifdef CONFIG_DRM_AMD_DC_HDCP

#include "amdgpu_dm_hdcp.h"

#include <drm/drm_hdcp.h>

#include <drm/display/drm_hdcp_helper.h>

#endif

#include "amdgpu_pm.h"

#include "amdgpu_atombios.h"

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

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include "amdgpu.h"

#include "amdgpu_dm.h"

#include "dm_helpers.h"

#include <drm/drm_hdcp.h>

#include <drm/display/drm_hdcp_helper.h>

#include "hdcp_psp.h"



/*