Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

amdgpu/vce3: Remove magic constants from harvest register masks.

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Tom St Denis 9 years ago
parent
81da2edef9
commit
74af12762d
1 changed files with 4 additions and 4 deletions
Unified View Show Diff Stats
  1. 4 4
      drivers/gpu/drm/amd/amdgpu/vce_v3_0.c

+ 4 - 4
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
View File 

@@ -536,8 +536,8 @@ static bool vce_v3_0_is_idle(void *handle)
 
 	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
 	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
 	u32 mask = 0;
 
 	u32 mask = 0;
 
 
 
-	mask |= (adev->vce.harvest_config & (1<<0)) ? 0 : SRBM_STATUS2__VCE0_BUSY_MASK;
 
-	mask |= (adev->vce.harvest_config & (1<<1)) ? 0 : SRBM_STATUS2__VCE1_BUSY_MASK;
 
+	mask |= (adev->vce.harvest_config & AMDGPU_VCE_HARVEST_VCE0) ? 0 : SRBM_STATUS2__VCE0_BUSY_MASK;
 
+	mask |= (adev->vce.harvest_config & AMDGPU_VCE_HARVEST_VCE1) ? 0 : SRBM_STATUS2__VCE1_BUSY_MASK;
 
 
 
 	return !(RREG32(mmSRBM_STATUS2) & mask);
 
 	return !(RREG32(mmSRBM_STATUS2) & mask);
 
 }
 
 }
 
@@ -559,8 +559,8 @@ static int vce_v3_0_soft_reset(void *handle)
 
 	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
 	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
 	u32 mask = 0;
 
 	u32 mask = 0;
 
 
 
-	mask |= (adev->vce.harvest_config & (1<<0)) ? 0 : SRBM_SOFT_RESET__SOFT_RESET_VCE0_MASK;
 
-	mask |= (adev->vce.harvest_config & (1<<1)) ? 0 : SRBM_SOFT_RESET__SOFT_RESET_VCE1_MASK;
 
+	mask |= (adev->vce.harvest_config & AMDGPU_VCE_HARVEST_VCE0) ? 0 : SRBM_SOFT_RESET__SOFT_RESET_VCE0_MASK;
 
+	mask |= (adev->vce.harvest_config & AMDGPU_VCE_HARVEST_VCE1) ? 0 : SRBM_SOFT_RESET__SOFT_RESET_VCE1_MASK;
 
 
 
 	WREG32_P(mmSRBM_SOFT_RESET, mask,
 
 	WREG32_P(mmSRBM_SOFT_RESET, mask,
 
 		 ~(SRBM_SOFT_RESET__SOFT_RESET_VCE0_MASK |
 
 		 ~(SRBM_SOFT_RESET__SOFT_RESET_VCE0_MASK |