aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/amd/amdgpu/vce_v3_0.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
index d3e7ba60d99c..ad56b1f49b09 100644
--- a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
@@ -536,8 +536,8 @@ static bool vce_v3_0_is_idle(void *handle)
536 struct amdgpu_device *adev = (struct amdgpu_device *)handle; 536 struct amdgpu_device *adev = (struct amdgpu_device *)handle;
537 u32 mask = 0; 537 u32 mask = 0;
538 538
539 mask |= (adev->vce.harvest_config & (1<<0)) ? 0 : SRBM_STATUS2__VCE0_BUSY_MASK; 539 mask |= (adev->vce.harvest_config & AMDGPU_VCE_HARVEST_VCE0) ? 0 : SRBM_STATUS2__VCE0_BUSY_MASK;
540 mask |= (adev->vce.harvest_config & (1<<1)) ? 0 : SRBM_STATUS2__VCE1_BUSY_MASK; 540 mask |= (adev->vce.harvest_config & AMDGPU_VCE_HARVEST_VCE1) ? 0 : SRBM_STATUS2__VCE1_BUSY_MASK;
541 541
542 return !(RREG32(mmSRBM_STATUS2) & mask); 542 return !(RREG32(mmSRBM_STATUS2) & mask);
543} 543}
@@ -559,8 +559,8 @@ static int vce_v3_0_soft_reset(void *handle)
559 struct amdgpu_device *adev = (struct amdgpu_device *)handle; 559 struct amdgpu_device *adev = (struct amdgpu_device *)handle;
560 u32 mask = 0; 560 u32 mask = 0;
561 561
562 mask |= (adev->vce.harvest_config & (1<<0)) ? 0 : SRBM_SOFT_RESET__SOFT_RESET_VCE0_MASK; 562 mask |= (adev->vce.harvest_config & AMDGPU_VCE_HARVEST_VCE0) ? 0 : SRBM_SOFT_RESET__SOFT_RESET_VCE0_MASK;
563 mask |= (adev->vce.harvest_config & (1<<1)) ? 0 : SRBM_SOFT_RESET__SOFT_RESET_VCE1_MASK; 563 mask |= (adev->vce.harvest_config & AMDGPU_VCE_HARVEST_VCE1) ? 0 : SRBM_SOFT_RESET__SOFT_RESET_VCE1_MASK;
564 564
565 WREG32_P(mmSRBM_SOFT_RESET, mask, 565 WREG32_P(mmSRBM_SOFT_RESET, mask,
566 ~(SRBM_SOFT_RESET__SOFT_RESET_VCE0_MASK | 566 ~(SRBM_SOFT_RESET__SOFT_RESET_VCE0_MASK |