Commit 96a3b32e authored by Bhawanpreet Lakha's avatar Bhawanpreet Lakha Committed by Alex Deucher
Browse files

drm/amd/display: only enable HDCP for DCN+ 



[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: 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 da3fd7ac

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+12 −8
Original line number Diff line number Diff line
@@ -737,6 +737,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev) 
	amdgpu_dm_init_color_mod();



#ifdef CONFIG_DRM_AMD_DC_HDCP

	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)
@@ -745,6 +746,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev) 
			DRM_DEBUG_DRIVER("amdgpu: hdcp_workqueue init done %p.\n", adev->dm.hdcp_workqueue);



		dc_init_callbacks(adev->dm.dc, &init_params);

	}

#endif

	if (amdgpu_dm_initialize_drm_device(adev)) {

		DRM_ERROR(
@@ -1506,6 +1508,7 @@ static void handle_hpd_irq(void *param) 
	mutex_lock(&aconnector->hpd_lock);



#ifdef CONFIG_DRM_AMD_DC_HDCP

	if (adev->asic_type >= CHIP_RAVEN)

		hdcp_reset_display(adev->dm.hdcp_workqueue, aconnector->dc_link->link_index);

#endif

	if (aconnector->fake_enable)
@@ -5152,6 +5155,7 @@ 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

		if (adev->asic_type >= CHIP_RAVEN)

			drm_connector_attach_content_protection_property(&aconnector->base, false);

#endif

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE