Merge tag 'amd-drm-next-5.7-2020-02-26' of git://people.freedesktop.org/~agd5f/linux...

amd-drm-next-5.7-2020-02-26:

amdgpu:
- Rework VM update handling in preparation for HMM support
- HDCP srm support
- PSR fixes
- DC watermark fixes
- OLED panel support
- SR-IOV fixes
- BACO fixes
- Optimize debugging vram access
- RAS fixes
- Use BACO for runtime pm
- HDCP fixes
- XGMI fixes
- DDC fixes
- DC clock programming optimizations and fixes
- PSP fw loading sequence updates
- Drop DRIVER_USE_AGP
- Remove legacy drm load and unload callbacks

amdkfd:
- Add runtime pm support

radeon:
- Drop DRIVER_USE_AGP

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200227043142.4075-1-alexander.deucher@amd.com

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

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

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 4598836,2c8c53f..e1c4c2d
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
--- 2/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@@ -1377,17 -1393,30 +1393,15 @@@ int amdgpu_file_to_fpriv(struct file *f
        return 0;
  }
  
 -static bool
 -amdgpu_get_crtc_scanout_position(struct drm_device *dev, unsigned int pipe,
 -                               bool in_vblank_irq, int *vpos, int *hpos,
 -                               ktime_t *stime, ktime_t *etime,
 -                               const struct drm_display_mode *mode)
 -{
 -      return amdgpu_display_get_crtc_scanoutpos(dev, pipe, 0, vpos, hpos,
 -                                                stime, etime, mode);
 -}
 -
  static struct drm_driver kms_driver = {
        .driver_features =
-           DRIVER_USE_AGP | DRIVER_ATOMIC |
+           DRIVER_ATOMIC |
            DRIVER_GEM |
            DRIVER_RENDER | DRIVER_MODESET | DRIVER_SYNCOBJ |
            DRIVER_SYNCOBJ_TIMELINE,
        .open = amdgpu_driver_open_kms,
        .postclose = amdgpu_driver_postclose_kms,
        .lastclose = amdgpu_driver_lastclose_kms,
-       .unload = amdgpu_driver_unload_kms,
 -      .get_vblank_counter = amdgpu_get_vblank_counter_kms,
 -      .enable_vblank = amdgpu_enable_vblank_kms,
 -      .disable_vblank = amdgpu_disable_vblank_kms,
 -      .get_vblank_timestamp = drm_calc_vbltimestamp_from_scanoutpos,
 -      .get_scanout_position = amdgpu_get_crtc_scanout_position,
        .irq_handler = amdgpu_irq_handler,
        .ioctls = amdgpu_ioctls_kms,
        .gem_free_object_unlocked = amdgpu_gem_object_free,

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

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 3ab46d4,eb17095..fe131c2
--- 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
@@@ -66,9 -68,11 +68,6 @@@ static int amdgpu_map_buffer(struct ttm
                             struct amdgpu_ring *ring,
                             uint64_t *addr);
  
- static int amdgpu_ttm_debugfs_init(struct amdgpu_device *adev);
- static void amdgpu_ttm_debugfs_fini(struct amdgpu_device *adev);
 -static int amdgpu_invalidate_caches(struct ttm_bo_device *bdev, uint32_t flags)
 -{
 -      return 0;
 -}
--
  /**
   * amdgpu_init_mem_type - Initialize a memory manager for a specific type of
   * memory request.

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

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

diff --cc drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_drv.c
index 49ce2e7,8696af1..59f8186
--- 1/drivers/gpu/drm/radeon/radeon_drv.c
--- 2/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@@ -560,9 -602,19 +599,9 @@@ static const struct file_operations rad
  #endif
  };
  
 -static bool
 -radeon_get_crtc_scanout_position(struct drm_device *dev, unsigned int pipe,
 -                               bool in_vblank_irq, int *vpos, int *hpos,
 -                               ktime_t *stime, ktime_t *etime,
 -                               const struct drm_display_mode *mode)
 -{
 -      return radeon_get_crtc_scanoutpos(dev, pipe, 0, vpos, hpos,
 -                                        stime, etime, mode);
 -}
 -
  static struct drm_driver kms_driver = {
        .driver_features =
-           DRIVER_USE_AGP | DRIVER_GEM | DRIVER_RENDER,
+           DRIVER_GEM | DRIVER_RENDER,
        .load = radeon_driver_load_kms,
        .open = radeon_driver_open_kms,
        .postclose = radeon_driver_postclose_kms,

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