samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Forka 0
Codice Problemi Pull Requests Actions Pacchetti Progetti Rilasci Wiki Attività

disp: msm: enable HDCP driver compilation

Sfoglia il codice sorgente 
Enable HDCP compilation within DP driver

Change-Id: I07b8a2ab3398765c2839196ad68fb7d9513a0fd4
Signed-off-by: Andrew Bartfeld <quic_abartfel@quicinc.com>
This commit is contained in:
Andrew Bartfeld
2023-01-24 14:51:19 -08:00
parent 6ecd45a1dc
commit 255da91d85
4 ha cambiato i file con 11 aggiunte e 15 eliminazioni
Scarica il file Patch Scarica il file Diff Expand all files Collapse all files

2
config/gki_pineappledisp.conf
Vedi File

@@ -11,7 +11,7 @@ export CONFIG_DRM_SDE_WB=y
export CONFIG_DRM_MSM_REGISTER_LOGGING=y export CONFIG_DRM_MSM_REGISTER_LOGGING=y
export CONFIG_MSM_MMRM=y export CONFIG_MSM_MMRM=y
export CONFIG_DISPLAY_BUILD=m export CONFIG_DISPLAY_BUILD=m
export CONFIG_HDCP_QSEECOM=n export CONFIG_HDCP_QSEECOM=y
export CONFIG_DRM_SDE_VM=y export CONFIG_DRM_SDE_VM=y
export CONFIG_QTI_HW_FENCE=y export CONFIG_QTI_HW_FENCE=y
export CONFIG_QCOM_SPEC_SYNC=y export CONFIG_QCOM_SPEC_SYNC=y

4
config/gki_pineappledispconf.h
Vedi File

@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
/* /*
* Copyright (c) 2021, The Linux Foundation. All rights reserved. * Copyright (c) 2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
*/ */
#define CONFIG_DRM_MSM 1 #define CONFIG_DRM_MSM 1
@@ -19,7 +19,7 @@
#define CONFIG_QCOM_MDSS_PLL 1 #define CONFIG_QCOM_MDSS_PLL 1
#define CONFIG_GKI_DISPLAY 1 #define CONFIG_GKI_DISPLAY 1
#define CONFIG_MSM_EXT_DISPLAY 1 #define CONFIG_MSM_EXT_DISPLAY 1
#define CONFIG_HDCP_QSEECOM 0 #define CONFIG_HDCP_QSEECOM 1
#define CONFIG_DRM_SDE_VM 1 #define CONFIG_DRM_SDE_VM 1
#define CONFIG_QTI_HW_FENCE 1 #define CONFIG_QTI_HW_FENCE 1
#define CONFIG_QCOM_SPEC_SYNC 1 #define CONFIG_QCOM_SPEC_SYNC 1

14
msm/Android.mk
Vedi File

