Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73f847db authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amdgpu: Refine function amdgpu_device_ip_late_init 



1. only call late_init when hw_init successful,
   so check status.hw instand of status.valid in late_init.
2. set status.late_initialized true if late_init was not implemented.

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 009d9ed6

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

+2 −2
Original line number Diff line number Diff line
@@ -1723,7 +1723,7 @@ static int amdgpu_device_ip_late_init(struct amdgpu_device *adev) 
	int i = 0, r;



	for (i = 0; i < adev->num_ip_blocks; i++) {

		if (!adev->ip_blocks[i].status.valid)

		if (!adev->ip_blocks[i].status.hw)

			continue;

		if (adev->ip_blocks[i].version->funcs->late_init) {

			r = adev->ip_blocks[i].version->funcs->late_init((void *)adev);
@@ -1732,8 +1732,8 @@ static int amdgpu_device_ip_late_init(struct amdgpu_device *adev) 
					  adev->ip_blocks[i].version->funcs->name, r);

				return r;

			}

			adev->ip_blocks[i].status.late_initialized = true;

		}

		adev->ip_blocks[i].status.late_initialized = true;

	}



	amdgpu_device_set_cg_state(adev, AMD_CG_STATE_GATE);