Merge tag 'drm-next-5.5-2019-10-09' of git://people.freedesktop.org/~agd5f/linux...

drm-next-5.5-2019-10-09:

amdgpu:
- Additional RAS enablement for vega20
- RAS page retirement and bad page storage in EEPROM
- No GPU reset with unrecoverable RAS errors
- Reserve vram for page tables rather than trying to evict
- Fix issues with GPU reset and xgmi hives
- DC i2c over aux fixes
- Direct submission for clears, PTE/PDE updates
- Improvements to help support recoverable GPU page faults
- Silence harmless SAD block messages
- Clean up code for creating a bo at a fixed location
- Initial DC HDCP support
- Lots of documentation fixes
- GPU reset for renoir
- Add IH clockgating support for soc15 asics
- Powerplay improvements
- DC MST cleanups
- Add support for MSI-X
- Misc cleanups and bug fixes

amdkfd:
- Query KFD device info by asic type rather than pci ids
- Add navi14 support
- Add renoir support
- Add navi12 support
- gfx10 trap handler improvements
- pasid cleanups
- Check against device cgroup

ttm:
- Return -EBUSY with pipelining with no_gpu_wait

radeon:
- Silence harmless SAD block messages

device_cgroup:
- Export devcgroup_check_permission

Signed-off-by: Dave Airlie <[email protected]>
From: Alex Deucher <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]

diff --cc drivers/gpu/drm/Kconfig
Simple merge

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

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

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

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

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

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

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

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

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

diff --cc drivers/gpu/drm/amd/amdkfd/kfd_priv.h
index c89326125d71170509531a8ffc434db3101f1908,ab899747cb64c92c41f7b9fa71a585f65c0469ba..060a9e8b301e4a0cfc409badc943c10c9567b489
--- 1/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
--- 2/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@@ -687,7 -688,10 +688,7 @@@ struct kfd_process 
        /* We want to receive a notification when the mm_struct is destroyed */
        struct mmu_notifier mmu_notifier;
  
-       unsigned int pasid;
 -      /* Use for delayed freeing of kfd_process structure */
 -      struct rcu_head rcu;
 -
+       uint16_t pasid;
        unsigned int doorbell_index;
  
        /*

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

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index 5ec14efd4d8cb5cdb774a675c7d6bf2481ae89e3,3af2b429ff1bfe7e680bde1c601df25cd469799e..d9113ce0be097cfa84b005b8dd143308e2eff0cd
--- 1/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
--- 2/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@@ -416,7 -414,11 +414,11 @@@ void amdgpu_dm_initialize_dp_connector(
  
        drm_dp_aux_register(&aconnector->dm_dp_aux.aux);
        drm_dp_cec_register_connector(&aconnector->dm_dp_aux.aux,
 -                                    aconnector->base.name, dm->adev->dev);
 +                                    &aconnector->base);
+ 
+       if (aconnector->base.connector_type == DRM_MODE_CONNECTOR_eDP)
+               return;
+ 
        aconnector->mst_mgr.cbs = &dm_mst_cbs;
        drm_dp_mst_topology_mgr_init(
                &aconnector->mst_mgr,

diff --cc drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
index 23171a4d9a31cfed921873f504f629580bb3ac38,ccf711c327c8f169863fc3b648259ffb1e85c3d4..451055decd3e994755ef9fed0f9c09a41d4d21f7
--- 1/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
--- 2/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
@@@ -749,10 -760,10 +760,8 @@@ struct smu_func
        ((smu)->funcs->set_azalia_d3_pme ? (smu)->funcs->set_azalia_d3_pme((smu)) : 0)
  #define smu_get_dpm_ultimate_freq(smu, param, min, max) \
                ((smu)->funcs->get_dpm_ultimate_freq ? (smu)->funcs->get_dpm_ultimate_freq((smu), (param), (min), (max)) : 0)
 -#define smu_get_uclk_dpm_states(smu, clocks_in_khz, num_states) \
 -      ((smu)->ppt_funcs->get_uclk_dpm_states ? (smu)->ppt_funcs->get_uclk_dpm_states((smu), (clocks_in_khz), (num_states)) : 0)
  #define smu_get_max_sustainable_clocks_by_dc(smu, max_clocks) \
        ((smu)->funcs->get_max_sustainable_clocks_by_dc ? (smu)->funcs->get_max_sustainable_clocks_by_dc((smu), (max_clocks)) : 0)
- #define smu_get_uclk_dpm_states(smu, clocks_in_khz, num_states) \
-       ((smu)->ppt_funcs->get_uclk_dpm_states ? (smu)->ppt_funcs->get_uclk_dpm_states((smu), (clocks_in_khz), (num_states)) : 0)
  #define smu_baco_is_support(smu) \
        ((smu)->funcs->baco_is_support? (smu)->funcs->baco_is_support((smu)) : false)
  #define smu_baco_get_state(smu, state) \

diff --cc drivers/gpu/drm/ttm/ttm_bo.c
Simple merge