[PATCH] drm/amdgpu: Bypass display ta if it is harvested

[Zhang, Hawking]

[AMD Official Use Only - General]

Never mind. There is helper function to check if display hardware is available. I will move to the helper in v2. Thanks @Wang, Yang(Kevin)<mailto:KevinYang.Wang at amd.com> for his reminder.

Regards,
Hawking

From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> On Behalf Of Zhang, Hawking
Sent: Thursday, March 14, 2024 18:45
To: amd-gfx at lists.freedesktop.org; Pillai, Aurabindo <Aurabindo.Pillai at amd.com>; Feng, Kenneth <Kenneth.Feng at amd.com>; Deucher, Alexander <Alexander.Deucher at amd.com>
Subject: RE: [PATCH] drm/amdgpu: Bypass display ta if it is harvested


[AMD Official Use Only - General]

[AMD Official Use Only - General]

Copy @Deucher, Alexander<mailto:Alexander.Deucher at amd.com> for the awareness.

Regards,
Hawking

-----Original Message-----
From: Zhang, Hawking <Hawking.Zhang at amd.com<mailto:Hawking.Zhang at amd.com>>
Sent: Thursday, March 14, 2024 18:36
To: amd-gfx at lists.freedesktop.org<mailto:amd-gfx at lists.freedesktop.org>; Pillai, Aurabindo <Aurabindo.Pillai at amd.com<mailto:Aurabindo.Pillai at amd.com>>; Feng, Kenneth <Kenneth.Feng at amd.com<mailto:Kenneth.Feng at amd.com>>
Cc: Zhang, Hawking <Hawking.Zhang at amd.com<mailto:Hawking.Zhang at amd.com>>
Subject: [PATCH] drm/amdgpu: Bypass display ta if it is harvested

Display TA doesn't need to be loaded/invoked if it is harvested.

Signed-off-by: Hawking Zhang <Hawking.Zhang at amd.com<mailto:Hawking.Zhang at amd.com>>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 867397fe2e9d..bb4988c45ca9 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -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 (psp->adev->harvest_ip_mask & AMD_HARVEST_IP_DMU_MASK)
+               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 (psp->adev->harvest_ip_mask & AMD_HARVEST_IP_DMU_MASK)
+               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 (psp->adev->harvest_ip_mask & AMD_HARVEST_IP_DMU_MASK)
+                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");
--
2.17.1

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20240314/35caac78/attachment-0001.htm>