drm/amdgpu: fix harvest config checking in vce3 check_soft_reset
authorChunming Zhou <David1.Zhou@amd.com>
Wed, 3 Aug 2016 06:55:46 +0000 (14:55 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 8 Aug 2016 15:33:22 +0000 (11:33 -0400)
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>
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c

index 311b384a02d3684ef4d798b1981aebc6e741d4c1..516882b07842b234364def9eff36f6a232c91e88 100644 (file)
@@ -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;