Merge drm/drm-next into drm-misc-next

Let's start the 5.19 development cycle.

Signed-off-by: Maxime Ripard <maxime@cerno.tech>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc drivers/dma-buf/dma-buf.c
Simple merge

diff --cc drivers/firmware/Kconfig
Simple merge

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

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

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
index 68494b9,dd78402..8c6b228
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
--- 2/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
@@@ -187,20 -200,17 +187,17 @@@ static void amdgpu_gtt_mgr_del(struct t
   *
   * Re-init the gart for each known BO in the GTT.
   */
- int amdgpu_gtt_mgr_recover(struct amdgpu_gtt_mgr *mgr)
+ void amdgpu_gtt_mgr_recover(struct amdgpu_gtt_mgr *mgr)
  {
 -      struct amdgpu_gtt_node *node;
 +      struct ttm_range_mgr_node *node;
        struct drm_mm_node *mm_node;
        struct amdgpu_device *adev;
-       int r = 0;
  
        adev = container_of(mgr, typeof(*adev), mman.gtt_mgr);
        spin_lock(&mgr->lock);
        drm_mm_for_each_node(mm_node, &mgr->mm) {
 -              node = container_of(mm_node, typeof(*node), base.mm_nodes[0]);
 -              amdgpu_ttm_recover_gart(node->tbo);
 +              node = container_of(mm_node, typeof(*node), mm_nodes[0]);
-               r = amdgpu_ttm_recover_gart(node->base.bo);
-               if (r)
-                       break;
++              amdgpu_ttm_recover_gart(node->base.bo);
        }
        spin_unlock(&mgr->lock);
  

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

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

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 28f5e8b,fc4563c..5d11978
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
--- 2/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@@ -375,7 -375,9 +375,9 @@@ static void amdgpu_vm_bo_base_init(stru
        if (bo->tbo.base.resv != vm->root.bo->tbo.base.resv)
                return;
  
 -      vm->bulk_moveable = false;
+       dma_resv_assert_held(vm->root.bo->tbo.base.resv);
+ 
 +      ttm_bo_set_bulk_move(&bo->tbo, &vm->lru_bulk_move);
        if (bo->tbo.type == ttm_bo_type_kernel && bo->parent)
                amdgpu_vm_bo_relocated(base);
        else
@@@ -2597,9 -2660,12 +2606,12 @@@ void amdgpu_vm_bo_del(struct amdgpu_dev
        struct amdgpu_vm *vm = bo_va->base.vm;
        struct amdgpu_vm_bo_base **base;
  
+       dma_resv_assert_held(vm->root.bo->tbo.base.resv);
+ 
        if (bo) {
+               dma_resv_assert_held(bo->tbo.base.resv);
                if (bo->tbo.base.resv == vm->root.bo->tbo.base.resv)
 -                      vm->bulk_moveable = false;
 +                      ttm_bo_set_bulk_move(&bo->tbo, NULL);
  
                for (base = &bo_va->base.bo->vm_bo; *base;
                     base = &(*base)->next) {

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

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

diff --cc drivers/gpu/drm/bridge/nwl-dsi.c
Simple merge

diff --cc drivers/gpu/drm/bridge/ti-sn65dsi86.c
Simple merge

diff --cc drivers/gpu/drm/drm_atomic_uapi.c
Simple merge

diff --cc drivers/gpu/drm/drm_edid.c
Simple merge

diff --cc drivers/gpu/drm/drm_gem.c
Simple merge

diff --cc drivers/gpu/drm/drm_gem_vram_helper.c
Simple merge

diff --cc drivers/gpu/drm/exynos/exynos_drm_dsi.c
Simple merge

diff --cc drivers/gpu/drm/i915/gem/i915_gem_ttm.c
index 1305624,45cc583..b9ae6b0
--- 1/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
--- 2/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
@@@ -842,14 -915,28 +915,28 @@@ void i915_ttm_adjust_lru(struct drm_i91
        } else if (obj->mm.madv != I915_MADV_WILLNEED) {
                bo->priority = I915_TTM_PRIO_PURGE;
        } else if (!i915_gem_object_has_pages(obj)) {
-               if (bo->priority < I915_TTM_PRIO_HAS_PAGES)
-                       bo->priority = I915_TTM_PRIO_HAS_PAGES;
+               bo->priority = I915_TTM_PRIO_NO_PAGES;
        } else {
-               if (bo->priority > I915_TTM_PRIO_NO_PAGES)
-                       bo->priority = I915_TTM_PRIO_NO_PAGES;
+               struct ttm_resource_manager *man =
+                       ttm_manager_type(bo->bdev, bo->resource->mem_type);
+ 
+               /*
+                * If we need to place an LMEM resource which doesn't need CPU
+                * access then we should try not to victimize mappable objects
+                * first, since we likely end up stealing more of the mappable
+                * portion. And likewise when we try to find space for a mappble
+                * object, we know not to ever victimize objects that don't
+                * occupy any mappable pages.
+                */
+               if (i915_ttm_cpu_maps_iomem(bo->resource) &&
+                   i915_ttm_buddy_man_visible_size(man) < man->size &&
+                   !(obj->flags & I915_BO_ALLOC_GPU_ONLY))
+                       bo->priority = I915_TTM_PRIO_NEEDS_CPU_ACCESS;
+               else
+                       bo->priority = I915_TTM_PRIO_HAS_PAGES;
        }
  
 -      ttm_bo_move_to_lru_tail(bo, bo->resource, NULL);
 +      ttm_bo_move_to_lru_tail(bo);
        spin_unlock(&bo->bdev->lru_lock);
  }
  

diff --cc drivers/gpu/drm/mediatek/mtk_dsi.c
Simple merge

diff --cc drivers/gpu/drm/meson/meson_drv.c
Simple merge

diff --cc drivers/gpu/drm/solomon/ssd130x.c
Simple merge

diff --cc drivers/gpu/drm/tiny/repaper.c
Simple merge

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

diff --cc drivers/gpu/drm/ttm/ttm_resource.c
index 492ba31,9a477f0..7d5a438
--- 1/drivers/gpu/drm/ttm/ttm_resource.c
--- 2/drivers/gpu/drm/ttm/ttm_resource.c
+++ b/drivers/gpu/drm/ttm/ttm_resource.c
@@@ -405,59 -273,8 +405,59 @@@ void ttm_resource_manager_debug(struct 
  }
  EXPORT_SYMBOL(ttm_resource_manager_debug);
  
 +/**
 + * ttm_resource_manager_first
 + *
 + * @man: resource manager to iterate over
 + * @cursor: cursor to record the position
 + *
 + * Returns the first resource from the resource manager.
 + */
 +struct ttm_resource *
 +ttm_resource_manager_first(struct ttm_resource_manager *man,
 +                         struct ttm_resource_cursor *cursor)
 +{
 +      struct ttm_resource *res;
 +
 +      lockdep_assert_held(&man->bdev->lru_lock);
 +
 +      for (cursor->priority = 0; cursor->priority < TTM_MAX_BO_PRIORITY;
 +           ++cursor->priority)
 +              list_for_each_entry(res, &man->lru[cursor->priority], lru)
 +                      return res;
 +
 +      return NULL;
 +}
 +
 +/**
 + * ttm_resource_manager_next
 + *
 + * @man: resource manager to iterate over
 + * @cursor: cursor to record the position
 + * @res: the current resource pointer
 + *
 + * Returns the next resource from the resource manager.
 + */
 +struct ttm_resource *
 +ttm_resource_manager_next(struct ttm_resource_manager *man,
 +                        struct ttm_resource_cursor *cursor,
 +                        struct ttm_resource *res)
 +{
 +      lockdep_assert_held(&man->bdev->lru_lock);
 +
 +      list_for_each_entry_continue(res, &man->lru[cursor->priority], lru)
 +              return res;
 +
 +      for (++cursor->priority; cursor->priority < TTM_MAX_BO_PRIORITY;
 +           ++cursor->priority)
 +              list_for_each_entry(res, &man->lru[cursor->priority], lru)
 +                      return res;
 +
 +      return NULL;
 +}
 +
  static void ttm_kmap_iter_iomap_map_local(struct ttm_kmap_iter *iter,
-                                         struct dma_buf_map *dmap,
+                                         struct iosys_map *dmap,
                                          pgoff_t i)
  {
        struct ttm_kmap_iter_iomap *iter_io =

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

diff --cc drivers/gpu/drm/vc4/vc4_hdmi.c
index cf4ba83,6c58b0f..8b01b1e
--- 1/drivers/gpu/drm/vc4/vc4_hdmi.c
--- 2/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@@ -1610,11 -1249,11 +1604,12 @@@ static int vc4_hdmi_encoder_atomic_chec
        struct vc4_hdmi_connector_state *vc4_state = conn_state_to_vc4_hdmi_conn_state(conn_state);
        struct drm_display_mode *mode = &crtc_state->adjusted_mode;
        struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
 -      unsigned long long pixel_rate = mode->clock * 1000;
 -      unsigned long long tmds_rate;
 +      unsigned long long tmds_char_rate = mode->clock * 1000;
 +      unsigned long long tmds_bit_rate;
 +      int ret;
  
        if (vc4_hdmi->variant->unsupported_odd_h_timings &&
+           !(mode->flags & DRM_MODE_FLAG_DBLCLK) &&
            ((mode->hdisplay % 2) || (mode->hsync_start % 2) ||
             (mode->hsync_end % 2) || (mode->htotal % 2)))
                return -EINVAL;

diff --cc drivers/gpu/drm/vc4/vc4_hdmi.h
Simple merge

diff --cc drivers/video/fbdev/Kconfig
Simple merge

diff --cc drivers/video/fbdev/core/fb_defio.c
Simple merge

diff --cc include/drm/drm_gem.h
Simple merge

diff --cc include/drm/ttm/ttm_bo_api.h
Simple merge

diff --cc include/drm/ttm/ttm_resource.h
index 4428a62,0f1d552..314f73d
--- 1/include/drm/ttm/ttm_resource.h
--- 2/include/drm/ttm/ttm_resource.h
+++ b/include/drm/ttm/ttm_resource.h
@@@ -26,12 -26,9 +26,11 @@@
  #define _TTM_RESOURCE_H_
  
  #include <linux/types.h>
 +#include <linux/list.h>
  #include <linux/mutex.h>
- #include <linux/atomic.h>
- #include <linux/dma-buf-map.h>
+ #include <linux/iosys-map.h>
  #include <linux/dma-fence.h>
 +
  #include <drm/drm_print.h>
  #include <drm/ttm/ttm_caching.h>
  #include <drm/ttm/ttm_kmap_iter.h>

diff --cc include/linux/dma-buf.h
Simple merge