[PATCH 3/3] drm/radeon/dpm: only need to reprogram uvd if uvd pg is enabled

[Alex Deucher]

Avoid needless uvd reprogramming if uvd powergating is disabled.

Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
---
 drivers/gpu/drm/radeon/kv_dpm.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/radeon/kv_dpm.c b/drivers/gpu/drm/radeon/kv_dpm.c
index a102077..15a6f67 100644
--- a/drivers/gpu/drm/radeon/kv_dpm.c
+++ b/drivers/gpu/drm/radeon/kv_dpm.c
@@ -1491,17 +1491,20 @@ void kv_dpm_powergate_uvd(struct radeon_device *rdev, 
bool gate)
        pi->uvd_power_gated = gate;

        if (gate) {
-               uvd_v1_0_stop(rdev);
-               cik_update_cg(rdev, RADEON_CG_BLOCK_UVD, false);
+               if (pi->caps_uvd_pg) {
+                       uvd_v1_0_stop(rdev);
+                       cik_update_cg(rdev, RADEON_CG_BLOCK_UVD, false);
+               }
                kv_update_uvd_dpm(rdev, gate);
                if (pi->caps_uvd_pg)
                        kv_notify_message_to_smu(rdev, PPSMC_MSG_UVDPowerOFF);
        } else {
-               if (pi->caps_uvd_pg)
+               if (pi->caps_uvd_pg) {
                        kv_notify_message_to_smu(rdev, PPSMC_MSG_UVDPowerON);
-               uvd_v4_2_resume(rdev);
-               uvd_v1_0_start(rdev);
-               cik_update_cg(rdev, RADEON_CG_BLOCK_UVD, true);
+                       uvd_v4_2_resume(rdev);
+                       uvd_v1_0_start(rdev);
+                       cik_update_cg(rdev, RADEON_CG_BLOCK_UVD, true);
+               }
                kv_update_uvd_dpm(rdev, gate);
        }
 }
-- 
1.8.3.1