Merge remote-tracking branch 'amdgpu/drm-next' into master

# Conflicts:
#	drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
#	drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
#	drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
#	drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c
#	drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c

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

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_drv.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_ttm.c
index 8039d239958466989b6626187584867f14c9f58a,11dd3d9eac15a37497a8dc4b29094267a5a5981d..a0248d78190f2c1d016e94be98ddf0d55262d4ff
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
--- 2/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@@ -63,16 -63,13 +63,16 @@@
  
  #define AMDGPU_TTM_VRAM_MAX_DW_READ   (size_t)128
  
 +static int amdgpu_ttm_backend_bind(struct ttm_bo_device *bdev,
 +                                 struct ttm_tt *ttm,
 +                                 struct ttm_resource *bo_mem);
 +
  static int amdgpu_ttm_init_on_chip(struct amdgpu_device *adev,
                                    unsigned int type,
-                                   uint64_t size)
+                                   uint64_t size_in_page)
  {
        return ttm_range_man_init(&adev->mman.bdev, type,
-                                 false, size >> PAGE_SHIFT);
 -                                TTM_PL_FLAG_UNCACHED, TTM_PL_FLAG_UNCACHED,
+                                 false, size_in_page);
  }
  
  /**

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
Simple merge

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

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
Simple merge

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

diff --cc drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 373b8481f76c7704e8ba4b6651c7417a4755b048,43afcef2ad1b6a9e1e01a1eda881d4ad2045fa7d..f52adfba890d354b8228a7ce6944db0f647a4e63
--- 1/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
--- 2/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@@ -7499,8 -7547,9 +7547,10 @@@ static void amdgpu_dm_atomic_commit_tai
        int crtc_disable_count = 0;
        bool mode_set_reset_required = false;
  
+       trace_amdgpu_dm_atomic_commit_tail_begin(state);
+ 
        drm_atomic_helper_update_legacy_modeset_state(dev, state);
 +      drm_atomic_helper_calc_timestamping_constants(state);
  
        dm_state = dm_atomic_get_new_state(state);
        if (dm_state && dm_state->context) {

diff --cc drivers/gpu/drm/radeon/radeon.h
Simple merge