drm/amd: Move microcode init from sw_init to early_init for SDMA v3.0

As part of IP discovery early_init is run for all HW IP blocks.
During this phase all firmware is supposed to be identified that may
be missing so that the driver can avoid releasing resources used by
the EFI framebuffer or simpledrm until the last possible moment.

Move microcode loading from sw_init to early_init.

Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
index dc7aab68ed663042b6182174cb17c339d99bc215..c5ea32687eb5e8038ef19ce308d0452d7e53b60b 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
@@ -1087,6 +1087,7 @@ static void sdma_v3_0_ring_emit_wreg(struct amdgpu_ring *ring,
 static int sdma_v3_0_early_init(void *handle)
 {
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
+       int r;
 
        switch (adev->asic_type) {
        case CHIP_STONEY:
@@ -1097,6 +1098,10 @@ static int sdma_v3_0_early_init(void *handle)
                break;
        }
 
+       r = sdma_v3_0_init_microcode(adev);
+       if (r)
+               return r;
+
        sdma_v3_0_set_ring_funcs(adev);
        sdma_v3_0_set_buffer_funcs(adev);
        sdma_v3_0_set_vm_pte_funcs(adev);
@@ -1129,10 +1134,6 @@ static int sdma_v3_0_sw_init(void *handle)
        if (r)
                return r;
 
-       r = sdma_v3_0_init_microcode(adev);
-       if (r)
-               return r;
-
        for (i = 0; i < adev->sdma.num_instances; i++) {
                ring = &adev->sdma.instance[i].ring;
                ring->ring_obj = NULL;