drm/amd/display: Fix DMUB meta offset for new load method

[Why]
The new metadata offset is located at the end of the firmware binary
without any additional padding.

Firmware state is currently larger than 1024 bytes so new firmware state
will hang when trying to access any data above 1024 bytes.

[How]
Specify the correct offset based on legacy vs new loading method.

Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Reviewed-by: Yongqiang Sun <yongqiang.sun@amd.com>
Acked-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c b/drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c
index 0a1a851741c5089ae124064a051bb691640f5e25..a6e4032278728b2bff6390c45c76752d56a3958a 100644 (file)
--- a/drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c
+++ b/drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c
@@ -96,25 +96,27 @@ dmub_get_fw_meta_info(const struct dmub_srv_region_params *params)
        const union dmub_fw_meta *meta;
        const uint8_t *blob = NULL;
        uint32_t blob_size = 0;
+       uint32_t meta_offset = 0;
 
        if (params->fw_bss_data) {
                /* Legacy metadata region. */
                blob = params->fw_bss_data;
                blob_size = params->bss_data_size;
+               meta_offset = DMUB_FW_META_OFFSET;
        } else if (params->fw_inst_const) {
                /* Combined metadata region. */
                blob = params->fw_inst_const;
                blob_size = params->inst_const_size;
+               meta_offset = 0;
        }
 
        if (!blob || !blob_size)
                return NULL;
 
-       if (blob_size < sizeof(union dmub_fw_meta) + DMUB_FW_META_OFFSET)
+       if (blob_size < sizeof(union dmub_fw_meta) + meta_offset)
                return NULL;
 
-       meta = (const union dmub_fw_meta *)(blob + blob_size -
-                                           DMUB_FW_META_OFFSET -
+       meta = (const union dmub_fw_meta *)(blob + blob_size - meta_offset -
                                            sizeof(union dmub_fw_meta));
 
        if (meta->info.magic_value != DMUB_FW_META_MAGIC)