@@ -24,15 +24,11 @@ KBUILD_OPTIONS += $(DISPLAY_SELECT)
ifneq ($(TARGET_BOARD_AUTO),true) ifneq ($(TARGET_BOARD_AUTO),true)
KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS+=$(PWD)/$(call intermediates-dir-for,DLKM,mmrm-module-symvers)/Module.symvers KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS+=$(PWD)/$(call intermediates-dir-for,DLKM,mmrm-module-symvers)/Module.symvers
ifneq ($(TARGET_BOARD_PLATFORM), pineapple)
ifneq ($(TARGET_BOARD_PLATFORM), taro)
KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS+=$(PWD)/$(call intermediates-dir-for,DLKM,sec-module-symvers)/Module.symvers
endif
endif
ifneq ($(TARGET_BOARD_PLATFORM), taro) ifneq ($(TARGET_BOARD_PLATFORM), taro)
KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS+=$(PWD)/$(call intermediates-dir-for,DLKM,sync-fence-module-symvers)/Module.symvers KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS+=$(PWD)/$(call intermediates-dir-for,DLKM,sync-fence-module-symvers)/Module.symvers
KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS+=$(PWD)/$(call intermediates-dir-for,DLKM,msm-ext-disp-module-symvers)/Module.symvers KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS+=$(PWD)/$(call intermediates-dir-for,DLKM,msm-ext-disp-module-symvers)/Module.symvers
KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS+=$(PWD)/$(call intermediates-dir-for,DLKM,hw-fence-module-symvers)/Module.symvers KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS+=$(PWD)/$(call intermediates-dir-for,DLKM,hw-fence-module-symvers)/Module.symvers
KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS+=$(PWD)/$(call intermediates-dir-for,DLKM,sec-module-symvers)/Module.symvers
endif endif
endif endif
@@ -48,19 +44,15 @@ LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
ifneq ($(TARGET_BOARD_AUTO),true) ifneq ($(TARGET_BOARD_AUTO),true)
LOCAL_REQUIRED_MODULES += mmrm-module-symvers LOCAL_REQUIRED_MODULES += mmrm-module-symvers
LOCAL_ADDITIONAL_DEPENDENCIES += $(call intermediates-dir-for,DLKM,mmrm-module-symvers)/Module.symvers LOCAL_ADDITIONAL_DEPENDENCIES += $(call intermediates-dir-for,DLKM,mmrm-module-symvers)/Module.symvers
ifneq ($(TARGET_BOARD_PLATFORM), pineapple)
ifneq ($(TARGET_BOARD_PLATFORM), taro)
LOCAL_REQUIRED_MODULES += sec-module-symvers
LOCAL_ADDITIONAL_DEPENDENCIES += $(call intermediates-dir-for,DLKM,sec-module-symvers)/Module.symvers
endif
endif
ifneq ($(TARGET_BOARD_PLATFORM), taro) ifneq ($(TARGET_BOARD_PLATFORM), taro)
LOCAL_REQUIRED_MODULES += sync-fence-module-symvers LOCAL_REQUIRED_MODULES += sync-fence-module-symvers
LOCAL_REQUIRED_MODULES += msm-ext-disp-module-symvers LOCAL_REQUIRED_MODULES += msm-ext-disp-module-symvers
LOCAL_REQUIRED_MODULES += hw-fence-module-symvers LOCAL_REQUIRED_MODULES += hw-fence-module-symvers
LOCAL_REQUIRED_MODULES += sec-module-symvers
LOCAL_ADDITIONAL_DEPENDENCIES += $(call intermediates-dir-for,DLKM,sync-fence-module-symvers)/Module.symvers LOCAL_ADDITIONAL_DEPENDENCIES += $(call intermediates-dir-for,DLKM,sync-fence-module-symvers)/Module.symvers
LOCAL_ADDITIONAL_DEPENDENCIES += $(call intermediates-dir-for,DLKM,msm-ext-disp-module-symvers)/Module.symvers LOCAL_ADDITIONAL_DEPENDENCIES += $(call intermediates-dir-for,DLKM,msm-ext-disp-module-symvers)/Module.symvers
LOCAL_ADDITIONAL_DEPENDENCIES += $(call intermediates-dir-for,DLKM,hw-fence-module-symvers)/Module.symvers LOCAL_ADDITIONAL_DEPENDENCIES += $(call intermediates-dir-for,DLKM,hw-fence-module-symvers)/Module.symvers
LOCAL_ADDITIONAL_DEPENDENCIES += $(call intermediates-dir-for,DLKM,sec-module-symvers)/Module.symvers
endif endif
endif endif

6
msm/sde_hdcp_2x.c
Vedi File

@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* /*
* Copyright (c) 2015-2021, The Linux Foundation. All rights reserved. * Copyright (c) 2015-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
*/ */
#define pr_fmt(fmt) "[sde-hdcp-2x] %s: " fmt, __func__ #define pr_fmt(fmt) "[sde-hdcp-2x] %s: " fmt, __func__
@@ -163,6 +164,7 @@ static int sde_hdcp_2x_get_next_message(struct sde_hdcp_2x_ctrl *hdcp,
else else
return AKE_STORED_KM; return AKE_STORED_KM;
case AKE_STORED_KM: case AKE_STORED_KM:
fallthrough;
case AKE_NO_STORED_KM: case AKE_NO_STORED_KM:
return AKE_SEND_H_PRIME; return AKE_SEND_H_PRIME;
case AKE_SEND_H_PRIME: case AKE_SEND_H_PRIME:
@@ -182,14 +184,16 @@ static int sde_hdcp_2x_get_next_message(struct sde_hdcp_2x_ctrl *hdcp,
case SKE_SEND_EKS: case SKE_SEND_EKS:
if (!hdcp->repeater_flag) if (!hdcp->repeater_flag)
return SKE_SEND_TYPE_ID; return SKE_SEND_TYPE_ID;
fallthrough;
case SKE_SEND_TYPE_ID: case SKE_SEND_TYPE_ID:
if (!hdcp->repeater_flag) if (!hdcp->repeater_flag)
return SKE_SEND_TYPE_ID; return SKE_SEND_TYPE_ID;
fallthrough;
case REP_STREAM_READY: case REP_STREAM_READY:
fallthrough;
case REP_SEND_ACK: case REP_SEND_ACK:
if (!hdcp->repeater_flag) if (!hdcp->repeater_flag)
return INVALID_MESSAGE; return INVALID_MESSAGE;
if (data->cmd == HDCP_TRANSPORT_CMD_SEND_MESSAGE) if (data->cmd == HDCP_TRANSPORT_CMD_SEND_MESSAGE)
return REP_STREAM_MANAGE; return REP_STREAM_MANAGE;
else else