diff --git a/drivers/misc/hdcp.c b/drivers/misc/hdcp.c
index 7d1b9e9121a9..0c6f1de2465b 100644
--- a/drivers/misc/hdcp.c
+++ b/drivers/misc/hdcp.c
@@ -456,6 +456,7 @@ struct hdcp_lib_handle {
 	atomic_t hdcp_off;
 	uint32_t session_id;
 	bool legacy_app;
+	enum hdcp_device_type device_type;
 
 	struct task_struct *thread;
 	struct completion topo_wait;
@@ -901,7 +902,7 @@ static int hdcp_lib_session_init(struct hdcp_lib_handle *handle)
 	req_buf =
 	    (struct hdcp_lib_session_init_req *)handle->qseecom_handle->sbuf;
 	req_buf->commandid = HDCP_SESSION_INIT;
-	req_buf->deviceid = HDCP_TXMTR_HDMI;
+	req_buf->deviceid = handle->device_type;
 	rsp_buf = (struct hdcp_lib_session_init_rsp *)
 	    (handle->qseecom_handle->sbuf +
 	     QSEECOM_ALIGN(sizeof(struct hdcp_lib_session_init_req)));
@@ -2060,6 +2061,7 @@ int hdcp_library_register(struct hdcp_register_data *data)
 	handle->tethered = data->tethered;
 	handle->hdcp_app_init = NULL;
 	handle->hdcp_txmtr_init = NULL;
+	handle->device_type = data->device_type;
 
 	pr_debug("tethered %d\n", handle->tethered);
 
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_hdcp2p2.c b/drivers/video/fbdev/msm/mdss_hdmi_hdcp2p2.c
index fb59d0b03afe..9ce47ccb5e09 100644
--- a/drivers/video/fbdev/msm/mdss_hdmi_hdcp2p2.c
+++ b/drivers/video/fbdev/msm/mdss_hdmi_hdcp2p2.c
@@ -1041,6 +1041,7 @@ void *hdmi_hdcp2p2_init(struct hdmi_hdcp_init_data *init_data)
 	register_data.hdcp_ctx = &ctrl->lib_ctx;
 	register_data.client_ops = &client_ops;
 	register_data.txmtr_ops = &txmtr_ops;
+	register_data.device_type = HDCP_TXMTR_HDMI;
 	register_data.client_ctx = ctrl;
 	register_data.tethered = ctrl->tethered;
 
diff --git a/include/linux/hdcp_qseecom.h b/include/linux/hdcp_qseecom.h
index d9835193961e..26e97700fc73 100644
--- a/include/linux/hdcp_qseecom.h
+++ b/include/linux/hdcp_qseecom.h
@@ -108,9 +108,15 @@ struct hdcp_client_ops {
 	int (*wakeup)(struct hdmi_hdcp_wakeup_data *data);
 };
 
+enum hdcp_device_type {
+	HDCP_TXMTR_HDMI = 0x8001,
+	HDCP_TXMTR_DP = 0x8002
+};
+
 struct hdcp_register_data {
 	struct hdcp_client_ops *client_ops;
 	struct hdcp_txmtr_ops *txmtr_ops;
+	enum hdcp_device_type device_type;
 	void *client_ctx;
 	void **hdcp_ctx;
 	bool tethered;