From: Dave Airlie <airlied@redhat.com>
Date: Fri, 30 Aug 2024 01:53:54 +0000 (+1000)
Subject: Merge tag 'drm-misc-next-2024-08-29' of https://gitlab.freedesktop.org/drm/misc/kerne... 
X-Git-Tag: v6.12-rc1~126^2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f7d8da5e349c1126cdfcdd2ceede00382ad2ceb;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'drm-misc-next-2024-08-29' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next

drm-misc-next for v6.12:

UAPI Changes:

devfs:
- support device numbers up to MINORBITS limit

Core Changes:

ci:
- increase job timeout

devfs:
- use XArray for minor ids

displayport:
- mst: GUID improvements

docs:
- add fixes and cleanups

panic:
- optionally display QR code

Driver Changes:

amdgpu:
- faster vblank disabling
- GUID improvements

gm12u320
- convert to struct drm_edid

host1x:
- fix syncpoint IRQ during resume
- use iommu_paging_domain_alloc()

imx:
- ipuv3: convert to struct drm_edid

omapdrm:
- improve error handling

panel:
- add support for BOE TV101WUM-LL2 plus DT bindings
- novatek-nt35950: improve error handling
- nv3051d: improve error handling
- panel-edp: add support for BOE NE140WUM-N6G; revert support for
  SDC ATNA45AF01
- visionox-vtdr6130: improve error handling; use
  devm_regulator_bulk_get_const()

renesas:
- rz-du: add support for RZ/G2UL plus DT bindings

sti:
- convert to struct drm_edid

tegra:
- gr3d: improve PM domain handling
- convert to struct drm_edid

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

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20240829144654.GA145538@linux.fritz.box
---

4f7d8da5e349c1126cdfcdd2ceede00382ad2ceb
diff --cc drivers/gpu/drm/display/drm_dp_mst_topology.c
index 379a449a28a26,e8695e390686e..a040d7dfced17
--- a/drivers/gpu/drm/display/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c
@@@ -2689,23 -2695,13 +2692,18 @@@ static void drm_dp_mst_link_probe_work(
  		drm_kms_helper_hotplug_event(dev);
  }
  
 +static void drm_dp_mst_queue_probe_work(struct drm_dp_mst_topology_mgr *mgr)
 +{
 +	queue_work(system_long_wq, &mgr->work);
 +}
 +
  static bool drm_dp_validate_guid(struct drm_dp_mst_topology_mgr *mgr,
- 				 u8 *guid)
+ 				 guid_t *guid)
  {
- 	u64 salt;
- 
- 	if (memchr_inv(guid, 0, 16))
+ 	if (!guid_is_null(guid))
  		return true;
  
- 	salt = get_jiffies_64();
- 
- 	memcpy(&guid[0], &salt, sizeof(u64));
- 	memcpy(&guid[8], &salt, sizeof(u64));
+ 	guid_gen(guid);
  
  	return false;
  }