Commit 13c84bbe authored by Anthony Koo's avatar Anthony Koo Committed by Alex Deucher

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

 - Minor formatting changes
 - Update defines to match the bit width of the field it is used for
 - Add new boot up bits to control HW sub block regions power
   down
Reviewed-by: default avatarAric Cyr <aric.cyr@amd.com>
Acked-by: default avatarHersen Wu <hersenxs.wu@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 89830c62
...@@ -583,6 +583,7 @@ union dmub_fw_boot_status { ...@@ -583,6 +583,7 @@ union dmub_fw_boot_status {
uint32_t fams_enabled : 1; /**< 1 if VBIOS data is deferred programmed */ uint32_t fams_enabled : 1; /**< 1 if VBIOS data is deferred programmed */
uint32_t detection_required: 1; /**< if detection need to be triggered by driver */ uint32_t detection_required: 1; /**< if detection need to be triggered by driver */
uint32_t hw_power_init_done: 1; /**< 1 if hw power init is completed */ uint32_t hw_power_init_done: 1; /**< 1 if hw power init is completed */
uint32_t ono_regions_enabled: 1; /**< 1 if ONO regions are enabled */
} bits; /**< status bits */ } bits; /**< status bits */
uint32_t all; /**< 32-bit access to status bits */ uint32_t all; /**< 32-bit access to status bits */
}; };
...@@ -599,6 +600,7 @@ enum dmub_fw_boot_status_bit { ...@@ -599,6 +600,7 @@ enum dmub_fw_boot_status_bit {
DMUB_FW_BOOT_STATUS_BIT_FAMS_ENABLED = (1 << 5), /**< 1 if FAMS is enabled*/ DMUB_FW_BOOT_STATUS_BIT_FAMS_ENABLED = (1 << 5), /**< 1 if FAMS is enabled*/
DMUB_FW_BOOT_STATUS_BIT_DETECTION_REQUIRED = (1 << 6), /**< 1 if detection need to be triggered by driver*/ DMUB_FW_BOOT_STATUS_BIT_DETECTION_REQUIRED = (1 << 6), /**< 1 if detection need to be triggered by driver*/
DMUB_FW_BOOT_STATUS_BIT_HW_POWER_INIT_DONE = (1 << 7), /**< 1 if hw power init is completed */ DMUB_FW_BOOT_STATUS_BIT_HW_POWER_INIT_DONE = (1 << 7), /**< 1 if hw power init is completed */
DMUB_FW_BOOT_STATUS_BIT_ONO_REGIONS_ENABLED = (1 << 8), /**< 1 if ONO regions are enabled */
}; };
/* Register bit definition for SCRATCH5 */ /* Register bit definition for SCRATCH5 */
...@@ -2098,7 +2100,7 @@ enum psr_version { ...@@ -2098,7 +2100,7 @@ enum psr_version {
/** /**
* PSR not supported. * PSR not supported.
*/ */
PSR_VERSION_UNSUPPORTED = 0xFFFFFFFF, PSR_VERSION_UNSUPPORTED = 0xFF, // psr_version field is only 8 bits wide
}; };
/** /**
...@@ -3620,7 +3622,6 @@ struct dmub_cmd_abm_pause_data { ...@@ -3620,7 +3622,6 @@ struct dmub_cmd_abm_pause_data {
uint8_t pad[1]; uint8_t pad[1];
}; };
/** /**
* Definition of a DMUB_CMD__ABM_PAUSE command. * Definition of a DMUB_CMD__ABM_PAUSE command.
*/ */
...@@ -4046,6 +4047,7 @@ union dmub_rb_cmd { ...@@ -4046,6 +4047,7 @@ union dmub_rb_cmd {
* Definition of a DMUB_CMD__MALL command. * Definition of a DMUB_CMD__MALL command.
*/ */
struct dmub_rb_cmd_mall mall; struct dmub_rb_cmd_mall mall;
/** /**
* Definition of a DMUB_CMD__CAB command. * Definition of a DMUB_CMD__CAB command.
*/ */
...@@ -4067,6 +4069,7 @@ union dmub_rb_cmd { ...@@ -4067,6 +4069,7 @@ union dmub_rb_cmd {
* Definition of DMUB_CMD__PANEL_CNTL commands. * Definition of DMUB_CMD__PANEL_CNTL commands.
*/ */
struct dmub_rb_cmd_panel_cntl panel_cntl; struct dmub_rb_cmd_panel_cntl panel_cntl;
/** /**
* Definition of a DMUB_CMD__ABM_SET_PIPE command. * Definition of a DMUB_CMD__ABM_SET_PIPE command.
*/ */
...@@ -4470,10 +4473,6 @@ static inline void dmub_rb_flush_pending(const struct dmub_rb *rb) ...@@ -4470,10 +4473,6 @@ static inline void dmub_rb_flush_pending(const struct dmub_rb *rb)
uint64_t *data = (uint64_t *)((uint8_t *)(rb->base_address) + rptr); uint64_t *data = (uint64_t *)((uint8_t *)(rb->base_address) + rptr);
uint8_t i; uint8_t i;
/* Don't remove this.
* The contents need to actually be read from the ring buffer
* for this function to be effective.
*/
for (i = 0; i < DMUB_RB_CMD_SIZE / sizeof(uint64_t); i++) for (i = 0; i < DMUB_RB_CMD_SIZE / sizeof(uint64_t); i++)
(void)READ_ONCE(*data++); (void)READ_ONCE(*data++);
...@@ -4522,5 +4521,4 @@ static inline void dmub_rb_get_return_data(struct dmub_rb *rb, ...@@ -4522,5 +4521,4 @@ static inline void dmub_rb_get_return_data(struct dmub_rb *rb,
//============================================================================== //==============================================================================
//</DMUB_RB>==================================================================== //</DMUB_RB>====================================================================
//============================================================================== //==============================================================================
#endif /* _DMUB_CMD_H_ */ #endif /* _DMUB_CMD_H_ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment