Merge tag 'amd-drm-next-5.11-2020-12-09' of git://people.freedesktop.org/~agd5f/linux...

amd-drm-next-5.11-2020-12-09:

amdgpu:
- SR-IOV fixes
- Navy Flounder updates
- Sienna Cichlid updates
- Dimgrey Cavefish updates
- Vangogh updates
- Misc SMU fixes
- Misc display fixes
- Last big hunk of W=1 warning fixes
- Cursor validation fixes
- CI BACO updates

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

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.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_object.h
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 676fb52,b719b42..b848f9e
--- 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
@@@ -512,7 -512,120 +512,7 @@@ error
        return r;
  }
  
 -/**
 - * amdgpu_move_vram_ram - Copy VRAM buffer to RAM buffer
 - *
 - * Called by amdgpu_bo_move().
 - */
 -static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo, bool evict,
 -                              struct ttm_operation_ctx *ctx,
 -                              struct ttm_resource *new_mem)
 -{
 -      struct ttm_resource *old_mem = &bo->mem;
 -      struct ttm_resource tmp_mem;
 -      struct ttm_place placements;
 -      struct ttm_placement placement;
 -      int r;
 -
 -      /* create space/pages for new_mem in GTT space */
 -      tmp_mem = *new_mem;
 -      tmp_mem.mm_node = NULL;
 -      placement.num_placement = 1;
 -      placement.placement = &placements;
 -      placement.num_busy_placement = 1;
 -      placement.busy_placement = &placements;
 -      placements.fpfn = 0;
 -      placements.lpfn = 0;
 -      placements.mem_type = TTM_PL_TT;
 -      placements.flags = 0;
 -      r = ttm_bo_mem_space(bo, &placement, &tmp_mem, ctx);
 -      if (unlikely(r)) {
 -              pr_err("Failed to find GTT space for blit from VRAM\n");
 -              return r;
 -      }
 -
 -      r = ttm_tt_populate(bo->bdev, bo->ttm, ctx);
 -      if (unlikely(r))
 -              goto out_cleanup;
 -
 -      /* Bind the memory to the GTT space */
 -      r = amdgpu_ttm_backend_bind(bo->bdev, bo->ttm, &tmp_mem);
 -      if (unlikely(r)) {
 -              goto out_cleanup;
 -      }
 -
 -      /* blit VRAM to GTT */
 -      r = amdgpu_move_blit(bo, evict, &tmp_mem, old_mem);
 -      if (unlikely(r)) {
 -              goto out_cleanup;
 -      }
 -
 -      r = ttm_bo_wait_ctx(bo, ctx);
 -      if (unlikely(r))
 -              goto out_cleanup;
 -
 -      amdgpu_ttm_backend_unbind(bo->bdev, bo->ttm);
 -      ttm_resource_free(bo, &bo->mem);
 -      ttm_bo_assign_mem(bo, new_mem);
 -out_cleanup:
 -      ttm_resource_free(bo, &tmp_mem);
 -      return r;
 -}
 -
--/**
 - * amdgpu_move_ram_vram - Copy buffer from RAM to VRAM
 - *
 - * Called by amdgpu_bo_move().
 - */
 -static int amdgpu_move_ram_vram(struct ttm_buffer_object *bo, bool evict,
 -                              struct ttm_operation_ctx *ctx,
 -                              struct ttm_resource *new_mem)
 -{
 -      struct ttm_resource *old_mem = &bo->mem;
 -      struct ttm_resource tmp_mem;
 -      struct ttm_placement placement;
 -      struct ttm_place placements;
 -      int r;
 -
 -      /* make space in GTT for old_mem buffer */
 -      tmp_mem = *new_mem;
 -      tmp_mem.mm_node = NULL;
 -      placement.num_placement = 1;
 -      placement.placement = &placements;
 -      placement.num_busy_placement = 1;
 -      placement.busy_placement = &placements;
 -      placements.fpfn = 0;
 -      placements.lpfn = 0;
 -      placements.mem_type = TTM_PL_TT;
 -      placements.flags = 0;
 -      r = ttm_bo_mem_space(bo, &placement, &tmp_mem, ctx);
 -      if (unlikely(r)) {
 -              pr_err("Failed to find GTT space for blit to VRAM\n");
 -              return r;
 -      }
 -
 -      /* move/bind old memory to GTT space */
 -      r = ttm_tt_populate(bo->bdev, bo->ttm, ctx);
 -      if (unlikely(r))
 -              return r;
 -
 -      r = amdgpu_ttm_backend_bind(bo->bdev, bo->ttm, &tmp_mem);
 -      if (unlikely(r)) {
 -              goto out_cleanup;
 -      }
 -
 -      ttm_bo_assign_mem(bo, &tmp_mem);
 -      /* copy to VRAM */
 -      r = amdgpu_move_blit(bo, evict, new_mem, old_mem);
 -      if (unlikely(r)) {
 -              goto out_cleanup;
 -      }
 -out_cleanup:
 -      ttm_resource_free(bo, &tmp_mem);
 -      return r;
 -}
 -
+ /*
   * amdgpu_mem_visible - Check that memory can be accessed by ttm_bo_move_memcpy
   *
   * Called by amdgpu_bo_move()

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

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

diff --cc drivers/gpu/drm/radeon/radeon_drv.c
index bfadb79,84f5d56..e45d734
--- 1/drivers/gpu/drm/radeon/radeon_drv.c
--- 2/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@@ -51,7 -51,10 +51,11 @@@
  #include <drm/radeon_drm.h>
  
  #include "radeon_drv.h"
 +#include "radeon.h"
+ #include "radeon_kms.h"
+ #include "radeon_ttm.h"
+ #include "radeon_device.h"
+ #include "radeon_prime.h"
  
  /*
   * KMS wrapper.
@@@ -130,7 -123,8 +124,6 @@@ extern int radeon_get_crtc_scanoutpos(s
                                      ktime_t *stime, ktime_t *etime,
                                      const struct drm_display_mode *mode);
  extern bool radeon_is_px(struct drm_device *dev);
- int radeon_mmap(struct file *filp, struct vm_area_struct *vma);
 -extern const struct drm_ioctl_desc radeon_ioctls_kms[];
 -extern int radeon_max_kms_ioctl;
  int radeon_mode_dumb_mmap(struct drm_file *filp,
                          struct drm_device *dev,
                          uint32_t handle, uint64_t *offset_p);
@@@ -297,10 -288,8 +287,8 @@@ static struct pci_device_id pciidlist[
  
  MODULE_DEVICE_TABLE(pci, pciidlist);
  
 -static struct drm_driver kms_driver;
 +static const struct drm_driver kms_driver;
  
- bool radeon_device_is_virtual(void);
- 
  static int radeon_pci_probe(struct pci_dev *pdev,
                            const struct pci_device_id *ent)
  {

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

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

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

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

diff --cc drivers/gpu/drm/scheduler/sched_main.c
Simple merge