From: Dave Airlie <airlied@redhat.com>
Date: Mon, 19 Sep 2016 20:17:38 +0000 (+1000)
Subject: Merge branch 'drm-next-4.9' of git://people.freedesktop.org/~agd5f/linux into drm... 
X-Git-Tag: v4.9-rc1~41^2~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd4a68da1989a3735b9c183422effc177e2d5ae8;p=thirdparty%2Fkernel%2Flinux.git

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

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
  ...
---

bd4a68da1989a3735b9c183422effc177e2d5ae8
diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c
index bf033b58056c6,3c527cc72bf0a..107fbb2d28472
--- a/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/powerplay/hwmgr/process_pptables_v1_0.c
index a0ffd4a73d8c7,3373c327d29e4..7de701d8a450a
--- a/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/radeon/radeon_fb.c
index 568e036d547e1,6b2537d913e81..0daad446d2c75
--- a/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>