1/3] drm: Add drm_vblank_work_flush_all().
Maarten Lankhorst
maintainerFrom: Maarten Lankhorst <[email protected]>
In some cases we want to flush all vblank work, right before vblank_off for example. Add a simple function to make this possible.
--- drivers/gpu/drm/drm_vblank_work.c | 22 ++++++++++++++++++++++ include/drm/drm_vblank_work.h | 2 ++ 2 files changed, 24 insertions(+)
drivers/gpu/drm/drm_vblank_work.c +22 -0
@@ -232,6 +232,28 @@ void drm_vblank_work_flush(struct drm_vblank_work *work) }EXPORT_SYMBOL (drm_vblank_work_flush); +/** +* drm_vblank_work_flush_all - flush all currently pending vblank work on crtc. +* @crtc: crtc for which vblank work to flush +* +* Wait until all currently queued vblank work on @crtc +* has finished executing once. +*/ +void drm_vblank_work_flush_all (struct drm_crtc *crtc) +{ +struct drm_device *dev = crtc->dev; +struct drm_vblank_crtc *vblank = &dev->vblank[drm_crtc_index (crtc)]; + +spin_lock_irq (&dev->event_lock); +wait_event_lock_irq (vblank->work_wait_queue, +waitqueue_active (&vblank->work_wait_queue), + dev->event_lock); +spin_unlock_irq (&dev->event_lock); + +kthread_flush_worker (vblank->worker); +} +EXPORT_SYMBOL (drm_vblank_work_flush_all); +/** * drm_vblank_work_init - initialize a vblank work item * @work: vblank work item
include/drm/drm_vblank_work.h +2 -0
@@ -17,6 +17,7 @@ struct drm_crtc;* drm_vblank_work_init() * drm_vblank_work_cancel_sync() * drm_vblank_work_flush() +* drm_vblank_work_flush_all() */ struct drm_vblank_work {/**
@@ -67,5 +68,6 @@ void drm_vblank_work_init(struct drm_vblank_work *work, struct drm_crtc *crtc, void (*func)(struct kthread_work *work));bool drm_vblank_work_cancel_sync (struct drm_vblank_work *work);void drm_vblank_work_flush (struct drm_vblank_work *work); +void drm_vblank_work_flush_all (struct drm_crtc *crtc);#endif /* !_DRM_VBLANK_WORK_H_ */
Signature · 1 line
2.43.0
Maarten Lankhorst
maintainer[[CI] 2/3] drm/i915: Use vblank worker to unpin old legacy cursor fb safely
From: Ville Syrjälä <[email protected]>
The cursor hardware only does sync updates, and thus the hardware will be scanning out from the old fb until the next start of vblank. So in order to make the legacy cursor fastpath actually safe we should not unpin the old fb until we're sure the hardware has ceased accessing it. The simplest approach is to just use a vblank work here to do the delayed unpin.
Not 100% sure it's a good idea to put this onto the same high priority vblank worker as eg. our timing critical gamma updates. But let's keep it simple for now, and it we later discover that this is causing problems we can think about adding a lower priority worker for such things.
This patch is slightly reworked by Maarten
--- drivers/gpu/drm/i915/display/intel_cursor.c | 26 +++++++++++++++++-- drivers/gpu/drm/i915/display/intel_display.c | 3 +++ .../drm/i915/display/intel_display_types.h | 3 +++ 3 files changed, 30 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_cursor.c +24 -2
@@ -635,6 +635,17 @@ static bool intel_cursor_format_mod_supported(struct drm_plane *_plane,return format ==DRM_FORMAT_ARGB8888 ; } +static void intel_cursor_unpin_work (struct kthread_work *base) +{ +struct drm_vblank_work *work =to_drm_vblank_work (base); +struct intel_plane_state *plane_state = +container_of (work,typeof (*plane_state), unpin_work); +struct intel_plane *plane =to_intel_plane (plane_state->uapi.plane); + +intel_plane_unpin_fb (plane_state); +intel_plane_destroy_state (&plane->base, &plane_state->uapi); +} + static int intel_legacy_cursor_update(struct drm_plane *_plane, struct drm_crtc *_crtc,
@@ -762,14 +773,25 @@ intel_legacy_cursor_update(struct drm_plane *_plane,local_irq_enable (); -intel_plane_unpin_fb (old_plane_state); +if (old_plane_state->ggtt_vma != new_plane_state->ggtt_vma) { +drm_vblank_work_init (&old_plane_state->unpin_work, &crtc->base, + intel_cursor_unpin_work); + +drm_vblank_work_schedule (&old_plane_state->unpin_work, +drm_crtc_accurate_vblank_count (&crtc->base) +1 , + false); + + old_plane_state =NULL ; + }else { +intel_plane_unpin_fb (old_plane_state); + } out_free:if (new_crtc_state)intel_crtc_destroy_state (&crtc->base, &new_crtc_state->uapi);if (ret)intel_plane_destroy_state (&plane->base, &new_plane_state->uapi); -else +else if (old_plane_state)intel_plane_destroy_state (&plane->base, &old_plane_state->uapi);return ret;
drivers/gpu/drm/i915/display/intel_display.c +3 -0
@@ -64,6 +64,7 @@#include "intel_crt.h" #include "intel_crtc.h" #include "intel_crtc_state_dump.h" +#include "intel_cursor.h" #include "intel_ddi.h" #include "intel_de.h" #include "intel_display_driver.h"
@@ -6771,6 +6772,8 @@ static void intel_commit_modeset_disables(struct intel_atomic_state *state)continue ;intel_crtc_disable_planes (state, crtc); + +drm_vblank_work_flush_all (&crtc->base); }/* Only disable port sync and MST slaves */
drivers/gpu/drm/i915/display/intel_display_types.h +3 -0
@@ -713,6 +713,9 @@ struct intel_plane_state {struct intel_fb_view view; +/* for legacy cursor fb unpin */ +struct drm_vblank_work unpin_work; +/* Plane pxp decryption state */ bool decrypt;
Signature · 1 line
2.43.0
Maarten Lankhorst
maintainer[[CI] 3/3] drm/i915: Use the same vblank worker for atomic unpin
In reply to Maarten LankhorstIn case of legacy cursor update, the cursor VMA needs to be unpinned only after vblank. This exceeds the lifetime of the whole atomic commit.
Any trick I attempted to keep the atomic commit alive didn't work, as drm_atomic_helper_setup_commit() force throttles on any old commit that wasn't cleaned up.
The only option remaining is to remove the plane from the atomic commit, and use the same path as the legacy cursor update to clean the state after vblank.
--- .../gpu/drm/i915/display/intel_atomic_plane.c | 28 ++++++++++++++++++- .../gpu/drm/i915/display/intel_atomic_plane.h | 2 ++ drivers/gpu/drm/i915/display/intel_crtc.c | 28 +++++++++++++++++++ drivers/gpu/drm/i915/display/intel_cursor.c | 2 +- drivers/gpu/drm/i915/display/intel_cursor.h | 3 ++ 5 files changed, 61 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_atomic_plane.c +27 -1
@@ -42,6 +42,7 @@#include "i915_reg.h" #include "intel_atomic_plane.h" #include "intel_cdclk.h" +#include "intel_cursor.h" #include "intel_display_rps.h" #include "intel_display_trace.h" #include "intel_display_types.h"
@@ -1163,7 +1164,21 @@ intel_cleanup_plane_fb(struct drm_plane *plane,intel_display_rps_mark_interactive (dev_priv, state, false); -/* Should only be called after a successful intel_prepare_plane_fb()! */ +/* +* This branch can only ever be called after plane update is succesful, +* the error path will not cause unpin_work to be set. +*/ +if (old_plane_state->unpin_work.vblank) { +int i =drm_plane_index (old_plane_state->uapi.plane); + +/* +* Remove plane from atomic commit, +* free is done from vblank worker +*/ +memset (&state->base.planes[i],0 ,sizeof (*state->base.planes)); +return ; + } +intel_plane_unpin_fb (old_plane_state); }
@@ -1176,3 +1191,14 @@ void intel_plane_helper_add(struct intel_plane *plane) {drm_plane_helper_add (&plane->base, &intel_plane_helper_funcs); } + +void intel_plane_init_cursor_vblank_work (struct intel_plane_state *old_plane_state, +struct intel_plane_state *new_plane_state) +{ +if (!old_plane_state->ggtt_vma || + old_plane_state->ggtt_vma == new_plane_state->ggtt_vma) +return ; + +drm_vblank_work_init (&old_plane_state->unpin_work, old_plane_state->uapi.crtc, + intel_cursor_unpin_work); +}
drivers/gpu/drm/i915/display/intel_atomic_plane.h +2 -0
@@ -66,5 +66,7 @@ int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state);void intel_plane_set_invisible (struct intel_crtc_state *crtc_state,struct intel_plane_state *plane_state);void intel_plane_helper_add (struct intel_plane *plane); +void intel_plane_init_cursor_vblank_work (struct intel_plane_state *old_plane_state, +struct intel_plane_state *new_plane_state);#endif /* __INTEL_ATOMIC_PLANE_H__ */
drivers/gpu/drm/i915/display/intel_crtc.c +28 -0
@@ -566,6 +566,19 @@ void intel_pipe_update_start(struct intel_atomic_state *state,if (intel_crtc_needs_vblank_work (new_crtc_state))intel_crtc_vblank_work_init (new_crtc_state); +if (state->base.legacy_cursor_update) { +struct intel_plane *plane; +struct intel_plane_state *old_plane_state, *new_plane_state; +int i; + +for_each_oldnew_intel_plane_in_state (state, plane, old_plane_state, + new_plane_state, i) { +if (old_plane_state->uapi.crtc == &crtc->base) +intel_plane_init_cursor_vblank_work (old_plane_state, + new_plane_state); + } + } +intel_crtc_vblank_evade_scanlines (state, crtc, &min, &max, &vblank_start);if (min <=0 || max <=0 ) goto irq_disable;
@@ -728,6 +741,21 @@ void intel_pipe_update_end(struct intel_atomic_state *state, new_crtc_state->uapi.event =NULL ; } +if (state->base.legacy_cursor_update) { +struct intel_plane *plane; +struct intel_plane_state *old_plane_state; +int i; + +for_each_old_intel_plane_in_state (state, plane, old_plane_state, i) { +if (old_plane_state->uapi.crtc == &crtc->base && + old_plane_state->unpin_work.vblank) { +drm_vblank_work_schedule (&old_plane_state->unpin_work, +drm_crtc_accurate_vblank_count (&crtc->base) +1 , + false); + } + } + } +/* * Send VRR Push to terminate Vblank. If we are already in vblank * this has to be done _after_ sampling the frame counter, as
drivers/gpu/drm/i915/display/intel_cursor.c +1 -1
@@ -635,7 +635,7 @@ static bool intel_cursor_format_mod_supported(struct drm_plane *_plane,return format ==DRM_FORMAT_ARGB8888 ; } -static void intel_cursor_unpin_work (struct kthread_work *base) +void intel_cursor_unpin_work (struct kthread_work *base) {struct drm_vblank_work *work =to_drm_vblank_work (base); struct intel_plane_state *plane_state =
drivers/gpu/drm/i915/display/intel_cursor.h +3 -0
@@ -9,9 +9,12 @@enum pipe ;struct drm_i915_private ;struct intel_plane ; +struct kthread_work ;struct intel_plane *intel_cursor_plane_create (struct drm_i915_private *dev_priv,enum pipe pipe); +void intel_cursor_unpin_work (struct kthread_work *base); +#endif
Signature · 1 line
2.43.0
Patchwork
CI✗ CI.Patch_applied: failure for 1/3] drm: Add drm_vblank_work_flush_all(). (rev2)
In reply to Maarten Lankhorst== Series Details ==
== Series Details ==
Series: 1/3] drm: Add drm_vblank_work_flush_all(). (rev2)
URL : https://patchwork.freedesktop.org/series/129363/
State : failure
== Summary ==
=== Applying kernel patches on branch 'drm-tip' with base: ===
Base commit: 3d244fce9 drm-tip: 2024y-01m-30d-19h-55m-23s UTC integration manifest === git am output follows ===
error: patch failed: drivers/gpu/drm/i915/display/intel_cursor.c:762
error: drivers/gpu/drm/i915/display/intel_cursor.c: patch does not apply
hint: Use 'git am --show-current-patch' to see the failed patch
Applying: 2/3] drm/i915: Use vblank worker to unpin old legacy cursor fb safely Patch failed at 0001 2/3] drm/i915: Use vblank worker to unpin old legacy cursor fb safely When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Patchwork
CI✗ CI.Patch_applied: failure for 1/3] drm: Add drm_vblank_work_flush_all(). (rev3)
In reply to Maarten Lankhorst== Series Details ==
== Series Details ==
Series: 1/3] drm: Add drm_vblank_work_flush_all(). (rev3)
URL : https://patchwork.freedesktop.org/series/129363/
State : failure
== Summary ==
=== Applying kernel patches on branch 'drm-tip' with base: ===
Base commit: 3d244fce9 drm-tip: 2024y-01m-30d-19h-55m-23s UTC integration manifest === git am output follows ===
error: patch failed: drivers/gpu/drm/i915/display/intel_crtc.c:566
error: drivers/gpu/drm/i915/display/intel_crtc.c: patch does not apply
error: patch failed: drivers/gpu/drm/i915/display/intel_cursor.c:635
error: drivers/gpu/drm/i915/display/intel_cursor.c: patch does not apply
hint: Use 'git am --show-current-patch' to see the failed patch
Applying: 3/3] drm/i915: Use the same vblank worker for atomic unpin Patch failed at 0001 3/3] drm/i915: Use the same vblank worker for atomic unpin When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".