diff options
| author | Jack Zhang <Jack.Zhang1@amd.com> | 2020-04-07 08:44:51 +0300 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2020-04-09 17:43:15 +0300 |
| commit | fe9824d15eff7ef38f63eddd1a06648e49286c7b (patch) | |
| tree | 49464ed7abbee93984e847310facf1b213cdf202 /drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | |
| parent | 4a06686b948579be72a6783c62e5a275af63b0f8 (diff) | |
| download | linux-fe9824d15eff7ef38f63eddd1a06648e49286c7b.tar.xz | |
drm/amdkfd Avoid destroy hqd when GPU is on reset
This reverts commit 5161bba4311f in order to split it into two
different patches, and this will make it easier to understand.
[PATCH 1/2]
porting to gfx10 from
commit 1b0bfcff463f390c40 ("drm/amdgpu: Avoid destroy hqd when GPU is on reset")
Originally, MEC is touched
without GPU initialized first.
Signed-off-by: Jack Zhang <Jack.Zhang1@amd.com>
Reviewed-by: Monk Liu <monk.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c index bdc1f5a532f3..691c89705bcd 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c @@ -543,8 +543,8 @@ static int kgd_hqd_destroy(struct kgd_dev *kgd, void *mqd, uint32_t temp; struct v10_compute_mqd *m = get_mqd(mqd); - if (amdgpu_sriov_vf(adev) && adev->in_gpu_reset) - return 0; + if (adev->in_gpu_reset) + return -EIO; #if 0 unsigned long flags; |