summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2026-11-20 20:43:06 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2026-11-20 20:43:06 -0800
commitc44104f3642da720164042623e4832836aefdd8e (patch)
tree76fc4494b40b186831ee690b8a335a0cb6b87480 /include
parentaa31d5f8b151b786b748c6bfc9a8c4f1855c8adc (diff)
parentce29b8f9fb606f87014c2d05483a3fef05a11f38 (diff)
Merge tag 'drm-fixes-2026-11-21' of https://gitlab.freedesktop.org/drm/kernelHEADmaster
Pull drm fixes from Dave Airlie: "Weekly fixes, around the usual size, though it looks like vmwgfx got hit with a lot of analysis and has a bunch of validation fixes. nouveau fixes for a 7.3 regression. I know of one open i915 7.3 regressions that hopefully a fix will land next week. Otherwise amdgpu and xe have the most with a scattering for others. core: - syncobj: Limit allocations - vblank: Resolve deadlock in timer amdgpu: - GPUVM fixes - SMU 8 fix - PCO quirk - ATPX lifetime fix - Unwinding fix for module loading failure - UserQ fix - HDMI fixes - DML2 fix - DC DRAM config fixes - DCN 4.2 fixes - DC pre-OS clock handling fixes - DPMS fix - Cleaner shader fixes for multi-XCC parts - Vblank fix for GPU resets - Properly handle firmware with different trust athorities - Freesync/VRR fixes - Backlight fix - Display warning fixes - PSR fixes amdkfd: - SVM fixes radeon: - Bounds checks in vbios parsing - ATPX lifetime fix xe: - hwmon error handling fixes - Treat CT-disabled TLB invalidation as cancelled - Validate BOs on export to charge the exporter - Always free requested IRQs on uninstall - Reset TLB invalidation state in submit fini - Use ordered clock reads for engine cycles cpu_delta - Treat non-fatal PCIe errors as recovered i915: - Regression fix for GitLab #16595 and #17423: 4K displays corrupt/black on CML/KBL - DSB programming fix for GOSUB imagination: - Use correct function for polling non-iomem ivpu: - Fix race condition in recovery nouveau: - Fix instmem io_mapping faults and slowdowns omap: - dss: Fix handling deferrals qaic: - Harden ioctl checks rocket: - iommu fixes - lifetime and validation fixes - clock request fix - devicetre core count fix tilcdc: - Fix drvdata in suspend/resume vc4: - async flip fixes - off by one shader record - object lifetime fixes - two dsi fixes vmwgfx: - bounds checking fixes - validation fixes" * tag 'drm-fixes-2026-11-21' of https://gitlab.freedesktop.org/drm/kernel: (111 commits) drm/vc4: Clear the slice caches before resetting a stalled GPU drm/vc4: Start shader code at varying offsets in its BO drm/vc4: Check for a validated shader before reading its thread mode drm/vc4: Fix off-by-one in the shader record BO handle check MAINTAINERS: Add Dmitry Baryshkov as bridge maintainer MAINTAINERS: Remove myself for VC4 DRM driver MAINTAINERS: Remove Andrzej Hajda from bridge maintainers MAINTAINERS: Remove Jonas Karlman from bridge reviewers MAINTAINERS: Move Tegra DRM under drm-misc MAINTAINERS: Move Keem Bay DRM under drm-misc MAINTAINERS: Move armada DRM under drm-misc drm/xe/hwmon: Propagate all hardware read errors drm/xe/hwmon: Report errors using structured xe_log API drm/xe/log: Add VRAM, PAT, and HWMON DRIVER_HARDWARE components drm/xe/guc: Treat CT-disabled TLB invalidation as cancelled drm/xe/dma-buf: Validate BOs on export to charge the exporter drm/xe/irq: Always free requested IRQs on uninstall drm/xe/guc: Reset TLB invalidation state in submit fini drm/xe/query: Use ordered clock reads for engine cycles cpu_delta drm/xe/ras: Treat non-fatal PCIe errors as recovered ...
Diffstat (limited to 'include')
-rw-r--r--include/drm/drm_crtc.h9
-rw-r--r--include/drm/drm_vblank.h16
-rw-r--r--include/drm/drm_vblank_helper.h2
3 files changed, 27 insertions, 0 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index be5dca538d87..46546006f361 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -909,6 +909,15 @@ struct drm_crtc_funcs {
void (*disable_vblank)(struct drm_crtc *crtc);
/**
+ * @sync_vblank:
+ *
+ * Synchronizes vblank hardware and software state after switching off
+ * vblanks for the given CRTC. Called without holding vblank locks. Allows
+ * the driver to clean up vblank state outside of critical sections.
+ */
+ void (*sync_vblank)(struct drm_crtc *crtc);
+
+ /**
* @get_vblank_timestamp:
*
* Called by drm_get_last_vbltimestamp(). Should return a precise
diff --git a/include/drm/drm_vblank.h b/include/drm/drm_vblank.h
index 2fcef9c0f5b1..257b83d145ce 100644
--- a/include/drm/drm_vblank.h
+++ b/include/drm/drm_vblank.h
@@ -319,6 +319,22 @@ void drm_crtc_set_max_vblank_count(struct drm_crtc *crtc,
int drm_crtc_vblank_start_timer(struct drm_crtc *crtc);
void drm_crtc_vblank_cancel_timer(struct drm_crtc *crtc);
+void drm_crtc_vblank_stop_canceled_timer(struct drm_crtc *crtc);
+
+/**
+ * drm_crtc_vblank_stop_timer - Stops a CRTC's vblank timer
+ * @crtc: the CRTC
+ *
+ * Drivers should call this function to fully stop a CRTC's vblank timer.
+ *
+ * The function blocks until a running timer function has returned.
+ */
+static inline void drm_crtc_vblank_stop_timer(struct drm_crtc *crtc)
+{
+ drm_crtc_vblank_cancel_timer(crtc);
+ drm_crtc_vblank_stop_canceled_timer(crtc);
+}
+
void drm_crtc_vblank_get_vblank_timeout(struct drm_crtc *crtc, ktime_t *vblank_time);
/*
diff --git a/include/drm/drm_vblank_helper.h b/include/drm/drm_vblank_helper.h
index 28051f08d0f4..dd0029e045be 100644
--- a/include/drm/drm_vblank_helper.h
+++ b/include/drm/drm_vblank_helper.h
@@ -37,6 +37,7 @@ void drm_crtc_vblank_atomic_disable(struct drm_crtc *crtc,
int drm_crtc_vblank_helper_enable_vblank_timer(struct drm_crtc *crtc);
void drm_crtc_vblank_helper_disable_vblank_timer(struct drm_crtc *crtc);
+void drm_crtc_vblank_helper_sync_vblank_timer(struct drm_crtc *crtc);
bool drm_crtc_vblank_helper_get_vblank_timestamp_from_timer(struct drm_crtc *crtc,
int *max_error,
ktime_t *vblank_time,
@@ -51,6 +52,7 @@ bool drm_crtc_vblank_helper_get_vblank_timestamp_from_timer(struct drm_crtc *crt
#define DRM_CRTC_VBLANK_TIMER_FUNCS \
.enable_vblank = drm_crtc_vblank_helper_enable_vblank_timer, \
.disable_vblank = drm_crtc_vblank_helper_disable_vblank_timer, \
+ .sync_vblank = drm_crtc_vblank_helper_sync_vblank_timer, \
.get_vblank_timestamp = drm_crtc_vblank_helper_get_vblank_timestamp_from_timer
#endif