Skip to content

Commit

Permalink
drm/amd/display: only enable HDCP for DCN+
Browse files Browse the repository at this point in the history
[Why]
We don't support HDCP for pre RAVEN asics

[How]
Check if we are RAVEN+. Use this to attach the content_protection
property, this way usermode can't try to enable HDCP on pre DCN asics.

Also we need to update the module on hpd so guard it aswell

Signed-off-by: Bhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  • Loading branch information
Bhawanpreet Lakha authored and Alex Deucher committed Oct 3, 2019
1 parent da3fd7a commit 96a3b32
Showing 1 changed file with 12 additions and 8 deletions.
20 changes: 12 additions & 8 deletions drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Original file line number Diff line number Diff line change
Expand Up @@ -737,14 +737,16 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
amdgpu_dm_init_color_mod();

#ifdef CONFIG_DRM_AMD_DC_HDCP
adev->dm.hdcp_workqueue = hdcp_create_workqueue(&adev->psp, &init_params.cp_psp, adev->dm.dc);
if (adev->asic_type >= CHIP_RAVEN) {
adev->dm.hdcp_workqueue = hdcp_create_workqueue(&adev->psp, &init_params.cp_psp, adev->dm.dc);

if (!adev->dm.hdcp_workqueue)
DRM_ERROR("amdgpu: failed to initialize hdcp_workqueue.\n");
else
DRM_DEBUG_DRIVER("amdgpu: hdcp_workqueue init done %p.\n", adev->dm.hdcp_workqueue);
if (!adev->dm.hdcp_workqueue)
DRM_ERROR("amdgpu: failed to initialize hdcp_workqueue.\n");
else
DRM_DEBUG_DRIVER("amdgpu: hdcp_workqueue init done %p.\n", adev->dm.hdcp_workqueue);

dc_init_callbacks(adev->dm.dc, &init_params);
dc_init_callbacks(adev->dm.dc, &init_params);
}
#endif
if (amdgpu_dm_initialize_drm_device(adev)) {
DRM_ERROR(
Expand Down Expand Up @@ -1506,7 +1508,8 @@ static void handle_hpd_irq(void *param)
mutex_lock(&aconnector->hpd_lock);

#ifdef CONFIG_DRM_AMD_DC_HDCP
hdcp_reset_display(adev->dm.hdcp_workqueue, aconnector->dc_link->link_index);
if (adev->asic_type >= CHIP_RAVEN)
hdcp_reset_display(adev->dm.hdcp_workqueue, aconnector->dc_link->link_index);
#endif
if (aconnector->fake_enable)
aconnector->fake_enable = false;
Expand Down Expand Up @@ -5152,7 +5155,8 @@ void amdgpu_dm_connector_init_helper(struct amdgpu_display_manager *dm,
drm_connector_attach_vrr_capable_property(
&aconnector->base);
#ifdef CONFIG_DRM_AMD_DC_HDCP
drm_connector_attach_content_protection_property(&aconnector->base, false);
if (adev->asic_type >= CHIP_RAVEN)
drm_connector_attach_content_protection_property(&aconnector->base, false);
#endif
}
}
Expand Down

0 comments on commit 96a3b32

Please sign in to comment.