[PATCH 19/20] drm/amd/display: only enable HDCP for DCN+

[Bhawanpreet Lakha]

[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

Change-Id: I1f425bca6eb1139a4b0fe808c455df148ca0925e
Signed-off-by: Bhawanpreet Lakha <bhawanpreet.la...@amd.com>
---
 .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c 
b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index e3f547490b0e..2b4eead187f6 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -733,14 +733,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(
@@ -1496,7 +1498,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;
@@ -5086,7 +5089,8 @@ void amdgpu_dm_connector_init_helper(struct 
amdgpu_display_manager *dm,
                drm_object_attach_property(&aconnector->base.base,
                                adev->mode_info.freesync_capable_property, 0);
 #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
        }
 }
-- 
2.17.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx