Commit a891d239 authored by Dennis Li's avatar Dennis Li Committed by Alex Deucher
Browse files

drm/amdgpu: set error query ready after all IPs late init 



If set error query ready in amdgpu_ras_late_init, which will
cause some IP blocks aren't initialized, but their error query
is ready.

Signed-off-by: default avatarDennis Li <Dennis.Li@amd.com>
Reviewed-by: default avatarGuchun Chen <guchun.chen@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7dd8c205

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

+2 −0
Original line number Diff line number Diff line
@@ -2216,6 +2216,8 @@ static int amdgpu_device_ip_late_init(struct amdgpu_device *adev) 
		adev->ip_blocks[i].status.late_initialized = true;

	}



	amdgpu_ras_set_error_query_ready(adev, true);



	amdgpu_device_set_cg_state(adev, AMD_CG_STATE_GATE);

	amdgpu_device_set_pg_state(adev, AMD_PG_STATE_GATE);

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

+1 −5
Original line number Diff line number Diff line
@@ -1921,10 +1921,8 @@ int amdgpu_ras_late_init(struct amdgpu_device *adev, 
	}



	/* in resume phase, no need to create ras fs node */

	if (adev->in_suspend || adev->in_gpu_reset) {

		amdgpu_ras_set_error_query_ready(adev, true);

	if (adev->in_suspend || adev->in_gpu_reset)

		return 0;

	}



	if (ih_info->cb) {

		r = amdgpu_ras_interrupt_add_handler(adev, ih_info);
@@ -1936,8 +1934,6 @@ int amdgpu_ras_late_init(struct amdgpu_device *adev, 
	if (r)

		goto sysfs;



	amdgpu_ras_set_error_query_ready(adev, true);



	return 0;

cleanup:

	amdgpu_ras_sysfs_remove(adev, ras_block);

CRA Git | Maintained and supported by SUSTech CRA and CCSE