Backmerge tag 'v4.9-rc4' into drm-next

Linux 4.9-rc4

This is needed for nouveau development.

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/base/Kconfig
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 6958d4a,7ca07e7..9e16e97
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
--- 2/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@@ -1975,12 -1956,10 +1975,13 @@@ int amdgpu_device_suspend(struct drm_de
  
        r = amdgpu_suspend(adev);
  
 -      /* evict remaining vram memory */
 +      /* evict remaining vram memory
 +       * This second call to evict vram is to evict the gart page table
 +       * using the CPU.
 +       */
        amdgpu_bo_evict_vram(adev);
  
+       amdgpu_atombios_scratch_regs_save(adev);
        pci_save_state(dev->pdev);
        if (suspend) {
                /* Shut down the device */

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index e480263,968c426..337c5b3
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
--- 2/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@@ -1772,8 -1755,9 +1772,9 @@@ void amdgpu_vm_manager_fini(struct amdg
        for (i = 0; i < AMDGPU_NUM_VM; ++i) {
                struct amdgpu_vm_id *id = &adev->vm_manager.ids[i];
  
 -              fence_put(adev->vm_manager.ids[i].first);
 +              dma_fence_put(adev->vm_manager.ids[i].first);
                amdgpu_sync_free(&adev->vm_manager.ids[i].active);
 -              fence_put(id->flushed_updates);
 -              fence_put(id->last_flush);
 +              dma_fence_put(id->flushed_updates);
++              dma_fence_put(id->last_flush);
        }
  }

diff --cc drivers/gpu/drm/amd/amdgpu/ci_dpm.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/kv_dpm.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/si_dpm.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/vce_v3_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/vi.c
Simple merge

diff --cc drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
Simple merge

diff --cc drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
Simple merge

diff --cc drivers/gpu/drm/amd/scheduler/sched_fence.c
Simple merge

diff --cc drivers/gpu/drm/ast/ast_ttm.c
Simple merge

diff --cc drivers/gpu/drm/cirrus/cirrus_ttm.c
Simple merge

diff --cc drivers/gpu/drm/drm_atomic.c
Simple merge

diff --cc drivers/gpu/drm/drm_atomic_helper.c
Simple merge

diff --cc drivers/gpu/drm/drm_fb_helper.c
Simple merge

diff --cc drivers/gpu/drm/exynos/exynos_drm_drv.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_display.c
index 6f8f6ec,0ad1879..895b3dc
--- 1/drivers/gpu/drm/i915/intel_display.c
--- 2/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -2983,9 -2976,10 +2983,10 @@@ int skl_check_plane_surface(struct inte
        int ret;
  
        /* Rotate src coordinates to match rotated GTT view */
 -      if (intel_rotation_90_or_270(rotation))
 +      if (drm_rotation_90_or_270(rotation))
                drm_rect_rotate(&plane_state->base.src,
-                               fb->width, fb->height, DRM_ROTATE_270);
+                               fb->width << 16, fb->height << 16,
+                               DRM_ROTATE_270);
  
        /*
         * Handle the AUX surface first since

diff --cc drivers/gpu/drm/i915/intel_fbc.c
Simple merge

diff --cc drivers/gpu/drm/mgag200/mgag200_ttm.c
Simple merge

diff --cc drivers/gpu/drm/rcar-du/rcar_du_kms.c
Simple merge

diff --cc drivers/gpu/drm/sti/sti_drv.c
Simple merge

diff --cc include/drm/drm_plane.h
Simple merge