Merge tag 'drm-misc-next-2019-08-23' of git://anongit.freedesktop.org/drm/drm-misc...

[J-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 f46944453c6eafbbe4940f46690f7dda7c02b1b9..b34f00d420499d447ceb26464b687247edd891d6 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h
@@ -85,6 +85,18 @@ struct psp_firmware_header_v1_1 {
        uint32_t toc_header_version;
        uint32_t toc_offset_bytes;
        uint32_t toc_size_bytes;
+       uint32_t kdb_header_version;
+       uint32_t kdb_offset_bytes;
+       uint32_t kdb_size_bytes;
+};
+
+/* version_major=1, version_minor=2 */
+struct psp_firmware_header_v1_2 {
+       struct psp_firmware_header_v1_0 v1_0;
+       uint32_t reserve[3];
+       uint32_t kdb_header_version;
+       uint32_t kdb_offset_bytes;
+       uint32_t kdb_size_bytes;
 };
 
 /* version_major=1, version_minor=0 */
@@ -259,6 +271,12 @@ union amdgpu_firmware_header {
 enum AMDGPU_UCODE_ID {
        AMDGPU_UCODE_ID_SDMA0 = 0,
        AMDGPU_UCODE_ID_SDMA1,
+       AMDGPU_UCODE_ID_SDMA2,
+       AMDGPU_UCODE_ID_SDMA3,
+       AMDGPU_UCODE_ID_SDMA4,
+       AMDGPU_UCODE_ID_SDMA5,
+       AMDGPU_UCODE_ID_SDMA6,
+       AMDGPU_UCODE_ID_SDMA7,
        AMDGPU_UCODE_ID_CP_CE,
        AMDGPU_UCODE_ID_CP_PFP,
        AMDGPU_UCODE_ID_CP_ME,
@@ -278,6 +296,7 @@ enum AMDGPU_UCODE_ID {
        AMDGPU_UCODE_ID_UVD1,
        AMDGPU_UCODE_ID_VCE,
        AMDGPU_UCODE_ID_VCN,
+       AMDGPU_UCODE_ID_VCN1,
        AMDGPU_UCODE_ID_DMCU_ERAM,
        AMDGPU_UCODE_ID_DMCU_INTV,
        AMDGPU_UCODE_ID_VCN0_RAM,