drm/amdgpu/vcn2.5: fix a bug for the 2nd vcn instance (v2)

Fix a bug for the 2nd vcn instance at start and stop.

v2: squash in unused label removal.

Signed-off-by: James Zhu <James.Zhu@amd.com>
Reviewed-by: Leo Liu <leo.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
index d8455b62567dcb95349f0f6bf2dc1892f651af44..bb31258e3340491d19271128568d0b78e0da9b20 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c
@@ -891,8 +891,10 @@ static int vcn_v2_5_start(struct amdgpu_device *adev)
        for (i = 0; i < adev->vcn.num_vcn_inst; ++i) {
                if (adev->vcn.harvest_config & (1 << i))
                        continue;
-               if (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG)
-                       return vcn_v2_5_start_dpg_mode(adev, i, adev->vcn.indirect_sram);
+               if (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG) {
+                       r = vcn_v2_5_start_dpg_mode(adev, i, adev->vcn.indirect_sram);
+                       continue;
+               }
 
                /* disable register anti-hang mechanism */
                WREG32_P(SOC15_REG_OFFSET(UVD, i, mmUVD_POWER_STATUS), 0,
@@ -903,6 +905,9 @@ static int vcn_v2_5_start(struct amdgpu_device *adev)
                WREG32_SOC15(UVD, i, mmUVD_STATUS, tmp);
        }
 
+       if (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG)
+               return 0;
+
        /*SW clock gating */
        vcn_v2_5_disable_clock_gating(adev);
 
@@ -1294,10 +1299,9 @@ static int vcn_v2_5_stop(struct amdgpu_device *adev)
        for (i = 0; i < adev->vcn.num_vcn_inst; ++i) {
                if (adev->vcn.harvest_config & (1 << i))
                        continue;
-
                if (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG) {
                        r = vcn_v2_5_stop_dpg_mode(adev, i);
-                       goto power_off;
+                       continue;
                }
 
                /* wait for vcn idle */
@@ -1349,7 +1353,6 @@ static int vcn_v2_5_stop(struct amdgpu_device *adev)
                        ~UVD_POWER_STATUS__UVD_POWER_STATUS_MASK);
        }
 
-power_off:
        if (adev->pm.dpm_enabled)
                amdgpu_dpm_enable_uvd(adev, false);