Commit e0d4fbb5 authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher
Browse files

drm/amd: Move microcode init from sw_init to early_init for SDMA v5.2 



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: default avatarMario Limonciello <mario.limonciello@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 95b456d3

drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c

+5 −4
Original line number Diff line number Diff line
@@ -1172,6 +1172,11 @@ static void sdma_v5_2_ring_emit_reg_write_reg_wait(struct amdgpu_ring *ring, 
static int sdma_v5_2_early_init(void *handle)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;

	int r;



	r = amdgpu_sdma_init_microcode(adev, 0, true);

	if (r)

		return r;



	sdma_v5_2_set_ring_funcs(adev);

	sdma_v5_2_set_buffer_funcs(adev);
@@ -1231,10 +1236,6 @@ static int sdma_v5_2_sw_init(void *handle) 
			return r;

	}



	r = amdgpu_sdma_init_microcode(adev, 0, true);

	if (r)

		return r;



	for (i = 0; i < adev->sdma.num_instances; i++) {

		ring = &adev->sdma.instance[i].ring;

		ring->ring_obj = NULL;