Revert "drm/amdgpu: add CAP fw loading"

This reverts commit 29e2501f8a64fa2fa8f6fe4be53cce5a5a4fe79f.

Signed-off-by: Zhigang Luo <zhigang.luo@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index dc42086..be50867 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -159,10 +159,6 @@ static int psp_sw_fini(void *handle)
        adev->psp.sos_fw = NULL;
        release_firmware(adev->psp.asd_fw);
        adev->psp.asd_fw = NULL;
-       if (adev->psp.cap_fw) {
-               release_firmware(adev->psp.cap_fw);
-               adev->psp.cap_fw = NULL;
-       }
        if (adev->psp.ta_fw) {
                release_firmware(adev->psp.ta_fw);
                adev->psp.ta_fw = NULL;
@@ -250,7 +246,7 @@ psp_cmd_submit_buf(struct psp_context *psp,
                DRM_WARN("psp command (0x%X) failed and response status is (0x%X)\n",
                         psp->cmd_buf_mem->cmd_id,
                         psp->cmd_buf_mem->resp.status);
-               if ((ucode->ucode_id == AMDGPU_UCODE_ID_CAP) || !timeout) {
+               if (!timeout) {
                        mutex_unlock(&psp->mutex);
                        return -EINVAL;
                }
@@ -1192,9 +1188,6 @@ static int psp_get_fw_type(struct amdgpu_firmware_info *ucode,
                           enum psp_gfx_fw_type *type)
 {
        switch (ucode->ucode_id) {
-       case AMDGPU_UCODE_ID_CAP:
-               *type = GFX_FW_TYPE_CAP;
-               break;
        case AMDGPU_UCODE_ID_SDMA0:
                *type = GFX_FW_TYPE_SDMA0;
                break;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
index 4a4d8f2..297435c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
@@ -252,9 +252,6 @@ struct psp_context
        uint32_t                        asd_ucode_size;
        uint8_t                         *asd_start_addr;
 
-       /* cap firmware */
-       const struct firmware           *cap_fw;
-
        /* fence buffer */
        struct amdgpu_bo                *fence_buf_bo;
        uint64_t                        fence_buf_mc_addr;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h
index 88f2260..b0e6564 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h
@@ -283,8 +283,7 @@ union amdgpu_firmware_header {
  * fw loading support
  */
 enum AMDGPU_UCODE_ID {
-       AMDGPU_UCODE_ID_CAP = 0, /* CAP must be the 1st fw to be loaded */
-       AMDGPU_UCODE_ID_SDMA0,
+       AMDGPU_UCODE_ID_SDMA0 = 0,
        AMDGPU_UCODE_ID_SDMA1,
        AMDGPU_UCODE_ID_SDMA2,
        AMDGPU_UCODE_ID_SDMA3,

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h b/drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h
index 6ff9a95..a44fd60 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h
+++ b/drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h
@@ -246,7 +246,6 @@ enum psp_gfx_fw_type {
        GFX_FW_TYPE_SDMA6                           = 56,   /* SDMA6                    MI      */
        GFX_FW_TYPE_SDMA7                           = 57,   /* SDMA7                    MI      */
        GFX_FW_TYPE_VCN1                            = 58,   /* VCN1                     MI      */
-       GFX_FW_TYPE_CAP                             = 62,   /* CAP_FW                   VG      */
        GFX_FW_TYPE_MAX
 };
 

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
index 43896f4..735c43c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
@@ -44,7 +44,6 @@
 
 MODULE_FIRMWARE("amdgpu/vega10_sos.bin");
 MODULE_FIRMWARE("amdgpu/vega10_asd.bin");
-MODULE_FIRMWARE("amdgpu/vega10_cap.bin");
 MODULE_FIRMWARE("amdgpu/vega12_sos.bin");
 MODULE_FIRMWARE("amdgpu/vega12_asd.bin");
 
@@ -64,7 +63,6 @@ static int psp_v3_1_init_microcode(struct psp_context *psp)
        char fw_name[30];
        int err = 0;
        const struct psp_firmware_header_v1_0 *hdr;
-       struct amdgpu_firmware_info *info = NULL;
 
        DRM_DEBUG("\n");
 
@@ -114,26 +112,6 @@ static int psp_v3_1_init_microcode(struct psp_context *psp)
        adev->psp.asd_start_addr = (uint8_t *)hdr +
                                le32_to_cpu(hdr->header.ucode_array_offset_bytes);
 
-       if (amdgpu_sriov_vf(adev) && adev->asic_type == CHIP_VEGA10) {
-               snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_cap.bin",
-                        chip_name);
-               err = request_firmware(&adev->psp.cap_fw, fw_name, adev->dev);
-               if (err)
-                       goto out;
-
-               err = amdgpu_ucode_validate(adev->psp.cap_fw);
-               if (err)
-                       goto out;
-
-               info = &adev->firmware.ucode[AMDGPU_UCODE_ID_CAP];
-               info->ucode_id = AMDGPU_UCODE_ID_CAP;
-               info->fw = adev->psp.cap_fw;
-               hdr = (const struct psp_firmware_header_v1_0 *)
-                             adev->psp.cap_fw->data;
-               adev->firmware.fw_size += ALIGN(
-                       le32_to_cpu(hdr->header.ucode_size_bytes), PAGE_SIZE);
-       }
-
        return 0;
 out:
        if (err) {
@@ -144,8 +122,6 @@ out:
                adev->psp.sos_fw = NULL;
                release_firmware(adev->psp.asd_fw);
                adev->psp.asd_fw = NULL;
-               release_firmware(adev->psp.cap_fw);
-               adev->psp.cap_fw = NULL;
        }
 
        return err;