]>
Commit | Line | Data |
---|---|---|
38fb5169 GKH |
1 | From 5887a59961e2295c5b02f39dbc0ecf9212709b7b Mon Sep 17 00:00:00 2001 |
2 | From: Alex Deucher <alexander.deucher@amd.com> | |
3 | Date: Fri, 17 May 2019 09:21:13 -0500 | |
4 | Subject: drm/amdgpu/soc15: skip reset on init | |
5 | ||
6 | From: Alex Deucher <alexander.deucher@amd.com> | |
7 | ||
8 | commit 5887a59961e2295c5b02f39dbc0ecf9212709b7b upstream. | |
9 | ||
10 | Not necessary on soc15 and breaks driver reload on server cards. | |
11 | ||
12 | Acked-by: Amber Lin <Amber.Lin@amd.com> | |
13 | Signed-off-by: Alex Deucher <alexander.deucher@amd.com> | |
14 | Cc: stable@vger.kernel.org | |
15 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
16 | ||
17 | --- | |
18 | drivers/gpu/drm/amd/amdgpu/soc15.c | 5 +++++ | |
19 | 1 file changed, 5 insertions(+) | |
20 | ||
21 | --- a/drivers/gpu/drm/amd/amdgpu/soc15.c | |
22 | +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c | |
23 | @@ -495,6 +495,11 @@ int soc15_set_ip_blocks(struct amdgpu_de | |
24 | return -EINVAL; | |
25 | } | |
26 | ||
27 | + /* Just return false for soc15 GPUs. Reset does not seem to | |
28 | + * be necessary. | |
29 | + */ | |
30 | + return false; | |
31 | + | |
32 | if (adev->flags & AMD_IS_APU) | |
33 | adev->nbio_funcs = &nbio_v7_0_funcs; | |
34 | else if (adev->asic_type == CHIP_VEGA20) |