From: Dave Airlie <airlied@redhat.com>
Date: Thu, 28 Sep 2023 22:27:00 +0000 (+1000)
Subject: Merge tag 'drm-misc-next-2023-09-27' of git://anongit.freedesktop.org/drm/drm-misc... 
X-Git-Tag: v6.7-rc1~145^2~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=79fb229b8810071648b65c37382aea7819a5f935;p=thirdparty%2Fkernel%2Flinux.git

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

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
---

79fb229b8810071648b65c37382aea7819a5f935
diff --cc drivers/accel/qaic/qaic_data.c
index f4b06792c6f1c,c90fa6a430f6d..4a8e43a7a6a40
--- a/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/nouveau/dispnv50/disp.c
index bba01fa0780c9,dcd19c4183894..52f1569ee37c1
--- a/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 include/linux/fb.h
index c14576458228a,d110676c9c836..94e2c44c65699
--- a/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);