drm/amdgpu: add ucode id for jpeg DPG support

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

Signed-off-by: Saleemkhan Jamadar <saleemkhan.jamadar@amd.com>
Reviewed-by: Leo Liu <leo.liu@amd.com>
Reviewed-by: Veerabadhran Gopalakrishnan <Veerabadhran.Gopalakrishnan@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 d9e5eb2..c09aac9 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -2485,6 +2485,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 2ab01b1..0867fd9 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
@@ -680,6 +680,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 4244a13..6194457 100644 (file)
--- 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 4bb5e10..7566973 100644 (file)
--- 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
 };