Commit 2a0f9270 authored by Bhawanpreet Lakha's avatar Bhawanpreet Lakha Committed by Alex Deucher

drm/amd/display: handle DP cpirq

[Why]
This is needed for DP as DP can send us info using irq.

[How]
Check if irq bit is set on short pulse and call the
function that handles cpirq in amdgpu_dm_hdcp
Signed-off-by: default avatarBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0c8620d6
...@@ -1626,6 +1626,12 @@ static void handle_hpd_rx_irq(void *param) ...@@ -1626,6 +1626,12 @@ static void handle_hpd_rx_irq(void *param)
struct dc_link *dc_link = aconnector->dc_link; struct dc_link *dc_link = aconnector->dc_link;
bool is_mst_root_connector = aconnector->mst_mgr.mst_state; bool is_mst_root_connector = aconnector->mst_mgr.mst_state;
enum dc_connection_type new_connection_type = dc_connection_none; enum dc_connection_type new_connection_type = dc_connection_none;
#ifdef CONFIG_DRM_AMD_DC_HDCP
union hpd_irq_data hpd_irq_data;
struct amdgpu_device *adev = dev->dev_private;
memset(&hpd_irq_data, 0, sizeof(hpd_irq_data));
#endif
/* /*
* TODO:Temporary add mutex to protect hpd interrupt not have a gpio * TODO:Temporary add mutex to protect hpd interrupt not have a gpio
...@@ -1635,7 +1641,12 @@ static void handle_hpd_rx_irq(void *param) ...@@ -1635,7 +1641,12 @@ static void handle_hpd_rx_irq(void *param)
if (dc_link->type != dc_connection_mst_branch) if (dc_link->type != dc_connection_mst_branch)
mutex_lock(&aconnector->hpd_lock); mutex_lock(&aconnector->hpd_lock);
#ifdef CONFIG_DRM_AMD_DC_HDCP
if (dc_link_handle_hpd_rx_irq(dc_link, &hpd_irq_data, NULL) &&
#else
if (dc_link_handle_hpd_rx_irq(dc_link, NULL, NULL) && if (dc_link_handle_hpd_rx_irq(dc_link, NULL, NULL) &&
#endif
!is_mst_root_connector) { !is_mst_root_connector) {
/* Downstream Port status changed. */ /* Downstream Port status changed. */
if (!dc_link_detect_sink(dc_link, &new_connection_type)) if (!dc_link_detect_sink(dc_link, &new_connection_type))
...@@ -1670,6 +1681,10 @@ static void handle_hpd_rx_irq(void *param) ...@@ -1670,6 +1681,10 @@ static void handle_hpd_rx_irq(void *param)
drm_kms_helper_hotplug_event(dev); drm_kms_helper_hotplug_event(dev);
} }
} }
#ifdef CONFIG_DRM_AMD_DC_HDCP
if (hpd_irq_data.bytes.device_service_irq.bits.CP_IRQ)
hdcp_handle_cpirq(adev->dm.hdcp_workqueue, aconnector->base.index);
#endif
if ((dc_link->cur_link_settings.lane_count != LANE_COUNT_UNKNOWN) || if ((dc_link->cur_link_settings.lane_count != LANE_COUNT_UNKNOWN) ||
(dc_link->type == dc_connection_mst_branch)) (dc_link->type == dc_connection_mst_branch))
dm_handle_hpd_rx_irq(aconnector); dm_handle_hpd_rx_irq(aconnector);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment