Merge airlied/drm-next into drm-misc-next

Backmerge the main pull request to sync up with all the newly landed
drivers. Otherwise we'll have chaos even before 4.12 started in
earnest.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 13 insertions, 2 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
index a61882ddc804..346e80a7119b 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
@@ -1142,12 +1142,22 @@ void amdgpu_dpm_enable_vce(struct amdgpu_device *adev, bool enable)
                         /* XXX select vce level based on ring/task */
                         adev->pm.dpm.vce_level = AMD_VCE_LEVEL_AC_ALL;
                         mutex_unlock(&adev->pm.mutex);
+                        amdgpu_pm_compute_clocks(adev);
+                        amdgpu_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCE,
+                                                        AMD_PG_STATE_UNGATE);
+                        amdgpu_set_clockgating_state(adev, AMD_IP_BLOCK_TYPE_VCE,
+                                                        AMD_CG_STATE_UNGATE);
                 } else {
+                        amdgpu_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCE,
+                                                        AMD_PG_STATE_GATE);
+                        amdgpu_set_clockgating_state(adev, AMD_IP_BLOCK_TYPE_VCE,
+                                                        AMD_CG_STATE_GATE);
                         mutex_lock(&adev->pm.mutex);
                         adev->pm.dpm.vce_active = false;
                         mutex_unlock(&adev->pm.mutex);
+                        amdgpu_pm_compute_clocks(adev);
                 }
-                amdgpu_pm_compute_clocks(adev);
+
         }
 }
 
@@ -1286,7 +1296,8 @@ void amdgpu_pm_compute_clocks(struct amdgpu_device *adev)
         if (!adev->pm.dpm_enabled)
                 return;
 
-        amdgpu_display_bandwidth_update(adev);
+        if (adev->mode_info.num_crtc)
+                amdgpu_display_bandwidth_update(adev);
 
         for (i = 0; i < AMDGPU_MAX_RINGS; i++) {
                 struct amdgpu_ring *ring = adev->rings[i];