浏览代码

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>
Chunming Zhou 9 年之前
父节点
当前提交
bde1d8b228
共有 2 个文件被更改,包括 0 次插入4 次删除
  1. 0 1
      drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
  2. 0 3
      drivers/gpu/drm/amd/amdgpu/vce_v3_0.c

+ 0 - 1
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");

+ 0 - 3
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