Commit 3f232a0f authored by Anthony Koo's avatar Anthony Koo Committed by Alex Deucher
Browse files

drm/amd/display: [FW Promotion] Release 0.0.93 



 - Fix ARR39-C issue with scaled integer addition in rb func

Reviewed-by: default avatarAric Cyr <Aric.Cyr@amd.com>
Acked-by: default avatarWayne Lin <wayne.lin@amd.com>
Signed-off-by: default avatarAnthony Koo <Anthony.Koo@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1f49355c

drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h

+5 −5
Original line number Diff line number Diff line
@@ -46,10 +46,10 @@ 


/* Firmware versioning. */

#ifdef DMUB_EXPOSE_VERSION

#define DMUB_FW_VERSION_GIT_HASH 0x058d3791

#define DMUB_FW_VERSION_GIT_HASH 0xcd0e1e7a

#define DMUB_FW_VERSION_MAJOR 0

#define DMUB_FW_VERSION_MINOR 0

#define DMUB_FW_VERSION_REVISION 92

#define DMUB_FW_VERSION_REVISION 93

#define DMUB_FW_VERSION_TEST 0

#define DMUB_FW_VERSION_VBIOS 0

#define DMUB_FW_VERSION_HOTFIX 0
@@ -2725,7 +2725,7 @@ static inline bool dmub_rb_full(struct dmub_rb *rb) 
static inline bool dmub_rb_push_front(struct dmub_rb *rb,

				      const union dmub_rb_cmd *cmd)

{

	uint64_t volatile *dst = (uint64_t volatile *)(rb->base_address) + rb->wrpt / sizeof(uint64_t);

	uint64_t volatile *dst = (uint64_t volatile *)((uint8_t *)(rb->base_address) + rb->wrpt);

	const uint64_t *src = (const uint64_t *)cmd;

	uint8_t i;
@@ -2843,7 +2843,7 @@ static inline bool dmub_rb_peek_offset(struct dmub_rb *rb, 
static inline bool dmub_rb_out_front(struct dmub_rb *rb,

				 union dmub_rb_out_cmd *cmd)

{

	const uint64_t volatile *src = (const uint64_t volatile *)(rb->base_address) + rb->rptr / sizeof(uint64_t);

	const uint64_t volatile *src = (const uint64_t volatile *)((uint8_t *)(rb->base_address) + rb->rptr);

	uint64_t *dst = (uint64_t *)cmd;

	uint8_t i;
@@ -2891,7 +2891,7 @@ static inline void dmub_rb_flush_pending(const struct dmub_rb *rb) 
	uint32_t wptr = rb->wrpt;



	while (rptr != wptr) {

		uint64_t volatile *data = (uint64_t volatile *)rb->base_address + rptr / sizeof(uint64_t);

		uint64_t volatile *data = (uint64_t volatile *)((uint8_t *)(rb->base_address) + rptr);

		//uint64_t volatile *p = (uint64_t volatile *)data;

		uint64_t temp;

		uint8_t i;