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

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

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

+0 −2
Original line number Diff line number Diff line
@@ -960,8 +960,6 @@ struct amdgpu_device { 
	int asic_reset_res;

	struct work_struct		xgmi_reset_work;



	bool                            in_baco_reset;



	long				gfx_timeout;

	long				sdma_timeout;

	long				video_timeout;

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

+0 −2
Original line number Diff line number Diff line
@@ -516,8 +516,6 @@ static int soc15_asic_baco_reset(struct amdgpu_device *adev) 


	dev_info(adev->dev, "GPU BACO reset\n");



	adev->in_baco_reset = 1;



	return 0;

}

drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c

+2 −2
Original line number Diff line number Diff line
@@ -493,8 +493,8 @@ static int vega20_setup_asic_task(struct pp_hwmgr *hwmgr) 
			"Failed to init sclk threshold!",

			return ret);



	if (adev->in_baco_reset) {

		adev->in_baco_reset = 0;

	if (adev->in_gpu_reset &&

	    (amdgpu_asic_reset_method(adev) == AMD_RESET_METHOD_BACO)) {



		ret = vega20_baco_apply_vdci_flush_workaround(hwmgr);

		if (ret)