drm/amd/display: FW Release 1.0.11

Signed-off-by: Anthony Koo <Anthony.Koo@amd.com>
Reviewed-by: Anthony Koo <Anthony.Koo@amd.com>
Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

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 242ec25..b657c51 100644 (file)
--- 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 2ae48c1..31f471f 100644 (file)
--- 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)