diff --git a/plat/rockchip/rk3399/drivers/dp/cdn_dp.c b/plat/rockchip/rk3399/drivers/dp/cdn_dp.c
index 2adab8fbf..b0a44c4f4 100644
--- a/plat/rockchip/rk3399/drivers/dp/cdn_dp.c
+++ b/plat/rockchip/rk3399/drivers/dp/cdn_dp.c
@@ -10,17 +10,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-__asm__(
-	".pushsection .text.hdcp_handler, \"ax\", %progbits\n"
-	".global hdcp_handler\n"
-	".balign 4\n"
-	"hdcp_handler:\n"
-	".incbin \"" __XSTRING(HDCPFW) "\"\n"
-	".type hdcp_handler, %function\n"
-	".size hdcp_handler, .- hdcp_handler\n"
-	".popsection\n"
-);
-
 static uint64_t *hdcp_key_pdata;
 static struct cdn_dp_hdcp_key_1x key;
 
@@ -35,7 +24,7 @@ uint64_t dp_hdcp_ctrl(uint64_t type)
 		return 0;
 	case HDCP_KEY_DATA_START_DECRYPT:
 		if (hdcp_key_pdata == (uint64_t *)(&key + 1))
-			return hdcp_handler(&key);
+			return PSCI_E_DISABLED;
 		else
 			return PSCI_E_INVALID_PARAMS;
 	default:
diff --git a/plat/rockchip/rk3399/platform.mk b/plat/rockchip/rk3399/platform.mk
index fc386f05a..f2b1f33e0 100644
--- a/plat/rockchip/rk3399/platform.mk
+++ b/plat/rockchip/rk3399/platform.mk
@@ -85,17 +85,11 @@ $(eval $(call add_define,RK3399M0FW))
 RK3399M0PMUFW=${BUILD_M0}/${PLAT_M0}pmu.bin
 $(eval $(call add_define,RK3399M0PMUFW))
 
-HDCPFW=${RK_PLAT_SOC}/drivers/dp/hdcp.bin
-$(eval $(call add_define,HDCPFW))
-
 # CCACHE_EXTRAFILES is needed because ccache doesn't handle .incbin
 export CCACHE_EXTRAFILES
 ${BUILD_PLAT}/bl31/pmu_fw.o: CCACHE_EXTRAFILES=$(RK3399M0FW):$(RK3399M0PMUFW)
 ${RK_PLAT_SOC}/drivers/pmu/pmu_fw.c: $(RK3399M0FW)
 
-${BUILD_PLAT}/bl31/cdn_dp.o: CCACHE_EXTRAFILES=$(HDCPFW)
-${RK_PLAT_SOC}/drivers/dp/cdn_dp.c: $(HDCPFW)
-
 $(eval $(call MAKE_PREREQ_DIR,${BUILD_M0},${BUILD_PLAT}))
 .PHONY: $(RK3399M0FW)
 $(RK3399M0FW): | ${BUILD_M0}