drm/amdgpu/mmsch: Correct the definition for mmsch init header

For the header, it is version related, shouldn't use MAX_VCN_INSTANCES.

Signed-off-by: Emily Deng <Emily.Deng@amd.com>
Reviewed-by: Feifei Xu <Feifei.Xu@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/mmsch_v3_0.h b/drivers/gpu/drm/amd/amdgpu/mmsch_v3_0.h
index 3e4e858a69652fbeea520519cbb8a72ffaf84819..a773ef61b78c5d79b2bc31eb23011b7b36194b93 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/mmsch_v3_0.h
+++ b/drivers/gpu/drm/amd/amdgpu/mmsch_v3_0.h
@@ -30,6 +30,8 @@
 #define MMSCH_VERSION_MINOR    0
 #define MMSCH_VERSION  (MMSCH_VERSION_MAJOR << 16 | MMSCH_VERSION_MINOR)
 
+#define MMSCH_V3_0_VCN_INSTANCES 0x2
+
 enum mmsch_v3_0_command_type {
        MMSCH_COMMAND__DIRECT_REG_WRITE = 0,
        MMSCH_COMMAND__DIRECT_REG_POLLING = 2,
@@ -47,7 +49,7 @@ struct mmsch_v3_0_table_info {
 struct mmsch_v3_0_init_header {
        uint32_t version;
        uint32_t total_size;
-       struct mmsch_v3_0_table_info inst[AMDGPU_MAX_VCN_INSTANCES];
+       struct mmsch_v3_0_table_info inst[MMSCH_V3_0_VCN_INSTANCES];
 };
 
 struct mmsch_v3_0_cmd_direct_reg_header {

diff --git a/drivers/gpu/drm/amd/amdgpu/mmsch_v4_0.h b/drivers/gpu/drm/amd/amdgpu/mmsch_v4_0.h
index 83653a50a1a219298555d92cc6927ba9fae8b00c..796d4f8791e5f5f8727296794d595efe5adb6a4b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/mmsch_v4_0.h
+++ b/drivers/gpu/drm/amd/amdgpu/mmsch_v4_0.h
@@ -43,6 +43,8 @@
 #define MMSCH_VF_MAILBOX_RESP__OK 0x1
 #define MMSCH_VF_MAILBOX_RESP__INCOMPLETE 0x2
 
+#define MMSCH_V4_0_VCN_INSTANCES 0x2
+
 enum mmsch_v4_0_command_type {
        MMSCH_COMMAND__DIRECT_REG_WRITE = 0,
        MMSCH_COMMAND__DIRECT_REG_POLLING = 2,
@@ -60,7 +62,7 @@ struct mmsch_v4_0_table_info {
 struct mmsch_v4_0_init_header {
        uint32_t version;
        uint32_t total_size;
-       struct mmsch_v4_0_table_info inst[AMDGPU_MAX_VCN_INSTANCES];
+       struct mmsch_v4_0_table_info inst[MMSCH_V4_0_VCN_INSTANCES];
        struct mmsch_v4_0_table_info jpegdec;
 };
 

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
index 70fefbf26c48a57e99a20df849dc8496245036de..c8f63b3c6f69d945388187d41c65482686e3b354 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
@@ -1313,7 +1313,7 @@ static int vcn_v3_0_start_sriov(struct amdgpu_device *adev)
 
        header.version = MMSCH_VERSION;
        header.total_size = sizeof(struct mmsch_v3_0_init_header) >> 2;
-       for (i = 0; i < AMDGPU_MAX_VCN_INSTANCES; i++) {
+       for (i = 0; i < MMSCH_V3_0_VCN_INSTANCES; i++) {
                header.inst[i].init_status = 0;
                header.inst[i].table_offset = 0;
                header.inst[i].table_size = 0;

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
index 60c3fd20e8cede712b5a3474bd91a20a59f9b924..8d371faaa2b3e5eed887279305bbdb7065da3e35 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
@@ -1239,7 +1239,7 @@ static int vcn_v4_0_start_sriov(struct amdgpu_device *adev)
 
        header.version = MMSCH_VERSION;
        header.total_size = sizeof(struct mmsch_v4_0_init_header) >> 2;
-       for (i = 0; i < AMDGPU_MAX_VCN_INSTANCES; i++) {
+       for (i = 0; i < MMSCH_V4_0_VCN_INSTANCES; i++) {
                header.inst[i].init_status = 0;
                header.inst[i].table_offset = 0;
                header.inst[i].table_size = 0;