Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...

[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_ucode.h

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h
index 3c23c6293ff9472b64e1a9553c73ce96776b3aca..0e43b46d3ab50d50db20dfa224a5a43b3550feb9 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h
@@ -222,6 +222,15 @@ struct rlc_firmware_header_v2_1 {
        uint32_t save_restore_list_srm_offset_bytes;
 };
 
        uint32_t save_restore_list_srm_offset_bytes;
 };
 

+/* version_major=2, version_minor=1 */
+struct rlc_firmware_header_v2_2 {
+       struct rlc_firmware_header_v2_1 v2_1;
+       uint32_t rlc_iram_ucode_size_bytes;
+       uint32_t rlc_iram_ucode_offset_bytes;
+       uint32_t rlc_dram_ucode_size_bytes;
+       uint32_t rlc_dram_ucode_offset_bytes;
+};
+

 /* version_major=1, version_minor=0 */
 struct sdma_firmware_header_v1_0 {
        struct common_firmware_header header;
 /* version_major=1, version_minor=0 */
 struct sdma_firmware_header_v1_0 {
        struct common_firmware_header header;


@@ -339,6 +348,8 @@ enum AMDGPU_UCODE_ID {
        AMDGPU_UCODE_ID_RLC_RESTORE_LIST_CNTL,
        AMDGPU_UCODE_ID_RLC_RESTORE_LIST_GPM_MEM,
        AMDGPU_UCODE_ID_RLC_RESTORE_LIST_SRM_MEM,
        AMDGPU_UCODE_ID_RLC_RESTORE_LIST_CNTL,
        AMDGPU_UCODE_ID_RLC_RESTORE_LIST_GPM_MEM,
        AMDGPU_UCODE_ID_RLC_RESTORE_LIST_SRM_MEM,

+       AMDGPU_UCODE_ID_RLC_IRAM,
+       AMDGPU_UCODE_ID_RLC_DRAM,

        AMDGPU_UCODE_ID_RLC_G,
        AMDGPU_UCODE_ID_STORAGE,
        AMDGPU_UCODE_ID_SMC,
        AMDGPU_UCODE_ID_RLC_G,
        AMDGPU_UCODE_ID_STORAGE,
        AMDGPU_UCODE_ID_SMC,