Commit 533aa8bd authored by Ce Sun's avatar Ce Sun Committed by Alex Deucher
Browse files

drm/amdgpu: Modify the count method of defer error 



The number of newly added de counts and the number of
newly added error addresses remain consistent

Signed-off-by: default avatarCe Sun <cesun102@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 085c997d

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

+1 −0
Original line number Diff line number Diff line
@@ -529,6 +529,7 @@ int amdgpu_umc_lookup_bad_pages_in_a_row(struct amdgpu_device *adev, 
		pfns[i] = err_data.err_addr[i].retired_page;

	}

	ret = i;

	adev->umc.err_addr_cnt = err_data.err_addr_cnt;



out:

	kfree(err_data.err_addr);

drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h

+2 −0
Original line number Diff line number Diff line
@@ -145,6 +145,8 @@ struct amdgpu_umc { 
	unsigned long active_mask;



	struct amdgpu_umc_flip_bits flip_bits;



	unsigned long err_addr_cnt;

};



int amdgpu_umc_ras_sw_init(struct amdgpu_device *adev);

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

+6 −2
Original line number Diff line number Diff line
@@ -482,6 +482,10 @@ static int umc_v12_0_aca_bank_parser(struct aca_handle *handle, struct aca_bank 
		bank->regs[ACA_REG_IDX_ADDR]);



	ext_error_code = ACA_REG__STATUS__ERRORCODEEXT(status);

	if (umc_v12_0_is_deferred_error(adev, status))

		count = ext_error_code == 0 ?

			adev->umc.err_addr_cnt / adev->umc.retire_unit : 1ULL;

	else

		count = ext_error_code == 0 ?

			ACA_REG__MISC0__ERRCNT(bank->regs[ACA_REG_IDX_MISC0]) : 1ULL;