add ucode id and cmd buffer for jpeg psp sram programming
and Jpeg DPG support.

Signed-off-by: Saleemkhan Jamadar <saleemkhan.jama...@amd.com>
Reviewed-by: Leo Liu <leo....@amd.com>
Reviewed-by: Veerabadhran Gopalakrishnan <veerabadhran.gopalakrish...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c   | 3 +++
 drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 2 ++
 drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 1 +
 drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h   | 1 +
 4 files changed, 7 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 1bf975b8d083..91bcbb9958e6 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -2462,6 +2462,9 @@ static int psp_get_fw_type(struct amdgpu_firmware_info 
*ucode,
        case AMDGPU_UCODE_ID_P2S_TABLE:
                *type = GFX_FW_TYPE_P2S_TABLE;
                break;
+       case AMDGPU_UCODE_ID_JPEG_RAM:
+               *type = GFX_FW_TYPE_JPEG_RAM;
+               break;
        case AMDGPU_UCODE_ID_MAXIMUM:
        default:
                return -EINVAL;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
index b14127429f30..433739a5393f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
@@ -678,6 +678,8 @@ const char *amdgpu_ucode_name(enum AMDGPU_UCODE_ID ucode_id)
                return "UMSCH_MM_DATA";
        case AMDGPU_UCODE_ID_UMSCH_MM_CMD_BUFFER:
                return "UMSCH_MM_CMD_BUFFER";
+       case AMDGPU_UCODE_ID_JPEG_RAM:
+               return "JPEG";
        default:
                return "UNKNOWN UCODE";
        }
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h
index 4244a13f9f22..619445760037 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h
@@ -511,6 +511,7 @@ enum AMDGPU_UCODE_ID {
        AMDGPU_UCODE_ID_UMSCH_MM_DATA,
        AMDGPU_UCODE_ID_UMSCH_MM_CMD_BUFFER,
        AMDGPU_UCODE_ID_P2S_TABLE,
+       AMDGPU_UCODE_ID_JPEG_RAM,
        AMDGPU_UCODE_ID_MAXIMUM,
 };
 
diff --git a/drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h 
b/drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h
index 4bb5e10217bb..7566973ed8f5 100644
--- a/drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h
+++ b/drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h
@@ -296,6 +296,7 @@ enum psp_gfx_fw_type {
        GFX_FW_TYPE_VPEC_FW1                        = 100,  /* VPEC FW1 To Save 
        VPE     */
        GFX_FW_TYPE_VPEC_FW2                        = 101,  /* VPEC FW2 To Save 
        VPE     */
        GFX_FW_TYPE_VPE                             = 102,
+       GFX_FW_TYPE_JPEG_RAM                        = 128,  /**< JPEG Command 
buffer */
        GFX_FW_TYPE_P2S_TABLE                       = 129,
        GFX_FW_TYPE_MAX
 };
-- 
2.25.1

Reply via email to