Backmerge tag 'v6.1-rc6' into drm-next

Linux 6.1-rc6

This is needed for drm-misc-next and tegra.

Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index 459150460815cb04bfbd0a087939da0736771161,d038b258cc9242aa6e65e66d3827a0d9487235aa..8516c814bc9b5e2a497d6c4c0af16b3a57c6f57c
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
--- 2/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@@ -1247,11 -1243,14 +1247,14 @@@ static int amdgpu_cs_submit(struct amdg
        for (i = 0; i < p->gang_size; ++i)
                drm_sched_job_arm(&p->jobs[i]->base);
  
-       for (i = 0; i < (p->gang_size - 1); ++i) {
+       for (i = 0; i < p->gang_size; ++i) {
                struct dma_fence *fence;
  
+               if (p->jobs[i] == leader)
+                       continue;
+ 
                fence = &p->jobs[i]->base.s_fence->scheduled;
 -              r = amdgpu_sync_fence(&leader->sync, fence);
 +              r = drm_sched_job_add_dependency(&leader->base, fence);
                if (r)
                        goto error_cleanup;
        }

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

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
index 7cf99f752e01c93ffe4cf92f0f4ae518c746a8c6,500a1dc4fe0299d2a41ba098fc856cc853f1ed87..53ff91fc6cf6bdc80204939ebb7d74f8f8dbb34a
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
--- 2/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c
@@@ -498,8 -498,10 +498,10 @@@ static int amdgpu_vkms_sw_init(void *ha
        adev_to_drm(adev)->mode_config.preferred_depth = 24;
        adev_to_drm(adev)->mode_config.prefer_shadow = 1;
  
 -      adev_to_drm(adev)->mode_config.fb_base = adev->gmc.aper_base;
 +      adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true;
  
+       adev_to_drm(adev)->mode_config.fb_modifiers_not_supported = true;
+ 
        r = amdgpu_display_modeset_create_props(adev);
        if (r)
                return r;

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

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

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

diff --cc drivers/gpu/drm/imx/imx-tve.c
Simple merge

diff --cc drivers/gpu/drm/msm/dp/dp_display.c
Simple merge

diff --cc drivers/gpu/drm/rcar-du/Kconfig
index f14686549cbe403b5505c55b2b25b6ad1483f128,fd2c2eaee26ba182681981a37de45fccac727b9a..1065dca885efd00ed39970ff538e5e3e4bd5ba8b
--- 1/drivers/gpu/drm/rcar-du/Kconfig
--- 2/drivers/gpu/drm/rcar-du/Kconfig
+++ b/drivers/gpu/drm/rcar-du/Kconfig
@@@ -41,22 -41,21 +41,27 @@@ config DRM_RCAR_LVD
        depends on DRM_RCAR_USE_LVDS
        select DRM_KMS_HELPER
        select DRM_PANEL
 -      select OF_FLATTREE
 -      select OF_OVERLAY
  
- config DRM_RCAR_MIPI_DSI
-       tristate "R-Car DU MIPI DSI Encoder Support"
-       depends on DRM && DRM_BRIDGE && OF
-       select DRM_MIPI_DSI
+ config DRM_RCAR_USE_MIPI_DSI
+       bool "R-Car DU MIPI DSI Encoder Support"
+       depends on DRM_BRIDGE && OF
+       default DRM_RCAR_DU
        help
          Enable support for the R-Car Display Unit embedded MIPI DSI encoders.
  
+ config DRM_RCAR_MIPI_DSI
+       def_tristate DRM_RCAR_DU
+       depends on DRM_RCAR_USE_MIPI_DSI
+       select DRM_MIPI_DSI
+ 
 +config DRM_RZG2L_MIPI_DSI
 +      tristate "RZ/G2L MIPI DSI Encoder Support"
 +      depends on DRM_BRIDGE && OF
 +      depends on ARCH_RENESAS || COMPILE_TEST
 +      select DRM_MIPI_DSI
 +      help
 +        Enable support for the RZ/G2L Display Unit embedded MIPI DSI encoders.
 +
  config DRM_RCAR_VSP
        bool "R-Car DU VSP Compositor Support" if ARM
        default y if ARM64

diff --cc drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
Simple merge

diff --cc drivers/gpu/drm/rockchip/rockchip_drm_gem.c
Simple merge

diff --cc drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
Simple merge

diff --cc drivers/gpu/drm/vc4/vc4_drv.c
Simple merge

diff --cc drivers/gpu/drm/vc4/vc4_hdmi.c
index 6b223a5fcf6f8ae48bc65f313c60416188772fc0,470432c8fd707a06c0bbefcec164389004003cb8..12a00d644b61929808eb7a3842fbc8366ddae23d
--- 1/drivers/gpu/drm/vc4/vc4_hdmi.c
--- 2/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@@ -348,9 -349,12 +348,13 @@@ static int vc4_hdmi_reset_link(struct d
        if (!crtc_state->active)
                return 0;
  
-       if (!vc4_hdmi_supports_scrambling(vc4_hdmi))
 +      vc4_hdmi = connector_to_vc4_hdmi(connector);
 -      if (!vc4_hdmi_supports_scrambling(encoder)) {
+       mutex_lock(&vc4_hdmi->mutex);
+ 
++      if (!vc4_hdmi_supports_scrambling(vc4_hdmi)) {
+               mutex_unlock(&vc4_hdmi->mutex);
                return 0;
+       }
  
        scrambling_needed = vc4_hdmi_mode_needs_scrambling(&vc4_hdmi->saved_adjusted_mode,
                                                           vc4_hdmi->output_bpc,

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

diff --cc drivers/gpu/drm/vc4/vc4_kms.c
Simple merge

diff --cc drivers/video/fbdev/cyber2000fb.c
Simple merge

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