Commit 31fa2991 authored by Alex Deucher's avatar Alex Deucher

drm/amdgpu: remove in_baco_reset hack

It was a vega20 specific hack.  Check if we are in reset
and what reset method we are using.
Reviewed-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f5fda6d8
...@@ -960,8 +960,6 @@ struct amdgpu_device { ...@@ -960,8 +960,6 @@ struct amdgpu_device {
int asic_reset_res; int asic_reset_res;
struct work_struct xgmi_reset_work; struct work_struct xgmi_reset_work;
bool in_baco_reset;
long gfx_timeout; long gfx_timeout;
long sdma_timeout; long sdma_timeout;
long video_timeout; long video_timeout;
......
...@@ -516,8 +516,6 @@ static int soc15_asic_baco_reset(struct amdgpu_device *adev) ...@@ -516,8 +516,6 @@ static int soc15_asic_baco_reset(struct amdgpu_device *adev)
dev_info(adev->dev, "GPU BACO reset\n"); dev_info(adev->dev, "GPU BACO reset\n");
adev->in_baco_reset = 1;
return 0; return 0;
} }
......
...@@ -493,8 +493,8 @@ static int vega20_setup_asic_task(struct pp_hwmgr *hwmgr) ...@@ -493,8 +493,8 @@ static int vega20_setup_asic_task(struct pp_hwmgr *hwmgr)
"Failed to init sclk threshold!", "Failed to init sclk threshold!",
return ret); return ret);
if (adev->in_baco_reset) { if (adev->in_gpu_reset &&
adev->in_baco_reset = 0; (amdgpu_asic_reset_method(adev) == AMD_RESET_METHOD_BACO)) {
ret = vega20_baco_apply_vdci_flush_workaround(hwmgr); ret = vega20_baco_apply_vdci_flush_workaround(hwmgr);
if (ret) if (ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment