diff options
| author | John Clements <john.clements@amd.com> | 2020-11-10 14:39:42 +0800 |
|---|---|---|
| committer | John Clements <john.clements@amd.com> | 2020-11-10 14:39:42 +0800 |
| commit | a0c44b6c7765a98cefcc095e9d4faf73b2474b34 (patch) | |
| tree | 07dca1601e82043adc86b674500f9bd9952d497e | |
| parent | 05ad371328b8b710567dc317d7bc2e6e7901319e (diff) | |
drm/amdgpu: disable bad page reservation
in event of ECC RAS error do not reserve bad page
Signed-off-by: John Clements <john.clements@amd.com>
Change-Id: I5f5c126d026ee0cbc6a70046d0af6cdfe32115cf
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c index 6c57521b21fe..d4747b49bf90 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c @@ -1596,7 +1596,7 @@ int amdgpu_ras_add_bad_pages(struct amdgpu_device *adev, struct ras_err_handler_data *data; int ret = 0; - if (!con || !con->eh_data || !bps || pages <= 0) + if (!con || !con->eh_data || !bps || pages <= 0 || (adev->asic_type == CHIP_SIENNA_CICHLID)) return 0; mutex_lock(&con->recovery_lock); diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c index 262baf0f61ea..e6ac9cf23f3f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c @@ -125,12 +125,6 @@ int amdgpu_umc_process_ras_data_cb(struct amdgpu_device *adev, "detected in UMC block\n", err_data->ue_count); - if ((amdgpu_bad_page_threshold != 0) && - err_data->err_addr_cnt && - amdgpu_ras_add_bad_pages(adev, err_data->err_addr, - err_data->err_addr_cnt)) - dev_warn(adev->dev, "Failed to add ras bad page!\n"); - amdgpu_ras_reset_gpu(adev); } |