BackMerge tag 'v6.6-rc7' into drm-next

This is needed to add the msm pr which is based on a higher base.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/accel/ivpu/ivpu_drv.c
Simple merge

diff --cc drivers/accel/ivpu/ivpu_drv.h
Simple merge

diff --cc drivers/accel/ivpu/ivpu_fw.c
Simple merge

diff --cc drivers/accel/ivpu/ivpu_hw_37xx.c
Simple merge

diff --cc drivers/accel/ivpu/ivpu_hw_40xx.c
Simple merge

diff --cc drivers/accel/ivpu/ivpu_ipc.c
Simple merge

diff --cc drivers/accel/ivpu/ivpu_mmu_context.c
Simple merge

diff --cc drivers/accel/ivpu/ivpu_pm.c
Simple merge

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

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

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

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vm.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/hwss/dce110/dce110_hwseq.c
index 74602a5fd6ddecde7f61cc61101cb9d81d27755b,2a6157555fd1e4617c4f7320c49b367eab1d543f..2ff8addad4f30e846e2352893b942d09a23743c0
--- 1/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
--- 2/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
@@@ -1183,13 -1178,14 +1183,14 @@@ void dce110_disable_stream(struct pipe_
                dto_params.otg_inst = tg->inst;
                dto_params.timing = &pipe_ctx->stream->timing;
                dp_hpo_inst = pipe_ctx->stream_res.hpo_dp_stream_enc->inst;
- 
-               dccg->funcs->set_dtbclk_dto(dccg, &dto_params);
-               dccg->funcs->disable_symclk32_se(dccg, dp_hpo_inst);
-               dccg->funcs->set_dpstreamclk(dccg, REFCLK, tg->inst, dp_hpo_inst);
+               if (dccg) {
+                       dccg->funcs->set_dtbclk_dto(dccg, &dto_params);
+                       dccg->funcs->disable_symclk32_se(dccg, dp_hpo_inst);
+                       dccg->funcs->set_dpstreamclk(dccg, REFCLK, tg->inst, dp_hpo_inst);
+               }
        } else if (dccg && dccg->funcs->disable_symclk_se) {
                dccg->funcs->disable_symclk_se(dccg, stream_enc->stream_enc_inst,
 -                              link_enc->transmitter - TRANSMITTER_UNIPHY_A);
 +                                             link_enc->transmitter - TRANSMITTER_UNIPHY_A);
        }
  
        if (dc->link_srv->dp_is_128b_132b_signal(pipe_ctx)) {

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

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

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

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

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

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/disp/uconn.c
Simple merge

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

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

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_gem.c
Simple merge

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_surface.c
Simple merge

diff --cc drivers/hid/Kconfig
Simple merge

diff --cc drivers/usb/typec/altmodes/displayport.c
Simple merge

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

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