diff options
| author | Chunming Zhou | 2016-08-03 08:55:46 +0200 |
|---|---|---|
| committer | Alex Deucher | 2016-08-08 17:33:22 +0200 |
| commit | 9c0171b41248805d928863fc87190e6530b71773 (patch) | |
| tree | bf74f32b70b77e10aae8955a890cbec411ccb4db /drivers/gpu | |
| parent | drm/amdgpu: irq resume should be immediately after gpu resume (diff) | |
| download | kernel-qcow2-linux-9c0171b41248805d928863fc87190e6530b71773.tar.gz kernel-qcow2-linux-9c0171b41248805d928863fc87190e6530b71773.tar.xz kernel-qcow2-linux-9c0171b41248805d928863fc87190e6530b71773.zip | |
drm/amdgpu: fix harvest config checking in vce3 check_soft_reset
Signed-off-by: Chunming Zhou <David1.Zhou@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c index 311b384a02d3..516882b07842 100644 --- a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +++ b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c @@ -631,9 +631,6 @@ static int vce_v3_0_check_soft_reset(void *handle) tmp = REG_SET_FIELD(tmp, GRBM_GFX_INDEX, INSTANCE_INDEX, 0); WREG32(mmGRBM_GFX_INDEX, tmp); - if (adev->vce.harvest_config & (AMDGPU_VCE_HARVEST_VCE0 | AMDGPU_VCE_HARVEST_VCE1)) - srbm_soft_reset = 0; - if (srbm_soft_reset) { adev->ip_block_status[AMD_IP_BLOCK_TYPE_VCE].hang = true; adev->vce.srbm_soft_reset = srbm_soft_reset; |