Skip to content

Commit 12f84e8

Browse files
committed
drm: Add drm_vblank_work_flush_all().
In some cases we want to flush all vblank work, right before vblank_off for example. Add a simple function to make this possible. Check that both pending_work and running work are empty when flushing. Co-Developed-by: Chaitanya Kumar Borah <[email protected]> Signed-off-by: Maarten Lankhorst <[email protected]> Reviewed-by: Uma Shankar <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent f8fa26f commit 12f84e8

File tree

2 files changed

+24
-0
lines changed

2 files changed

+24
-0
lines changed

drivers/gpu/drm/drm_vblank_work.c

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,28 @@ void drm_vblank_work_flush(struct drm_vblank_work *work)
232232
}
233233
EXPORT_SYMBOL(drm_vblank_work_flush);
234234

235+
/**
236+
* drm_vblank_work_flush_all - flush all currently pending vblank work on crtc.
237+
* @crtc: crtc for which vblank work to flush
238+
*
239+
* Wait until all currently queued vblank work on @crtc
240+
* has finished executing once.
241+
*/
242+
void drm_vblank_work_flush_all(struct drm_crtc *crtc)
243+
{
244+
struct drm_device *dev = crtc->dev;
245+
struct drm_vblank_crtc *vblank = &dev->vblank[drm_crtc_index(crtc)];
246+
247+
spin_lock_irq(&dev->event_lock);
248+
wait_event_lock_irq(vblank->work_wait_queue,
249+
list_empty(&vblank->pending_work),
250+
dev->event_lock);
251+
spin_unlock_irq(&dev->event_lock);
252+
253+
kthread_flush_worker(vblank->worker);
254+
}
255+
EXPORT_SYMBOL(drm_vblank_work_flush_all);
256+
235257
/**
236258
* drm_vblank_work_init - initialize a vblank work item
237259
* @work: vblank work item

include/drm/drm_vblank_work.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ struct drm_crtc;
1717
* drm_vblank_work_init()
1818
* drm_vblank_work_cancel_sync()
1919
* drm_vblank_work_flush()
20+
* drm_vblank_work_flush_all()
2021
*/
2122
struct drm_vblank_work {
2223
/**
@@ -67,5 +68,6 @@ void drm_vblank_work_init(struct drm_vblank_work *work, struct drm_crtc *crtc,
6768
void (*func)(struct kthread_work *work));
6869
bool drm_vblank_work_cancel_sync(struct drm_vblank_work *work);
6970
void drm_vblank_work_flush(struct drm_vblank_work *work);
71+
void drm_vblank_work_flush_all(struct drm_crtc *crtc);
7072

7173
#endif /* !_DRM_VBLANK_WORK_H_ */

0 commit comments

Comments
 (0)