Merge tag 'drm-misc-next-2023-09-27' of git://anongit.freedesktop.org/drm/drm-misc...

drm-misc-next for v6.7-rc1:

UAPI Changes:
- drm_file owner is now updated during use, in the case of a drm fd
  opened by the display server for a client, the correct owner is
  displayed.
- Qaic gains support for the QAIC_DETACH_SLICE_BO ioctl to allow bo
  recycling.

Cross-subsystem Changes:
- Disable boot logo for au1200fb, mmpfb and unexport logo helpers.
  Only fbcon should manage display of logo.
- Update freescale in MAINTAINERS.
- Add some bridge files to bridge in MAINTAINERS.
- Update gma500 driver repo in MAINTAINERS to point to drm-misc.

Core Changes:
- Move size computations to drm buddy allocator.
- Make drm_atomic_helper_shutdown(NULL) a nop.
- Assorted small fixes in drm_debugfs, DP-MST payload addition error handling.
- Fix DRM_BRIDGE_ATTACH_NO_CONNECTOR handling.
- Handle bad (h/v)sync_end in EDID by clipping to htotal.
- Build GPUVM as a module.

Driver Changes:
- Simple drivers don't need to cache prepared result.
- Call drm_atomic_helper_shutdown() in shutdown/unbind for a whole lot
  more drm drivers.
- Assorted small fixes in amdgpu, ssd130x, bridge/it6621, accel/qaic,
  nouveau, tc358768.
- Add NV12 for komeda writeback.
- Add arbitration lost event to synopsis/dw-hdmi-cec.
- Speed up s/r in nouveau by not restoring some big bo's.
- Assorted nouveau display rework in preparation for GSP-RM,
  especially related to how the modeset sequence works and
  the DP sequence in relation to link training.
- Update anx7816 panel.
- Support NVSYNC and NHSYNC in tegra.
- Allow multiple power domains in simple driver.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/f1fae5eb-25b8-192a-9a53-215e1184ce81@linux.intel.com

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/accel/qaic/qaic_data.c
index f4b06792c6f1c0d88ca37ef392c8bef9d4b4ceb4,c90fa6a430f6d374c80f7f2f81b565e53eaabc31..4a8e43a7a6a408b89d1c5bf67cfde9ad458a06f2
--- 1/drivers/accel/qaic/qaic_data.c
--- 2/drivers/accel/qaic/qaic_data.c
+++ b/drivers/accel/qaic/qaic_data.c
@@@ -1018,10 -1031,10 +1031,11 @@@ int qaic_attach_slice_bo_ioctl(struct d
        if (args->hdr.dir == DMA_TO_DEVICE)
                dma_sync_sgtable_for_cpu(&qdev->pdev->dev, bo->sgt, args->hdr.dir);
  
-       bo->dbc = dbc;
+       bo->sliced = true;
+       list_add_tail(&bo->bo_list, &bo->dbc->bo_lists);
        srcu_read_unlock(&dbc->ch_lock, rcu_id);
-       drm_gem_object_put(obj);
+       mutex_unlock(&bo->lock);
 +      kfree(slice_ent);
        srcu_read_unlock(&qdev->dev_lock, qdev_rcu_id);
        srcu_read_unlock(&usr->qddev_lock, usr_rcu_id);
  

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

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c
Simple merge

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

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

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

diff --cc drivers/gpu/drm/nouveau/dispnv50/disp.c
index bba01fa0780c9c285cfd86ba8d5e5a6733c347ca,dcd19c4183894c441c2a42593b9cacded451d229..52f1569ee37c1de3520c14b6cb5fd88d600f289d
--- 1/drivers/gpu/drm/nouveau/dispnv50/disp.c
--- 2/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@@ -1917,18 -1928,9 +1930,11 @@@ nv50_pior_create(struct nouveau_encode
                return -ENODEV;
        }
  
-       nv_encoder = kzalloc(sizeof(*nv_encoder), GFP_KERNEL);
-       if (!nv_encoder)
-               return -ENOMEM;
-       nv_encoder->dcb = dcbe;
        nv_encoder->i2c = ddc;
-       nv_encoder->aux = aux;
  
 +      mutex_init(&nv_encoder->dp.hpd_irq_lock);
 +
        encoder = to_drm_encoder(nv_encoder);
-       encoder->possible_crtcs = dcbe->heads;
-       encoder->possible_clones = 0;
        drm_encoder_init(connector->dev, encoder, &nv50_pior_func, type,
                         "pior-%04x-%04x", dcbe->hasht, dcbe->hashm);
        drm_encoder_helper_add(encoder, &nv50_pior_help);

diff --cc drivers/gpu/drm/nouveau/nouveau_connector.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/video/fbdev/au1200fb.c
Simple merge

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

diff --cc include/linux/fb.h
index c14576458228a3443d6d6e73e04c9a3ef376bd64,d110676c9c836e6795ebe42c8e8431ef01e220d6..94e2c44c6569988106aa01dbe522f02b854a92f7
--- 1/include/linux/fb.h
--- 2/include/linux/fb.h
+++ b/include/linux/fb.h
@@@ -588,11 -588,9 +588,9 @@@ extern ssize_t fb_sys_write(struct fb_i
        .fb_copyarea    = sys_copyarea, \
        .fb_imageblit   = sys_imageblit
  
 -/* drivers/video/fbmem.c */
 +/* fbmem.c */
  extern int register_framebuffer(struct fb_info *fb_info);
  extern void unregister_framebuffer(struct fb_info *fb_info);
- extern int fb_prepare_logo(struct fb_info *fb_info, int rotate);
- extern int fb_show_logo(struct fb_info *fb_info, int rotate);
  extern char* fb_get_buffer_offset(struct fb_info *info, struct fb_pixmap *buf, u32 size);
  extern void fb_pad_unaligned_buffer(u8 *dst, u32 d_pitch, u8 *src, u32 idx,
                                u32 height, u32 shift_high, u32 shift_low, u32 mod);