amdgpu/vce3: Simplify vce_v3_0_soft_reset()

LOC reduction and simplification.

Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
index f20529d5cb84ff9ce0fd8fcccb08c16b7be27ba8..d50db761e327de02c39c1e6b80acf10cfd5e98a8 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
@@ -558,17 +558,10 @@ static int vce_v3_0_soft_reset(void *handle)
 {
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
        u32 mask = 0;
-       int idx;
 
-       for (idx = 0; idx < 2; ++idx) {
-               if (adev->vce.harvest_config & (1 << idx))
-                       continue;
+       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;
 
-               if (idx == 0)
-                       mask |= SRBM_SOFT_RESET__SOFT_RESET_VCE0_MASK;
-               else
-                       mask |= SRBM_SOFT_RESET__SOFT_RESET_VCE1_MASK;
-       }
        WREG32_P(mmSRBM_SOFT_RESET, mask,
                 ~(SRBM_SOFT_RESET__SOFT_RESET_VCE0_MASK |
                   SRBM_SOFT_RESET__SOFT_RESET_VCE1_MASK));