Revert "drm/amd/display: cache trace buffer size"

Revert commit 257e9891db0b ("drm/amd/display: cache trace buffer size")
to fix regression found in tests.

Acked-by: Stylon Wang <stylon.wang@amd.com>
Signed-off-by: Leo Ma <hanghong.ma@amd.com>
Reviewed-by: Josip Pavic <Josip.Pavic@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dmub/dmub_srv.h b/drivers/gpu/drm/amd/display/dmub/dmub_srv.h
index e210cb082ebd953d04321f082b49f4907b47bb5c..7c9a2b34bd05cda5b5112a6f876dd5847a4591b8 100644 (file)
--- a/drivers/gpu/drm/amd/display/dmub/dmub_srv.h
+++ b/drivers/gpu/drm/amd/display/dmub/dmub_srv.h
@@ -428,7 +428,6 @@ struct dmub_srv {
        enum dmub_asic asic;
        void *user_ctx;
        uint32_t fw_version;
-       uint32_t trace_buffer_size;
        bool is_virtual;
        struct dmub_fb scratch_mem_fb;
        volatile const struct dmub_fw_state *fw_state;

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 8b9af18e84fe025f6168cadb644d8361f812d53a..9e9a6a44a7ac4b4a949a2e8261d21dd3f218a15a 100644 (file)
--- a/drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c
+++ b/drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c
@@ -427,8 +427,6 @@ dmub_srv_calc_region_info(struct dmub_srv *dmub,
                        dmub->fw_version = fw_info->fw_version;
        }
 
-       dmub->trace_buffer_size = trace_buffer_size;
-
        trace_buff->base = dmub_align(mail->top, 256);
        trace_buff->top = trace_buff->base + dmub_align(trace_buffer_size, 64);