Commit 9b3fec30 authored by Hawking Zhang's avatar Hawking Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: Bypass display ta if display hw is not available 



Do not load/invoke display TA if display hardware
is not available.

Signed-off-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 43bda3e7

drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c

+18 −0
Original line number Diff line number Diff line
@@ -1830,6 +1830,10 @@ static int psp_hdcp_initialize(struct psp_context *psp) 
	if (amdgpu_sriov_vf(psp->adev))

		return 0;



	/* bypass hdcp initialization if dmu is harvested */

	if (!amdgpu_device_has_display_hardware(psp->adev))

		return 0;



	if (!psp->hdcp_context.context.bin_desc.size_bytes ||

	    !psp->hdcp_context.context.bin_desc.start_addr) {

		dev_info(psp->adev->dev, "HDCP: optional hdcp ta ucode is not available\n");
@@ -1862,6 +1866,9 @@ int psp_hdcp_invoke(struct psp_context *psp, uint32_t ta_cmd_id) 
	if (amdgpu_sriov_vf(psp->adev))

		return 0;



	if (!psp->hdcp_context.context.initialized)

		return 0;



	return psp_ta_invoke(psp, ta_cmd_id, &psp->hdcp_context.context);

}
@@ -1897,6 +1904,10 @@ static int psp_dtm_initialize(struct psp_context *psp) 
	if (amdgpu_sriov_vf(psp->adev))

		return 0;



	/* bypass dtm initialization if dmu is harvested */

	if (!amdgpu_device_has_display_hardware(psp->adev))

		return 0;



	if (!psp->dtm_context.context.bin_desc.size_bytes ||

	    !psp->dtm_context.context.bin_desc.start_addr) {

		dev_info(psp->adev->dev, "DTM: optional dtm ta ucode is not available\n");
@@ -1929,6 +1940,9 @@ int psp_dtm_invoke(struct psp_context *psp, uint32_t ta_cmd_id) 
	if (amdgpu_sriov_vf(psp->adev))

		return 0;



	if (!psp->dtm_context.context.initialized)

		return 0;



	return psp_ta_invoke(psp, ta_cmd_id, &psp->dtm_context.context);

}
@@ -2063,6 +2077,10 @@ static int psp_securedisplay_initialize(struct psp_context *psp) 
	if (amdgpu_sriov_vf(psp->adev))

		return 0;



	/* bypass securedisplay initialization if dmu is harvested */

	if (!amdgpu_device_has_display_hardware(psp->adev))

		return 0;



	if (!psp->securedisplay_context.context.bin_desc.size_bytes ||

	    !psp->securedisplay_context.context.bin_desc.start_addr) {

		dev_info(psp->adev->dev, "SECUREDISPLAY: securedisplay ta ucode is not available\n");