dp14txss: zcu_pt_dp14_hdcp: Fix DP14 HDCP multi combination issues

Application is failing when HDCP2.2 only is enabled in both RX and TX.
Some functions are enabled without any HDCP Macros by default.
Now those are fixed.

Signed-off-by: Lakshmi Prasanna Eachuri <lakshmi.prasanna.eachuri@amd.com>

Author: laeachur

XilinxProcessorIPLib/drivers/dp14txss/examples/src/zcu_pt_dp14_hdcp/passthrough.c

@@ -1338,7 +1338,19 @@ void DpPt_Main(void){
 
 #if ENABLE_HDCP_IN_DESIGN
 #if (ENABLE_HDCP22_IN_RX | ENABLE_HDCP22_IN_TX)
-		if (DpRxSsInst.HdcpIsReady || DpTxSsInst.HdcpIsReady) {
+		if (
+#if (XPAR_XHDCP_NUM_INSTANCES > 0 || XPAR_XHDCP22_RX_DP_NUM_INSTANCES > 0)
+	DpRxSsInst.HdcpIsReady
+#else
+	0
+#endif
+	||
+#if (XPAR_XHDCP_NUM_INSTANCES > 0 || XPAR_XHDCP22_TX_DP_NUM_INSTANCES > 0)
+	DpTxSsInst.HdcpIsReady
+#else
+	0
+#endif
+	) {
 			/* Poll HDCP22 */
 			XHdcp22_Poll(&Hdcp22Repeater);
 		}

XilinxProcessorIPLib/drivers/dp14txss/examples/src/zcu_pt_dp14_hdcp/rx.c

@@ -1,6 +1,6 @@
 /******************************************************************************
 * Copyright (C) 2018 – 2022 Xilinx, Inc.  All rights reserved.
-* Copyright 2022-2023 Advanced Micro Devices, Inc. All Rights Reserved.
+* Copyright 2022-2024 Advanced Micro Devices, Inc. All Rights Reserved.
 * SPDX-License-Identifier: MIT
 ******************************************************************************/
 
@@ -466,7 +466,9 @@ void DpRxSs_TrainingDoneHandler(void *InstancePtr)
 	DpRxSsInst.VBlankCount = 0;
 	rx_unplugged = 0;
 #if ENABLE_HDCP_IN_DESIGN
+#if (ENABLE_HDCP1x_IN_RX > 0) || (XPAR_XHDCP22_RX_DP_NUM_INSTANCES > 0)
     XDpRxSs_SetLane(&DpRxSsInst, DpRxSsInst.UsrOpt.LaneCount);
+#endif
 #if (ENABLE_HDCP1x_IN_RX && (ENABLE_HDCP1x_IN_TX || ENABLE_HDCP22_IN_TX))
     XDpRxSs_SetPhysicalState(&DpRxSsInst, hdcp_capable_org); //TRUE);
 #else
@@ -1219,8 +1221,10 @@ void Print_ExtPkt()
 void Dprx_HdcpAuthCallback(void *InstancePtr) {
 	XDpRxSs *XDpRxSsInst = (XDpRxSs *)InstancePtr;
 
+#if (ENABLE_HDCP1x_IN_RX)
 	/* Set Timer Counter reset done */
 	XDpRxSsInst->TmrCtrResetDone = 1;
+#endif
 	if (XDpTxSs_IsConnected(&DpTxSsInst)) {
 #if (ENABLE_HDCP1x_IN_TX | ENABLE_HDCP22_IN_TX)
 		XDpTxSs_DisableEncryption(&DpTxSsInst,0x1);
@@ -1244,6 +1248,7 @@ void Dprx_HdcpAuthCallback(void *InstancePtr) {
 	}
 }
 
+#if ((ENABLE_HDCP1x_IN_RX > 0) || (ENABLE_HDCP22_IN_RX > 0))
 static void Dppt_TimeOutCallback(void *InstancePtr, u8 TmrCtrNumber)
 {
 	XDpRxSs *XDpRxSsPtr = (XDpRxSs *)InstancePtr;
@@ -1274,6 +1279,6 @@ void Dprx_HdcpUnAuthCallback(void *InstancePtr) {
 				InstancePtr);
 
 }
-
+#endif
 
 #endif /* ENABLE_HDCP_IN_DESIGN */

XilinxProcessorIPLib/drivers/dp14txss/examples/src/zcu_pt_dp14_hdcp/tx.c

@@ -429,16 +429,20 @@ void DpPt_HpdEventHandler(void *InstancePtr)
 //		usleep(50000);
 //		 This part has added to give HDCP a proper handle when hdp even happens
 //		 HDCP block will disable Tx side encryption when hpd detected
-		#if ENABLE_HDCP_IN_DESIGN
+#if ENABLE_HDCP_IN_DESIGN
+#if (ENABLE_HDCP1x_IN_TX | ENABLE_HDCP22_IN_TX)
 				XDpTxSs_DisableEncryption(&DpTxSsInst,0x1);
+#endif
 #if ENABLE_HDCP1x_IN_TX
 				XDpTxSs_SetPhysicalState(&DpTxSsInst, TRUE);
 #endif
 
 #if (ENABLE_HDCP1x_IN_RX | ENABLE_HDCP1x_IN_TX)
 				XHdcp1xExample_Poll();
 #endif
+#if (ENABLE_HDCP1x_IN_TX | ENABLE_HDCP22_IN_TX)
 				XDpTxSs_HdcpEnable(&DpTxSsInst);
+#endif
 #if (ENABLE_HDCP1x_IN_RX | ENABLE_HDCP1x_IN_TX)
 				XHdcp1xExample_Poll();
 #endif
@@ -479,8 +483,10 @@ void DpPt_HpdEventHandler(void *InstancePtr)
 #if ENABLE_HDCP_IN_DESIGN
 		{
 			xdbg_printf(XDBG_DEBUG_GENERAL, ".~\r\n");
+#if (ENABLE_HDCP1x_IN_TX | ENABLE_HDCP22_IN_TX)
 			XDpTxSs_DisableEncryption(&DpTxSsInst,0x1);
 			XDpTxSs_HdcpDisable(&DpTxSsInst);
+#endif
 #if ENABLE_HDCP1x_IN_TX
 			XDpTxSs_SetPhysicalState(&DpTxSsInst, hdcp_capable_org);
 #endif
@@ -1088,7 +1094,9 @@ u32 start_tx(u8 line_rate, u8 lane_count, user_config_struct user_config,
 	XDp_TxCfgSetColorEncode(DpTxSsInst.DpPtr, XDP_TX_STREAM_ID1, \
 				format, XVIDC_BT_601, XDP_DR_CEA);
 #if ENABLE_HDCP_IN_DESIGN
+#if (ENABLE_HDCP1x_IN_TX | ENABLE_HDCP22_IN_TX)
 	XDpTxSs_HdcpDisable(&DpTxSsInst);
+#endif
 #if (ENABLE_HDCP1x_IN_RX | ENABLE_HDCP1x_IN_TX)
 	XHdcp1xExample_Poll();
 #endif

XilinxProcessorIPLib/drivers/dp14txss/examples/src/zcu_pt_dp14_hdcp/xdptxss_zcu102_dp14_pt_hdcp.c

@@ -88,6 +88,8 @@ int gIsKeyWrittenInEeeprom = FALSE;
 #define INTRNAME_DPRX   0
 #if (ENABLE_HDCP_IN_DESIGN && ENABLE_HDCP22_IN_RX && ENABLE_HDCP1x_IN_RX)
 #define INTRNAME_DPRX_TIMER 4
+#elif (ENABLE_HDCP_IN_DESIGN && ENABLE_HDCP1x_IN_RX)
+#define INTRNAME_DPRX_TIMER 2
 #else
 #define INTRNAME_DPRX_TIMER 3
 #endif
@@ -737,6 +739,7 @@ u32 DpSs_Main(void)
 
 #if (ENABLE_HDCP22_IN_RX | ENABLE_HDCP22_IN_TX)
 	extern XHdcp22_Repeater     Hdcp22Repeater;
+#if (ENABLE_HDCP1x_IN_TX | ENABLE_HDCP22_IN_TX)
 	if (XDpTxSs_HdcpIsReady(&DpTxSsInst)) {
 		/* Initialize the HDCP instance */
 
@@ -745,6 +748,7 @@ u32 DpSs_Main(void)
 		/* Set HDCP downstream interface(s) */
 		XHdcp_SetDownstream(&Hdcp22Repeater, &DpTxSsInst);
 	}
+#endif
 #endif
 
 	/* Set DP141 Tx driver here. */

XilinxProcessorIPLib/drivers/dp14txss/examples/src/zcu_pt_dp14_hdcp/xhdcp1x_example.c

@@ -150,7 +150,11 @@ extern XINTC IntcInst;
 #else
 #define INTRNAME_DPTX_1XCIPHER    1
 #endif
+#if (ENABLE_HDCP22_IN_RX)
 #define INTRNAME_DPRX_1XCIPHER    3
+#else
+#define INTRNAME_DPRX_1XCIPHER    1
+#endif
 #endif
 /***************** Macros (Inline Functions) Definitions *********************/
 

XilinxProcessorIPLib/drivers/dp14txss/examples/src/zcu_pt_dp14_hdcp/xhdcp22_example.c

@@ -1,5 +1,6 @@
 /*******************************************************************************
 * Copyright (C) 2020-2021 Xilinx, Inc.  All rights reserved.
+* Copyright 2023-2024 Advanced Micro Devices, Inc. All Rights Reserved.
 * SPDX-License-Identifier: MIT
 *******************************************************************************/
 
@@ -354,7 +355,9 @@ static void XHdcp22_DownstreamAuthenticatedCallback(void *HdcpInstancePtr)
 	/* After authentication start encryption */
 	for (int i = 0; (i < InstancePtr->DownstreamInstanceBinded); i++) {
 //		xil_printf("HDCP 2.2 downstream authenticated\r\n");
+#if (ENABLE_HDCP1x_IN_TX | ENABLE_HDCP22_IN_TX)
 		XDpTxSs_EnableEncryption((void *)InstancePtr->DownstreamInstancePtr[i], 1);
+#endif
 	}
 //
 //	/* Enforce blanking */