drm/amdgpu: enable VCE 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>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index c715f1bd459894388a82127f1347c544079607c1..72d5d094965d27ee121a0a426fbe46a12e27e165 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -1977,7 +1977,6 @@ static bool amdgpu_need_full_reset(struct amdgpu_device *adev)
 {
        if (adev->ip_block_status[AMD_IP_BLOCK_TYPE_GMC].hang ||
            adev->ip_block_status[AMD_IP_BLOCK_TYPE_SMC].hang ||
-           adev->ip_block_status[AMD_IP_BLOCK_TYPE_VCE].hang ||
            adev->ip_block_status[AMD_IP_BLOCK_TYPE_ACP].hang ||
            adev->ip_block_status[AMD_IP_BLOCK_TYPE_DCE].hang) {
                DRM_INFO("Some block need full reset!\n");

diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
index 76d5d6893c8935b3911da4d6bfe301268fcac675..7e6bb45658f65ba8b4064a843c0c53e395e508ae 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
@@ -601,9 +601,6 @@ static int vce_v3_0_check_soft_reset(void *handle)
        u32 srbm_soft_reset = 0;
        u32 tmp;
 
-       /* VCE BUG: it is always busy, so skip its checking now */
-       return 0;
-
        /* According to VCE team , we should use VCE_STATUS instead
         * SRBM_STATUS.VCE_BUSY bit for busy status checking.
         * GRBM_GFX_INDEX.INSTANCE_INDEX is used to specify which VCE