Merge v6.10-rc6 into drm-next

The exynos-next pull is based on a newer -rc than drm-next. hence
backmerge first to make sure the unrelated conflicts we accumulated
don't end up randomly in the exynos merge pull, but are separated out.

Conflicts are all benign: Adjacent changes in amdgpu and fbdev-dma
code, and cherry-pick conflict in xe.

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

diff --cc MAINTAINERS
Simple merge

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

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

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

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

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

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

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

diff --cc drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c
Simple merge

diff --cc drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h
index 12a7b0634ed562921250e6f3f354e986f8b9516c,2e32b085824ae9ad6e36f1e9b016bdfae19de451..ac0dd6b97f8d56b870b0a4c310ece2d50a0fe366
--- 1/drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h
--- 2/drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h
+++ b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h
@@@ -272,8 -272,7 +272,8 @@@
        __SMU_DUMMY_MAP(SetSoftMinVpe), \
        __SMU_DUMMY_MAP(GetMetricsVersion), \
        __SMU_DUMMY_MAP(EnableUCLKShadow), \
-       __SMU_DUMMY_MAP(RmaDueToBadPageThreshold),\
+       __SMU_DUMMY_MAP(RmaDueToBadPageThreshold), \
 +      __SMU_DUMMY_MAP(SelectPstatePolicy), \
        __SMU_DUMMY_MAP(MALLPowerController), \
        __SMU_DUMMY_MAP(MALLPowerState),
  

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

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

diff --cc drivers/gpu/drm/drm_fbdev_dma.c
index 97ef6300d47e0afa5cf3234b2c051a5e98a75b9c,13cd754af311d1e6d280bacb295679a78d56f52a..4b0527ddeb5a74abbb19c81e077280162e64103c
--- 1/drivers/gpu/drm/drm_fbdev_dma.c
--- 2/drivers/gpu/drm/drm_fbdev_dma.c
+++ b/drivers/gpu/drm/drm_fbdev_dma.c
@@@ -137,22 -130,14 +137,25 @@@ static int drm_fbdev_dma_helper_fb_prob
                info->flags |= FBINFO_READS_FAST; /* signal caching */
        info->screen_size = sizes->surface_height * fb->pitches[0];
        info->screen_buffer = map.vaddr;
-       info->fix.smem_start = page_to_phys(virt_to_page(info->screen_buffer));
+       if (!(info->flags & FBINFO_HIDE_SMEM_START)) {
+               if (!drm_WARN_ON(dev, is_vmalloc_addr(info->screen_buffer)))
+                       info->fix.smem_start = page_to_phys(virt_to_page(info->screen_buffer));
+       }
        info->fix.smem_len = info->screen_size;
  
 +      /* deferred I/O */
 +      fb_helper->fbdefio.delay = HZ / 20;
 +      fb_helper->fbdefio.deferred_io = drm_fb_helper_deferred_io;
 +
 +      info->fbdefio = &fb_helper->fbdefio;
 +      ret = fb_deferred_io_init(info);
 +      if (ret)
 +              goto err_drm_fb_helper_release_info;
 +
        return 0;
  
 +err_drm_fb_helper_release_info:
 +      drm_fb_helper_release_info(fb_helper);
  err_drm_client_buffer_vunmap:
        fb_helper->fb = NULL;
        fb_helper->buffer = NULL;

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

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

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

diff --cc drivers/gpu/drm/nouveau/dispnv50/disp.c
Simple merge

diff --cc drivers/gpu/drm/panel/panel-simple.c
Simple merge

diff --cc drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c
Simple merge