Merge branch 'drm-next-4.9' of git://people.freedesktop.org/~agd5f/linux into drm...

More radeon and amdgpu changes for 4.9. Highlights:
- Initial SI support for amdgpu (controlled by a Kconfig option)
- misc ttm cleanups
- runtimepm fixes
- S3/S4 fixes
- power improvements
- lots of code cleanups and optimizations

* 'drm-next-4.9' of git://people.freedesktop.org/~agd5f/linux: (151 commits)
  drm/ttm: remove cpu_address member from ttm_tt
  drm/radeon/radeon_device: remove unused function
  drm/amdgpu: clean function declarations in amdgpu_ttm.c up
  drm/amdgpu: use the new ring ib and dma frame size callbacks (v2)
  drm/amdgpu/vce3: add ring callbacks for ib and dma frame size
  drm/amdgpu/vce2: add ring callbacks for ib and dma frame size
  drm/amdgpu/vce: add common ring callbacks for ib and dma frame size
  drm/amdgpu/uvd6: add ring callbacks for ib and dma frame size
  drm/amdgpu/uvd5: add ring callbacks for ib and dma frame size
  drm/amdgpu/uvd4.2: add ring callbacks for ib and dma frame size
  drm/amdgpu/sdma3: add ring callbacks for ib and dma frame size
  drm/amdgpu/sdma2.4: add ring callbacks for ib and dma frame size
  drm/amdgpu/cik_sdma: add ring callbacks for ib and dma frame size
  drm/amdgpu/si_dma: add ring callbacks for ib and dma frame size
  drm/amdgpu/gfx8: add ring callbacks for ib and dma frame size
  drm/amdgpu/gfx7: add ring callbacks for ib and dma frame size
  drm/amdgpu/gfx6: add ring callbacks for ib and dma frame size
  drm/amdgpu/ring: add an interface to get dma frame and ib size
  drm/amdgpu/sdma3: drop unused functions
  drm/amdgpu/gfx6: drop gds_switch callback
  ...

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

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
index bf033b58056c64b7d18d10a8a66dfe9ccc4aad95,3c527cc72bf0aa2aac96caaad8bb9d0298fedb29..107fbb2d284723bcbd9fa38fd1b71b5d87aa48bc
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
--- 2/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
@@@ -25,6 -25,8 +25,7 @@@
   */
  #include <linux/module.h>
  #include <linux/slab.h>
 -#include <linux/fb.h>
+ #include <linux/pm_runtime.h>
  
  #include <drm/drmP.h>
  #include <drm/drm_crtc.h>

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

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

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

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

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

diff --cc drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c
index a0ffd4a73d8c7327f4688b59b981dab24e50d08f,3373c327d29e407eec576e354fe300d58e60058d..7de701d8a450a624bcc57c9802338676ab573b0b
--- 1/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_processpptables.c
--- 2/drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/process_pptables_v1_0.c
@@@ -22,8 -22,9 +22,8 @@@
   */
  #include <linux/module.h>
  #include <linux/slab.h>
 -#include <linux/fb.h>
  
- #include "tonga_processpptables.h"
+ #include "process_pptables_v1_0.h"
  #include "ppatomctrl.h"
  #include "atombios.h"
  #include "pp_debug.h"

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

diff --cc drivers/gpu/drm/radeon/radeon_drv.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_fb.c
index 568e036d547e1704f981bddeefa349942a2760fc,6b2537d913e812bc47eebd2920adb1a72e5d44cc..0daad446d2c754768f501604ff3bc8fe623731aa
--- 1/drivers/gpu/drm/radeon/radeon_fb.c
--- 2/drivers/gpu/drm/radeon/radeon_fb.c
+++ b/drivers/gpu/drm/radeon/radeon_fb.c
@@@ -25,6 -25,8 +25,7 @@@
   */
  #include <linux/module.h>
  #include <linux/slab.h>
 -#include <linux/fb.h>
+ #include <linux/pm_runtime.h>
  
  #include <drm/drmP.h>
  #include <drm/drm_crtc.h>