Merge v6.3-rc4 into drm-next

I just landed the fence deadline PR from Rob that a bunch of drivers
want/need to apply driver-specific patches. Backmerge -rc4 so that
they don't have to be stuck on -rc2 for no reason at all.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --cc MAINTAINERS
Simple merge

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/nv.c
index 15f3c6745ea900209f618424c3f3d54b0ac07694,ebe0e2d7dbd1b59d772ae52d641f43a9914921b3..47420b403871cfde1aad0662e3be8c56eac784f0
--- 1/drivers/gpu/drm/amd/amdgpu/nv.c
--- 2/drivers/gpu/drm/amd/amdgpu/nv.c
+++ b/drivers/gpu/drm/amd/amdgpu/nv.c
@@@ -520,9 -561,24 +520,9 @@@ static int nv_set_vce_clocks(struct amd
        return 0;
  }
  
 -static void nv_pcie_gen3_enable(struct amdgpu_device *adev)
 -{
 -      if (pci_is_root_bus(adev->pdev->bus))
 -              return;
 -
 -      if (amdgpu_pcie_gen2 == 0)
 -              return;
 -
 -      if (!(adev->pm.pcie_gen_mask & (CAIL_PCIE_LINK_SPEED_SUPPORT_GEN2 |
 -                                      CAIL_PCIE_LINK_SPEED_SUPPORT_GEN3)))
 -              return;
 -
 -      /* todo */
 -}
 -
  static void nv_program_aspm(struct amdgpu_device *adev)
  {
-       if (!amdgpu_device_should_use_aspm(adev))
+       if (!amdgpu_device_should_use_aspm(adev) || !amdgpu_device_aspm_support_quirk())
                return;
  
        if (!(adev->flags & AMD_IS_APU) &&

diff --cc drivers/gpu/drm/amd/amdgpu/vi.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/dcn30/dcn30_hwseq.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.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_shmem_helper.c
Simple merge

diff --cc drivers/gpu/drm/i915/gt/intel_gt.c
Simple merge

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

diff --cc drivers/gpu/drm/sun4i/sun4i_drv.c
Simple merge

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

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

diff --cc drivers/gpu/drm/virtio/virtgpu_vq.c
Simple merge

diff --cc include/drm/drm_gem.h
index c76e651f2d440775128c7522a5c2211bf5078bd5,f1f00fc2dba614b6fa3de952030be476f1d85b8c..7bd8e2bbbb364e455e1b536cdaca59ad2aa82f34
--- 1/include/drm/drm_gem.h
--- 2/include/drm/drm_gem.h
+++ b/include/drm/drm_gem.h
@@@ -486,9 -476,9 +486,11 @@@ int drm_gem_dumb_map_offset(struct drm_
  void drm_gem_lru_init(struct drm_gem_lru *lru, struct mutex *lock);
  void drm_gem_lru_remove(struct drm_gem_object *obj);
  void drm_gem_lru_move_tail(struct drm_gem_lru *lru, struct drm_gem_object *obj);
- unsigned long drm_gem_lru_scan(struct drm_gem_lru *lru, unsigned nr_to_scan,
+ unsigned long drm_gem_lru_scan(struct drm_gem_lru *lru,
+                              unsigned int nr_to_scan,
+                              unsigned long *remaining,
                               bool (*shrink)(struct drm_gem_object *obj));
  
 +int drm_gem_evict(struct drm_gem_object *obj);
 +
  #endif /* __DRM_GEM_H__ */

diff --cc include/linux/fb.h
Simple merge