drm/amd/display: Ensure that DMCUB fw in use is loaded by DC and not VBIOS
[Why?] On wake from S3/S4, driver checks if DMUB is initialized. On S4 VBIOS loads DMUB, and driver does not reload as it appears to be initialized already. [How?] Add a check for the DAL_FW bit to ensure that loaded FW is from driver and not VBIOS. Signed-off-by: Dillon Varone <dillon.varone@amd.com> Signed-off-by: Fangzhi Zuo <Jerry.Zuo@amd.com> Reviewed-by: Aurabindo Pillai <aurabindo.pillai@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
218987fdea
commit
9fe5d08fc8
@ -299,11 +299,13 @@ void dmub_dcn32_set_outbox1_rptr(struct dmub_srv *dmub, uint32_t rptr_offset)
|
||||
|
||||
bool dmub_dcn32_is_hw_init(struct dmub_srv *dmub)
|
||||
{
|
||||
union dmub_fw_boot_status status;
|
||||
uint32_t is_hw_init;
|
||||
|
||||
status.all = REG_READ(DMCUB_SCRATCH0);
|
||||
REG_GET(DMCUB_CNTL, DMCUB_ENABLE, &is_hw_init);
|
||||
|
||||
return is_hw_init != 0;
|
||||
return is_hw_init != 0 && status.bits.dal_fw;
|
||||
}
|
||||
|
||||
bool dmub_dcn32_is_supported(struct dmub_srv *dmub)
|
||||
|
Loading…
x
Reference in New Issue
Block a user