Commit d740a39c authored by Nicholas Kazlauskas's avatar Nicholas Kazlauskas Committed by Alex Deucher
Browse files

drm/amd/display: Fix reset sequence with driver direct DMCUB fw load 



[Why]
DMCUB encounters a page fault/double exception with driver direct load
because DMCUB is not held in soft reset after releasing secure reset.

The clean shutdown sequence via GPINT is also not executed in this
sequence which leaves hardware behavior in an indeterminate state.

[How]
Move reset earlier in the sequence.

Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Reviewed-by: default avatarEric Yang <eric.yang2@amd.com>
Acked-by: default avatarAnson Jacob <anson.jacob@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 44a09e3d

drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c

+3 −3
Original line number Diff line number Diff line
@@ -406,6 +406,9 @@ enum dmub_status dmub_srv_hw_init(struct dmub_srv *dmub, 
	dmub->fb_offset = params->fb_offset;

	dmub->psp_version = params->psp_version;



	if (dmub->hw_funcs.reset)

		dmub->hw_funcs.reset(dmub);



	if (inst_fb && data_fb) {

		cw0.offset.quad_part = inst_fb->gpu_addr;

		cw0.region.base = DMUB_CW0_BASE;
@@ -427,9 +430,6 @@ enum dmub_status dmub_srv_hw_init(struct dmub_srv *dmub, 


	}



	if (dmub->hw_funcs.reset)

		dmub->hw_funcs.reset(dmub);



	if (inst_fb && data_fb && bios_fb && mail_fb && tracebuff_fb &&

	    fw_state_fb && scratch_mem_fb) {

		cw2.offset.quad_part = data_fb->gpu_addr;