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

Archit requested this backmerge to facilitate merging some patches
depending on changes between -rc2 & -rc5

Signed-off-by: Sean Paul <seanpaul@chromium.org>

1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
index 2480273c1dca..4bdd851f56d0 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c
@@ -220,6 +220,10 @@ int amdgpu_irq_init(struct amdgpu_device *adev)
         int r = 0;
 
         spin_lock_init(&adev->irq.lock);
+
+        /* Disable vblank irqs aggressively for power-saving */
+        adev->ddev->vblank_disable_immediate = true;
+
         r = drm_vblank_init(adev->ddev, adev->mode_info.num_crtc);
         if (r) {
                 return r;