Skip to content
Snippets Groups Projects
Commit 43a4269d authored by Dillon Varone's avatar Dillon Varone Committed by Linux Infrastructure
Browse files

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: default avatarFangzhi Zuo <Jerry.Zuo@amd.com>
Reviewed-by: default avatarAurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f2e8cc2f
No related branches found
No related tags found
No related merge requests found
...@@ -299,11 +299,13 @@ void dmub_dcn32_set_outbox1_rptr(struct dmub_srv *dmub, uint32_t rptr_offset) ...@@ -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) bool dmub_dcn32_is_hw_init(struct dmub_srv *dmub)
{ {
union dmub_fw_boot_status status;
uint32_t is_hw_init; uint32_t is_hw_init;
status.all = REG_READ(DMCUB_SCRATCH0);
REG_GET(DMCUB_CNTL, DMCUB_ENABLE, &is_hw_init); 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) bool dmub_dcn32_is_supported(struct dmub_srv *dmub)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment