Commit 19727635 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: set default gfx reset masks for gfx6-8 



These were not set so soft recovery was inadvertantly
disabled.

Fixes: 6ac55eab ("drm/amdgpu: move reset support type checks into the caller")
Reviewed-by: default avatarJesse Zhang <Jesse.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c0de5529

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

+5 −0
Original line number Diff line number Diff line
@@ -3102,6 +3102,11 @@ static int gfx_v6_0_sw_init(struct amdgpu_ip_block *ip_block) 
			return r;

	}



	adev->gfx.gfx_supported_reset =

		amdgpu_get_soft_full_reset_mask(&adev->gfx.gfx_ring[0]);

	adev->gfx.compute_supported_reset =

		amdgpu_get_soft_full_reset_mask(&adev->gfx.compute_ring[0]);



	return r;

}

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

+5 −0
Original line number Diff line number Diff line
@@ -4399,6 +4399,11 @@ static int gfx_v7_0_sw_init(struct amdgpu_ip_block *ip_block) 


	gfx_v7_0_gpu_early_init(adev);



	adev->gfx.gfx_supported_reset =

		amdgpu_get_soft_full_reset_mask(&adev->gfx.gfx_ring[0]);

	adev->gfx.compute_supported_reset =

		amdgpu_get_soft_full_reset_mask(&adev->gfx.compute_ring[0]);



	return r;

}

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

+5 −0
Original line number Diff line number Diff line
@@ -2023,6 +2023,11 @@ static int gfx_v8_0_sw_init(struct amdgpu_ip_block *ip_block) 
	if (r)

		return r;



	adev->gfx.gfx_supported_reset =

		amdgpu_get_soft_full_reset_mask(&adev->gfx.gfx_ring[0]);

	adev->gfx.compute_supported_reset =

		amdgpu_get_soft_full_reset_mask(&adev->gfx.compute_ring[0]);



	return 0;

}