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, 9 insertions, 0 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
index 6f62ac473064..6d6ab7f11b4c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
@@ -1113,6 +1113,11 @@ static void amdgpu_uvd_idle_work_handler(struct work_struct *work)
                         amdgpu_dpm_enable_uvd(adev, false);
                 } else {
                         amdgpu_asic_set_uvd_clocks(adev, 0, 0);
+                        /* shutdown the UVD block */
+                        amdgpu_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_UVD,
+                                                            AMD_PG_STATE_GATE);
+                        amdgpu_set_clockgating_state(adev, AMD_IP_BLOCK_TYPE_UVD,
+                                                            AMD_CG_STATE_GATE);
                 }
         } else {
                 schedule_delayed_work(&adev->uvd.idle_work, UVD_IDLE_TIMEOUT);
@@ -1129,6 +1134,10 @@ void amdgpu_uvd_ring_begin_use(struct amdgpu_ring *ring)
                         amdgpu_dpm_enable_uvd(adev, true);
                 } else {
                         amdgpu_asic_set_uvd_clocks(adev, 53300, 40000);
+                        amdgpu_set_clockgating_state(adev, AMD_IP_BLOCK_TYPE_UVD,
+                                                            AMD_CG_STATE_UNGATE);
+                        amdgpu_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_UVD,
+                                                            AMD_PG_STATE_UNGATE);
                 }
         }
 }