Skip to content

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

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
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 30 deletions
Documentation/gpu/drm-kms-helpers.rst
View file @ 6a99099f
...@@ -226,7 +226,7 @@ Panel Self Refresh Helper Reference ...@@ -226,7 +226,7 @@ Panel Self Refresh Helper Reference
HDCP Helper Functions Reference HDCP Helper Functions Reference
=============================== ===============================
.. kernel-doc:: drivers/gpu/drm/drm_hdcp.c .. kernel-doc:: drivers/gpu/drm/display/drm_hdcp_helper.c
:export: :export:
Display Port Helper Functions Reference Display Port Helper Functions Reference
......
drivers/gpu/drm/Makefile
View file @ 6a99099f
...@@ -58,7 +58,7 @@ obj-$(CONFIG_DRM_TTM_HELPER) += drm_ttm_helper.o ...@@ -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_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_probe_helper.o \
drm_plane_helper.o drm_atomic_helper.o \ drm_plane_helper.o drm_atomic_helper.o \
drm_kms_helper_common.o \ drm_kms_helper_common.o \
......
drivers/gpu/drm/amd/display/Kconfig
View file @ 6a99099f
...@@ -20,6 +20,7 @@ config DRM_AMD_DC_DCN ...@@ -20,6 +20,7 @@ config DRM_AMD_DC_DCN
config DRM_AMD_DC_HDCP config DRM_AMD_DC_HDCP
bool "Enable HDCP support in DC" bool "Enable HDCP support in DC"
depends on DRM_AMD_DC depends on DRM_AMD_DC
select DRM_DISPLAY_HDCP_HELPER
help help
Choose this option if you want to support HDCP authentication. Choose this option if you want to support HDCP authentication.
......
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
View file @ 6a99099f
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
#include "amdgpu_dm.h" #include "amdgpu_dm.h"
#ifdef CONFIG_DRM_AMD_DC_HDCP #ifdef CONFIG_DRM_AMD_DC_HDCP
#include "amdgpu_dm_hdcp.h" #include "amdgpu_dm_hdcp.h"
#include <drm/drm_hdcp.h> #include <drm/display/drm_hdcp_helper.h>
#endif #endif
#include "amdgpu_pm.h" #include "amdgpu_pm.h"
#include "amdgpu_atombios.h" #include "amdgpu_atombios.h"
......
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c
View file @ 6a99099f
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "amdgpu.h" #include "amdgpu.h"
#include "amdgpu_dm.h" #include "amdgpu_dm.h"
#include "dm_helpers.h" #include "dm_helpers.h"
#include <drm/drm_hdcp.h> #include <drm/display/drm_hdcp_helper.h>
#include "hdcp_psp.h" #include "hdcp_psp.h"
/* /*
......
drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h
View file @ 6a99099f
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "hdcp_log.h" #include "hdcp_log.h"
#include <drm/display/drm_dp_helper.h> #include <drm/display/drm_dp_helper.h>
#include <drm/drm_hdcp.h> #include <drm/display/drm_hdcp_helper.h>
enum mod_hdcp_trans_input_result { enum mod_hdcp_trans_input_result {
UNKNOWN = 0, UNKNOWN = 0,
......
drivers/gpu/drm/bridge/Kconfig
View file @ 6a99099f
...@@ -79,6 +79,7 @@ config DRM_ITE_IT6505 ...@@ -79,6 +79,7 @@ config DRM_ITE_IT6505
tristate "ITE IT6505 DisplayPort bridge" tristate "ITE IT6505 DisplayPort bridge"
depends on OF depends on OF
select DRM_DISPLAY_DP_HELPER select DRM_DISPLAY_DP_HELPER
select DRM_DISPLAY_HDCP_HELPER
select DRM_DISPLAY_HELPER select DRM_DISPLAY_HELPER
select DRM_DP_AUX_BUS select DRM_DP_AUX_BUS
select DRM_KMS_HELPER select DRM_KMS_HELPER
......
drivers/gpu/drm/bridge/analogix/Kconfig
View file @ 6a99099f
...@@ -35,6 +35,7 @@ config DRM_ANALOGIX_ANX7625 ...@@ -35,6 +35,7 @@ config DRM_ANALOGIX_ANX7625
depends on DRM depends on DRM
depends on OF depends on OF
select DRM_DISPLAY_DP_HELPER select DRM_DISPLAY_DP_HELPER
select DRM_DISPLAY_HDCP_HELPER
select DRM_DISPLAY_HELPER select DRM_DISPLAY_HELPER
select DRM_DP_AUX_BUS select DRM_DP_AUX_BUS
select DRM_MIPI_DSI select DRM_MIPI_DSI
......
drivers/gpu/drm/bridge/analogix/anx7625.c
View file @ 6a99099f
...@@ -23,11 +23,11 @@ ...@@ -23,11 +23,11 @@
#include <drm/display/drm_dp_aux_bus.h> #include <drm/display/drm_dp_aux_bus.h>
#include <drm/display/drm_dp_helper.h> #include <drm/display/drm_dp_helper.h>
#include <drm/display/drm_hdcp_helper.h>
#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_helper.h>
#include <drm/drm_bridge.h> #include <drm/drm_bridge.h>
#include <drm/drm_crtc_helper.h> #include <drm/drm_crtc_helper.h>
#include <drm/drm_edid.h> #include <drm/drm_edid.h>
#include <drm/drm_hdcp.h>
#include <drm/drm_mipi_dsi.h> #include <drm/drm_mipi_dsi.h>
#include <drm/drm_of.h> #include <drm/drm_of.h>
#include <drm/drm_panel.h> #include <drm/drm_panel.h>
......
drivers/gpu/drm/bridge/cadence/Kconfig
View file @ 6a99099f
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
config DRM_CDNS_MHDP8546 config DRM_CDNS_MHDP8546
tristate "Cadence DPI/DP bridge" tristate "Cadence DPI/DP bridge"
select DRM_DISPLAY_DP_HELPER select DRM_DISPLAY_DP_HELPER
select DRM_DISPLAY_HDCP_HELPER
select DRM_DISPLAY_HELPER select DRM_DISPLAY_HELPER
select DRM_KMS_HELPER select DRM_KMS_HELPER
select DRM_PANEL_BRIDGE select DRM_PANEL_BRIDGE
......
drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
View file @ 6a99099f
...@@ -36,13 +36,13 @@ ...@@ -36,13 +36,13 @@
#include <linux/wait.h> #include <linux/wait.h>
#include <drm/display/drm_dp_helper.h> #include <drm/display/drm_dp_helper.h>
#include <drm/display/drm_hdcp_helper.h>
#include <drm/drm_atomic.h> #include <drm/drm_atomic.h>
#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_helper.h>
#include <drm/drm_atomic_state_helper.h> #include <drm/drm_atomic_state_helper.h>
#include <drm/drm_bridge.h> #include <drm/drm_bridge.h>
#include <drm/drm_connector.h> #include <drm/drm_connector.h>
#include <drm/drm_crtc_helper.h> #include <drm/drm_crtc_helper.h>
#include <drm/drm_hdcp.h>
#include <drm/drm_modeset_helper_vtables.h> #include <drm/drm_modeset_helper_vtables.h>
#include <drm/drm_print.h> #include <drm/drm_print.h>
#include <drm/drm_probe_helper.h> #include <drm/drm_probe_helper.h>
......
drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.c
View file @ 6a99099f
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include <asm/unaligned.h> #include <asm/unaligned.h>
#include <drm/drm_hdcp.h> #include <drm/display/drm_hdcp_helper.h>
#include "cdns-mhdp8546-hdcp.h" #include "cdns-mhdp8546-hdcp.h"
......
drivers/gpu/drm/bridge/ite-it6505.c
View file @ 6a99099f
...@@ -22,12 +22,12 @@ ...@@ -22,12 +22,12 @@
#include <crypto/hash.h> #include <crypto/hash.h>
#include <drm/display/drm_dp_helper.h> #include <drm/display/drm_dp_helper.h>
#include <drm/display/drm_hdcp_helper.h>
#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_helper.h>
#include <drm/drm_bridge.h> #include <drm/drm_bridge.h>
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
#include <drm/drm_crtc_helper.h> #include <drm/drm_crtc_helper.h>
#include <drm/drm_edid.h> #include <drm/drm_edid.h>
#include <drm/drm_hdcp.h>
#include <drm/drm_print.h> #include <drm/drm_print.h>
#include <drm/drm_probe_helper.h> #include <drm/drm_probe_helper.h>
......
drivers/gpu/drm/display/Kconfig
View file @ 6a99099f
...@@ -17,6 +17,12 @@ config DRM_DISPLAY_DP_HELPER ...@@ -17,6 +17,12 @@ config DRM_DISPLAY_DP_HELPER
help help
DRM display helpers for DisplayPort. DRM display helpers for DisplayPort.
config DRM_DISPLAY_HDCP_HELPER
bool
depends on DRM_DISPLAY_HELPER
help
DRM display helpers for HDCP.
config DRM_DP_AUX_CHARDEV config DRM_DP_AUX_CHARDEV
bool "DRM DP AUX Interface" bool "DRM DP AUX Interface"
depends on DRM depends on DRM
......
drivers/gpu/drm/display/Makefile
View file @ 6a99099f
...@@ -7,6 +7,7 @@ drm_display_helper-$(CONFIG_DRM_DISPLAY_DP_HELPER) += drm_dp_dual_mode_helper.o ...@@ -7,6 +7,7 @@ drm_display_helper-$(CONFIG_DRM_DISPLAY_DP_HELPER) += drm_dp_dual_mode_helper.o
drm_dp_helper.o \ drm_dp_helper.o \
drm_dp_mst_topology.o \ drm_dp_mst_topology.o \
drm_dsc_helper.o drm_dsc_helper.o
drm_display_helper-$(CONFIG_DRM_DISPLAY_HDCP_HELPER) += drm_hdcp_helper.o
drm_display_helper-$(CONFIG_DRM_DP_AUX_CHARDEV) += drm_dp_aux_dev.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 drm_display_helper-$(CONFIG_DRM_DP_CEC) += drm_dp_cec.o
......
drivers/gpu/drm/drm_hdcp.c → drivers/gpu/drm/display/drm_hdcp_helper.c
View file @ 6a99099f
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/firmware.h> #include <linux/firmware.h>
#include <drm/drm_hdcp.h> #include <drm/display/drm_hdcp_helper.h>
#include <drm/drm_sysfs.h> #include <drm/drm_sysfs.h>
#include <drm/drm_print.h> #include <drm/drm_print.h>
#include <drm/drm_device.h> #include <drm/drm_device.h>
...@@ -21,8 +21,6 @@ ...@@ -21,8 +21,6 @@
#include <drm/drm_mode_object.h> #include <drm/drm_mode_object.h>
#include <drm/drm_connector.h> #include <drm/drm_connector.h>
#include "drm_internal.h"
static inline void drm_hdcp_print_ksv(const u8 *ksv) static inline void drm_hdcp_print_ksv(const u8 *ksv)
{ {
DRM_DEBUG("\t%#02x, %#02x, %#02x, %#02x, %#02x\n", DRM_DEBUG("\t%#02x, %#02x, %#02x, %#02x, %#02x\n",
......
drivers/gpu/drm/i915/Kconfig
View file @ 6a99099f
...@@ -11,6 +11,7 @@ config DRM_I915 ...@@ -11,6 +11,7 @@ config DRM_I915
select SHMEM select SHMEM
select TMPFS select TMPFS
select DRM_DISPLAY_DP_HELPER select DRM_DISPLAY_DP_HELPER
select DRM_DISPLAY_HDCP_HELPER
select DRM_DISPLAY_HELPER select DRM_DISPLAY_HELPER
select DRM_KMS_HELPER select DRM_KMS_HELPER
select DRM_PANEL select DRM_PANEL
......
drivers/gpu/drm/i915/display/intel_dp_hdcp.c
View file @ 6a99099f
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include <drm/display/drm_dp_helper.h> #include <drm/display/drm_dp_helper.h>
#include <drm/display/drm_dp_mst_helper.h> #include <drm/display/drm_dp_mst_helper.h>
#include <drm/drm_hdcp.h> #include <drm/display/drm_hdcp_helper.h>
#include <drm/drm_print.h> #include <drm/drm_print.h>
#include "intel_ddi.h" #include "intel_ddi.h"
......
drivers/gpu/drm/i915/display/intel_gmbus.c
View file @ 6a99099f
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include <linux/i2c-algo-bit.h> #include <linux/i2c-algo-bit.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <drm/drm_hdcp.h> #include <drm/display/drm_hdcp_helper.h>
#include "i915_drv.h" #include "i915_drv.h"
#include "intel_de.h" #include "intel_de.h"
......
drivers/gpu/drm/i915/display/intel_hdcp.c
View file @ 6a99099f
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/random.h> #include <linux/random.h>
#include <drm/drm_hdcp.h> #include <drm/display/drm_hdcp_helper.h>
#include <drm/i915_component.h> #include <drm/i915_component.h>
#include "i915_drv.h" #include "i915_drv.h"
......
drivers/gpu/drm/i915/display/intel_hdmi.c
View file @ 6a99099f
...@@ -32,10 +32,10 @@ ...@@ -32,10 +32,10 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/string_helpers.h> #include <linux/string_helpers.h>
#include <drm/display/drm_hdcp_helper.h>
#include <drm/drm_atomic_helper.h> #include <drm/drm_atomic_helper.h>
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
#include <drm/drm_edid.h> #include <drm/drm_edid.h>
#include <drm/drm_hdcp.h>
#include <drm/drm_scdc_helper.h> #include <drm/drm_scdc_helper.h>
#include <drm/intel_lpe_audio.h> #include <drm/intel_lpe_audio.h>
......
drivers/misc/mei/hdcp/mei_hdcp.h
View file @ 6a99099f
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#ifndef __MEI_HDCP_H__ #ifndef __MEI_HDCP_H__
#define __MEI_HDCP_H__ #define __MEI_HDCP_H__
#include <drm/drm_hdcp.h> #include <drm/display/drm_hdcp.h>
/* me_hdcp_status: Enumeration of all HDCP Status Codes */ /* me_hdcp_status: Enumeration of all HDCP Status Codes */
enum me_hdcp_status { enum me_hdcp_status {
......
include/drm/drm_hdcp.h → include/drm/display/drm_hdcp.h
View file @ 6a99099f
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
* Sean Paul <seanpaul@chromium.org> * Sean Paul <seanpaul@chromium.org>
*/ */
#ifndef _DRM_HDCP_H_INCLUDED_ #ifndef _DRM_HDCP_H_
#define _DRM_HDCP_H_INCLUDED_ #define _DRM_HDCP_H_
#include <linux/types.h> #include <linux/types.h>
...@@ -291,16 +291,6 @@ struct hdcp_srm_header { ...@@ -291,16 +291,6 @@ struct hdcp_srm_header {
u8 srm_gen_no; u8 srm_gen_no;
} __packed; } __packed;
struct drm_device;
struct drm_connector;
int drm_hdcp_check_ksvs_revoked(struct drm_device *dev,
u8 *ksvs, u32 ksv_count);
int drm_connector_attach_content_protection_property(
struct drm_connector *connector, bool hdcp_content_type);
void drm_hdcp_update_content_protection(struct drm_connector *connector,
u64 val);
/* Content Type classification for HDCP2.2 vs others */ /* Content Type classification for HDCP2.2 vs others */
#define DRM_MODE_HDCP_CONTENT_TYPE0 0 #define DRM_MODE_HDCP_CONTENT_TYPE0 0
#define DRM_MODE_HDCP_CONTENT_TYPE1 1 #define DRM_MODE_HDCP_CONTENT_TYPE1 1
......
include/drm/display/drm_hdcp_helper.h 0 → 100644
View file @ 6a99099f
/* SPDX-License-Identifier: MIT */
/*
* Copyright (C) 2017 Google, Inc.
*
* Authors:
* Sean Paul <seanpaul@chromium.org>
*/
#ifndef _DRM_HDCP_HELPER_H_INCLUDED_
#define _DRM_HDCP_HELPER_H_INCLUDED_
#include <drm/display/drm_hdcp.h>
struct drm_device;
struct drm_connector;
int drm_hdcp_check_ksvs_revoked(struct drm_device *dev, u8 *ksvs, u32 ksv_count);
int drm_connector_attach_content_protection_property(struct drm_connector *connector,
bool hdcp_content_type);
void drm_hdcp_update_content_protection(struct drm_connector *connector, u64 val);
#endif
include/drm/i915_mei_hdcp_interface.h
View file @ 6a99099f
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/device.h> #include <linux/device.h>
#include <drm/drm_hdcp.h> #include <drm/display/drm_hdcp.h>
/** /**
* enum hdcp_port_type - HDCP port implementation type defined by ME FW * enum hdcp_port_type - HDCP port implementation type defined by ME FW
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7