Commit e283f4fb authored by Lijo Lazar's avatar Lijo Lazar Committed by Alex Deucher
Browse files

drm/amdgpu: Use reset recovery state checks 



Some in_reset checks are infact checking whether the state is
reinitialization after reset. Replace with reset_in_recovery calls to
identify that it's really checking for recovery stage after reset.

Signed-off-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Acked-by: default avatarTao Zhou <tao.zhou1@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a86e0c0e

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

+1 −1
Original line number Diff line number Diff line
@@ -3258,7 +3258,7 @@ static int amdgpu_device_ip_late_init(struct amdgpu_device *adev) 
		return r;

	}



	if (!amdgpu_in_reset(adev))

	if (!amdgpu_reset_in_recovery(adev))

		amdgpu_ras_set_error_query_ready(adev, true);



	amdgpu_device_set_cg_state(adev, AMD_CG_STATE_GATE);

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

+5 −5
Original line number Diff line number Diff line
@@ -1298,7 +1298,7 @@ int amdgpu_ras_bind_aca(struct amdgpu_device *adev, enum amdgpu_ras_block blk, 
	struct ras_manager *obj;



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

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

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

		return 0;



	obj = get_ras_manager(adev, blk);
@@ -3610,7 +3610,7 @@ static void amdgpu_ras_event_mgr_init(struct amdgpu_device *adev) 
	ras->event_mgr = hive ? &hive->event_mgr : &ras->__event_mgr;



	/* init event manager with node 0 on xgmi system */

	if (!amdgpu_in_reset(adev)) {

	if (!amdgpu_reset_in_recovery(adev)) {

		if (!hive || adev->gmc.xgmi.node_id == 0)

			ras_event_mgr_init(ras->event_mgr);

	}
@@ -3825,7 +3825,7 @@ int amdgpu_ras_block_late_init(struct amdgpu_device *adev, 


	r = amdgpu_ras_feature_enable_on_boot(adev, ras_block, 1);

	if (r) {

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

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

			/* in resume phase, if fail to enable ras,

			 * clean up all ras fs nodes, and disable ras */

			goto cleanup;
@@ -3837,7 +3837,7 @@ int amdgpu_ras_block_late_init(struct amdgpu_device *adev, 
	amdgpu_persistent_edc_harvesting(adev, ras_block);



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

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

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

		return 0;



	ras_obj = container_of(ras_block, struct amdgpu_ras_block_object, ras_comm);
@@ -3967,7 +3967,7 @@ int amdgpu_ras_late_init(struct amdgpu_device *adev) 
	amdgpu_ras_event_mgr_init(adev);



	if (amdgpu_ras_aca_is_supported(adev)) {

		if (amdgpu_in_reset(adev)) {

		if (amdgpu_reset_in_recovery(adev)) {

			if (amdgpu_aca_is_enabled(adev))

				r = amdgpu_aca_reset(adev);

			else