From 19822264d6837ae5e495404f4444311897f5776f Mon Sep 17 00:00:00 2001 From: Anthony Koo Date: Sat, 9 May 2020 17:32:10 -0400 Subject: [PATCH] drm/amd/display: FW Release 1.0.11 Signed-off-by: Anthony Koo Reviewed-by: Anthony Koo Acked-by: Rodrigo Siqueira Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/dmub/inc/dmub_fw_meta.h | 2 ++ drivers/gpu/drm/amd/display/dmub/inc/dmub_rb.h | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dmub/inc/dmub_fw_meta.h b/drivers/gpu/drm/amd/display/dmub/inc/dmub_fw_meta.h index 242ec257998c..b657c51c9ac9 100644 --- a/drivers/gpu/drm/amd/display/dmub/inc/dmub_fw_meta.h +++ b/drivers/gpu/drm/amd/display/dmub/inc/dmub_fw_meta.h @@ -45,11 +45,13 @@ * @magic_value: magic value identifying DMUB firmware meta info * @fw_region_size: size of the firmware state region * @trace_buffer_size: size of the tracebuffer region + * @fw_version: the firmware version information */ struct dmub_fw_meta_info { uint32_t magic_value; uint32_t fw_region_size; uint32_t trace_buffer_size; + uint32_t fw_version; }; /* Ensure that the structure remains 64 bytes. */ diff --git a/drivers/gpu/drm/amd/display/dmub/inc/dmub_rb.h b/drivers/gpu/drm/amd/display/dmub/inc/dmub_rb.h index 2ae48c18bb5b..31f471f549a6 100644 --- a/drivers/gpu/drm/amd/display/dmub/inc/dmub_rb.h +++ b/drivers/gpu/drm/amd/display/dmub/inc/dmub_rb.h @@ -37,6 +37,8 @@ struct dmub_rb_init_params { void *ctx; void *base_address; uint32_t capacity; + uint32_t read_ptr; + uint32_t write_ptr; }; struct dmub_rb { @@ -141,8 +143,8 @@ static inline void dmub_rb_init(struct dmub_rb *rb, { rb->base_address = init_params->base_address; rb->capacity = init_params->capacity; - rb->rptr = 0; - rb->wrpt = 0; + rb->rptr = init_params->read_ptr; + rb->wrpt = init_params->write_ptr; } #if defined(__cplusplus) -- 2.20.1