From cf0e14d1851b885aaf4e50feb795a9aa22183179 Mon Sep 17 00:00:00 2001 From: Tatenda Chipeperekwa Date: Tue, 7 Apr 2020 17:50:22 -0700 Subject: [PATCH] disp: msm: hdcp: fix compilation of msm_hdcp module on GKI Add stub functions for msm_hdcp module in order to prevent linker issues when CONFIG_HDCP_QSEECOM is not defined, marked as not disabled or defined as module. Furthermore, a Kbuild entry for the msm_hdcp.h file so that it is exported. Change-Id: I0f102bf4c9722d95b897facdab94d83e32f7d29f Signed-off-by: Tatenda Chipeperekwa --- hdcp/msm_hdcp.c | 3 +++ include/linux/Kbuild | 1 + include/linux/msm_hdcp.h | 16 ++++++++++++++++ 3 files changed, 20 insertions(+) diff --git a/hdcp/msm_hdcp.c b/hdcp/msm_hdcp.c index 5677a3b248..c3e5c24473 100644 --- a/hdcp/msm_hdcp.c +++ b/hdcp/msm_hdcp.c @@ -53,6 +53,7 @@ void msm_hdcp_register_cb(struct device *dev, void *ctx, hdcp->cb = cb; hdcp->client_ctx = ctx; } +EXPORT_SYMBOL(msm_hdcp_register_cb); void msm_hdcp_notify_topology(struct device *dev) { @@ -82,6 +83,7 @@ void msm_hdcp_notify_topology(struct device *dev) kobject_uevent_env(&hdcp->device->kobj, KOBJ_CHANGE, envp); } +EXPORT_SYMBOL(msm_hdcp_notify_topology); void msm_hdcp_cache_repeater_topology(struct device *dev, struct HDCP_V2V1_MSG_TOPOLOGY *tp) @@ -102,6 +104,7 @@ void msm_hdcp_cache_repeater_topology(struct device *dev, memcpy(&hdcp->cached_tp, tp, sizeof(struct HDCP_V2V1_MSG_TOPOLOGY)); } +EXPORT_SYMBOL(msm_hdcp_cache_repeater_topology); static ssize_t tp_show(struct device *dev, struct device_attribute *attr, char *buf) diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 3a9aa2efbb..a8e1726b2c 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note +header-y += msm_hdcp.h header-y += sde_io_util.h header-y += sde_rsc.h diff --git a/include/linux/msm_hdcp.h b/include/linux/msm_hdcp.h index aa9d385cc0..1208754198 100644 --- a/include/linux/msm_hdcp.h +++ b/include/linux/msm_hdcp.h @@ -8,10 +8,26 @@ #include #include "hdcp/msm_hdmi_hdcp_mgr.h" +#if IS_ENABLED(CONFIG_HDCP_QSEECOM) void msm_hdcp_notify_topology(struct device *dev); void msm_hdcp_cache_repeater_topology(struct device *dev, struct HDCP_V2V1_MSG_TOPOLOGY *tp); void msm_hdcp_register_cb(struct device *dev, void *ctx, void (*cb)(void *ctx, u8 data)); +#else +static inline void msm_hdcp_notify_topology(struct device *dev) +{ +} + +static inline void msm_hdcp_cache_repeater_topology(struct device *dev, + struct HDCP_V2V1_MSG_TOPOLOGY *tp) +{ +} + +static inline void msm_hdcp_register_cb(struct device *dev, void *ctx, + void (*cb)(void *ctx, u8 data)) +{ +} +#endif /* CONFIG_HDCP_QSEECOM*/ #endif /* __MSM_HDCP_H */