drm/amd/display: Allow dmub srv hardware reset before HW init
authorNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Tue, 15 Dec 2020 14:19:20 +0000 (09:19 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 20 Jan 2021 21:38:19 +0000 (16:38 -0500)
[Why]
We need hardware reset before hardware init for backdoor loading when
we're reusing the framebuffer memory.

[How]
This doesn't run if the hardware isn't already in reset from software
perspective. The reset function has register level checks so just
remove the software one here.

Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Reviewed-by: Eric Yang <eric.yang2@amd.com>
Acked-by: Anson Jacob <anson.jacob@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c

index f388d36af0b6c1e0505a5ef3758182c33d96bfde..d2588b7cd325514634fe7247bc497d9aa33d2a4a 100644 (file)
@@ -489,9 +489,6 @@ enum dmub_status dmub_srv_hw_reset(struct dmub_srv *dmub)
        if (!dmub->sw_init)
                return DMUB_STATUS_INVALID;
 
-       if (dmub->hw_init == false)
-               return DMUB_STATUS_OK;
-
        if (dmub->hw_funcs.reset)
                dmub->hw_funcs.reset(dmub);