kernel/git/next/linux-next.git/drivers/gpu/drm/display, branch master

Merge branch 'headers' of git://git.infradead.org/users/willy/pagecache.git

2026-09-11T15:17:01+00:00

# Conflicts: # net/ceph/osd_client.c

Merge drm/drm-next into drm-misc-next

2026-08-31T07:01:06+00:00

Getting drm-misc-next up to v7.3-rc1. In exynos, there was a conflict in exynos_dbi_bind(). The merge resolves it to the state of commit 3cc8eee9f346 ("drm/exynos: remove dependency on DRM simple helpers"). Signed-off-by: Thomas Zimmermann

headers: Remove swap.h from suspend.h

2026-08-25T19:12:26+00:00

Nothing in suspend.h needs swap.h. However, many files indirectly depend on some of swap.h's dependencies, so this is a large cross-subsystem patch. Stats: 42 are missing includes of interrupt.h (the question of why swap.h brings in interrupt.h remains unanswered). 10 missing includes of seq_file.h 5 missing includes of swap.h (obviously all files could have just added swap.h, but I preferred to bring in a more minimal inclusion set) 3 missing includes of highmem.h 2 missing includes of device.h 2 missing includes of string_choices.h 1 missing include of cacheflush.h 1 missing include of dma-direction.h 1 missing include of kthread.h 1 missing include of pagemap.h 1 missing include of string_helpers.h 1 missing include of writeback.h I tried to follow whatever conventions appeared to be in use for the various subsystems I touched; for example I added string_choices.h to drm_print.h instead of individually to each driver which used the functions declared there. Signed-off-by: Matthew Wilcox (Oracle)

BackMerge tag 'v7.2' into drm-next

2026-08-20T00:58:44+00:00

Linux 7.2 There was a lot of conflicts this round between fixes and next, and I'd like to get the merge resolutions that we have in drm-tip. Signed-off-by: Dave Airlie

drm/display: hdmi-state-helper: Init SCDC debugfs for HDMI

2026-08-13T15:07:41+00:00

Initialise the SCDC debugfs file for connectors that call the HDMI state helper's debugfs_init helper. This makes all connectors that use the helper expose the scdc_status file in their connector debugfs. Acked-by: Maxime Ripard Signed-off-by: Nicolas Frattaroli Tested-by: Hans Verkuil Link: https://patch.msgid.link/20260724-scdc-link-health-v9-5-bdda406d016d@collabora.com Signed-off-by: Daniel Stone

drm/debugfs: Move HDMI debugfs registration to state helper

2026-08-13T15:07:41+00:00

The HDMI debugfs files are only useful for connectors that already make use of the HDMI state helpers. In addition, relying on HDMI-specific functions in drm_debugfs.c can lead to circular linking problems later down the line. Move hdmi_debugfs_add() and friends to a new helper in drm_hdmi_state_helper.c, and make all current users (vc4, sun4i, bridge) either use it as a debugfs_init func, or call it directly in its debugfs_init func. Suggested-by: Maxime Ripard Reviewed-by: Dmitry Baryshkov Acked-by: Maxime Ripard Signed-off-by: Nicolas Frattaroli Tested-by: Hans Verkuil Link: https://patch.msgid.link/20260724-scdc-link-health-v9-4-bdda406d016d@collabora.com Signed-off-by: Daniel Stone

drm/scdc-helper: Implement parsing and printing HDMI 2.1 fields

2026-08-13T15:07:41+00:00

HDMI 2.1 redefines previously reserved fields in SCDC for various new uses. No version check needs to be performed, as an HDMI 2.0 sink's reserved SCDC fields are well-defined to be 0, and any zero-ness of these fields for an HDMI 2.0 sink is not a surprise for SCDC parsers for HDMI 2.1. Implement reading and outputting these fields over debugfs. Reviewed-by: Maxime Ripard Signed-off-by: Nicolas Frattaroli Tested-by: Hans Verkuil Link: https://patch.msgid.link/20260724-scdc-link-health-v9-3-bdda406d016d@collabora.com Signed-off-by: Daniel Stone

drm/scdc-helper: Add scdc_status debugfs entry

2026-08-13T15:07:41+00:00

SCDC provides status information on the current display link. At the very least, it may be useful to expose this info through debugfs. Add a debugfs entry for it under the connector, which displays a few more details parsed out of the SCDC registers. A new drm_scdc_debugfs_init function can be called by the connector implementation to initialise the debugfs file. Signed-off-by: Nicolas Frattaroli Reviewed-by: Daniel Stone Acked-by: Maxime Ripard Tested-by: Hans Verkuil Link: https://patch.msgid.link/20260724-scdc-link-health-v9-2-bdda406d016d@collabora.com Signed-off-by: Daniel Stone

drm/scdc-helper: Don't use ssize_t return type for scdc_read/write

2026-08-13T15:07:40+00:00

drm_scdc_read and drm_scdc_write, both of which are only used within drm_scdc_helper (although exported), use a ssize_t as their return type. This would make sense if they returned the number of bytes read/written on success, and negative errno otherwise. However, they return 0 on success. Demote them to "int" as their return type, in order to avoid needlessly using 64 bits when less suffices. No functional change. Reviewed-by: Luca Ceresoli Reviewed-by: Hans Verkuil Signed-off-by: Nicolas Frattaroli Tested-by: Hans Verkuil Link: https://patch.msgid.link/20260724-scdc-link-health-v9-1-bdda406d016d@collabora.com Signed-off-by: Daniel Stone

drm/connector/hdmi: Fix out of bounds memory read

2026-08-10T09:38:57+00:00

A helper function was copying a given audio infoframe into the connector's copy but using the size of the destination (a generic target, sized to accept many different data blocks) not the source (a very specific type of data block). Thus, it was copying 60 bytes of data from a 28 byte allocation. Fix that by using the source size instead, together with a build bug on the source size actually being smaller than the destination. I hit this running KUnit tests under KASAN (while debugging something else entirely). In the real world, it seems unlikely to cause an actual problem. It is a read not a write so it can't corrupt any memory. However, it could potentially fall off the end of a page and cause an accvio bug. Fixes: f378b77227bc ("drm/connector: hdmi: Add Infoframes generation") Cc: Ville Syrjälä Cc: Dmitry Baryshkov Cc: Maxime Ripard Cc: Maarten Lankhorst Cc: Thomas Zimmermann Cc: David Airlie Cc: Simona Vetter Cc: Dmitry Baryshkov Cc: Daniel Stone Cc: Nicolas Frattaroli Cc: Jani Nikula Cc: José Expósito Cc: Laurent Pinchart Cc: dri-devel@lists.freedesktop.org Cc: stable@vger.kernel.org # v6.11+ Signed-off-by: John Harrison Link: https://patch.msgid.link/20260723220652.533345-1-John.Harrison@Igalia.com Signed-off-by: Maxime Ripard