drm/fb-helper: Restore damage worker
Subsystems (5)
Thomas Zimmermann
maintainercover drm/fb-helper: Restore damage worker
It turns out that the removal of the damage worker can lead to locking cycles. The display update now runs while holding the fbdefio lock, which conflicts with locks in the modesetting code that updates the display. There's no easy fix for this, so let's restore the damage worker. The display update will then again run outside of the fbdefio lock.
See [1] for bug reports.
[1] https://intel-gfx-ci.01.org/tree/drm-tip/fi-kbl-8809g.html
Thomas Zimmermann (3):
Revert "drm/fb-helper: Remove damage worker"
Revert "drm/fb-helper: Schedule deferred-I/O worker after writing to
framebuffer"
Revert "drm/fb-helper: Perform damage handling in deferred-I/O helper"
drivers/gpu/drm/drm_fb_helper.c | 30 +++++++++++++---------------- drivers/video/fbdev/core/fb_defio.c | 16 --------------- include/drm/drm_fb_helper.h | 2 ++ include/linux/fb.h | 1 - 4 files changed, 15 insertions(+), 34 deletions(-)
Signature · 1 line
2.38.1
Thomas Zimmermann
maintainerPATCH 1/3 Revert "drm/fb-helper: Remove damage worker"
This reverts commit 27c3e9452d552ea86369a94f23287a9675f2d7a1.
Needed to restore the fbdev damage worker. There have been bug reports about locking order [1] and incorrectly takens branches. [2] Restore the damage worker until these problems have been resovled.
--- drivers/gpu/drm/drm_fb_helper.c | 9 +++++++++ include/drm/drm_fb_helper.h | 2 ++ 2 files changed, 11 insertions(+)
drivers/gpu/drm/drm_fb_helper.c +9 -0
@@ -403,6 +403,13 @@ static void drm_fb_helper_fb_dirty(struct drm_fb_helper *helper)spin_unlock_irqrestore (&helper->damage_lock, flags); } +static void drm_fb_helper_damage_work (struct work_struct *work) +{ + struct drm_fb_helper *helper = container_of(work, struct drm_fb_helper, damage_work); + +drm_fb_helper_fb_dirty (helper); +} +/** * drm_fb_helper_prepare - setup a drm_fb_helper structure * @dev: DRM device
@@ -418,6 +425,7 @@ void drm_fb_helper_prepare(struct drm_device *dev, struct drm_fb_helper *helper,INIT_LIST_HEAD (&helper->kernel_fb_list);spin_lock_init (&helper->damage_lock);INIT_WORK (&helper->resume_work, drm_fb_helper_resume_worker); +INIT_WORK (&helper->damage_work, drm_fb_helper_damage_work); helper->damage_clip.x1 = helper->damage_clip.y1 = ~0 ;mutex_init (&helper->lock); helper->funcs = funcs;
@@ -549,6 +557,7 @@ void drm_fb_helper_fini(struct drm_fb_helper *fb_helper)return ;cancel_work_sync (&fb_helper->resume_work); +cancel_work_sync (&fb_helper->damage_work); info = fb_helper->info;if (info) {
include/drm/drm_fb_helper.h +2 -0
@@ -116,6 +116,7 @@ struct drm_fb_helper_funcs {* @damage_clip: clip rectangle used with deferred_io to accumulate damage to * the screen buffer * @damage_lock: spinlock protecting @damage_clip +* @damage_work: worker used to flush the framebuffer * @resume_work: worker used during resume if the console lock is already taken * * This is the main structure used by the fbdev helpers. Drivers supporting
@@ -145,6 +146,7 @@ struct drm_fb_helper {u32 pseudo_palette[17 ];struct drm_clip_rect damage_clip;spinlock_t damage_lock; +struct work_struct damage_work;struct work_struct resume_work;/**
Signature · 1 line
2.38.1
Thomas Zimmermann
maintainerPATCH 2/3 Revert "drm/fb-helper: Schedule deferred-I/O worker after writing to framebuffer"
In reply to Thomas ZimmermannThis reverts commit 7f5cc4a3e5e4c5a38e5748defc952e45278f7a70.
Needed to restore the fbdev damage worker. There have been bug reports about locking order [1] and incorrectly takens branches. [2] Restore the damage worker until these problems have been resovled.
--- drivers/gpu/drm/drm_fb_helper.c | 9 +-------- drivers/video/fbdev/core/fb_defio.c | 16 ---------------- include/linux/fb.h | 1 - 3 files changed, 1 insertion(+), 25 deletions(-)
drivers/gpu/drm/drm_fb_helper.c +1 -8
@@ -599,16 +599,9 @@ static void drm_fb_helper_add_damage_clip(struct drm_fb_helper *helper, u32 x, ustatic void drm_fb_helper_damage (struct drm_fb_helper *helper,u32 x,u32 y,u32 width,u32 height) { -struct fb_info *info = helper->info; -drm_fb_helper_add_damage_clip (helper, x, y, width, height); -/* -* The current fbdev emulation only flushes buffers if a damage -* update is necessary. And we can assume that deferred I/O has -* been enabled as damage updates require deferred I/O for mmap. -*/ -fb_deferred_io_schedule_flush (info); +schedule_work (&helper->damage_work); }/*
drivers/video/fbdev/core/fb_defio.c +0 -16
@@ -332,19 +332,3 @@ void fb_deferred_io_cleanup(struct fb_info *info)mutex_destroy (&fbdefio->lock); }EXPORT_SYMBOL_GPL (fb_deferred_io_cleanup); - -void fb_deferred_io_schedule_flush (struct fb_info *info) -{ -struct fb_deferred_io *fbdefio = info->fbdefio; - -if (WARN_ON_ONCE (!fbdefio)) -return ;/* bug in driver logic */ - -/* -* There's no requirement from callers to schedule the -* flush immediately. Rather schedule the worker with a -* delay and let a few more writes pile up. -*/ -schedule_delayed_work (&info->deferred_work, fbdefio->delay); -} -EXPORT_SYMBOL_GPL (fb_deferred_io_schedule_flush);
include/linux/fb.h +0 -1
@@ -663,7 +663,6 @@ extern void fb_deferred_io_open(struct fb_info *info,struct inode *inode, struct file *file);extern void fb_deferred_io_cleanup (struct fb_info *info); -extern void fb_deferred_io_schedule_flush (struct fb_info *info);extern int fb_deferred_io_fsync (struct file *file,loff_t start,loff_t end,int datasync);
Signature · 1 line
2.38.1
Thomas Zimmermann
maintainerPATCH 3/3 Revert "drm/fb-helper: Perform damage handling in deferred-I/O helper"
In reply to Thomas ZimmermannThis reverts commit 5fc586a058babc71c82a038477581b7bfe1c6e2a.
Needed to restore the fbdev damage worker. There have been bug reports about locking order [1] and incorrectly takens branches. [2] Restore the damage worker until these problems have been resovled.
--- drivers/gpu/drm/drm_fb_helper.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/gpu/drm/drm_fb_helper.c +3 -9
@@ -666,16 +666,10 @@ void drm_fb_helper_deferred_io(struct fb_info *info, struct list_head *pagerefliif (min_off < max_off) {drm_fb_helper_memory_range_to_clip (info, min_off, max_off - min_off, &damage_area); -drm_fb_helper_add_damage_clip (helper, damage_area.x1, damage_area.y1, -drm_rect_width (&damage_area), -drm_rect_height (&damage_area)); +drm_fb_helper_damage (helper, damage_area.x1, damage_area.y1, +drm_rect_width (&damage_area), +drm_rect_height (&damage_area)); } - -/* -* Flushes all dirty pages from mmap's pageref list and the -* areas that have been written by struct fb_ops callbacks. -*/ -drm_fb_helper_fb_dirty (helper); }EXPORT_SYMBOL (drm_fb_helper_deferred_io);
Signature · 1 line
2.38.1
Quoted 10 lines · Thomas Zimmermann
It turns out that the removal of the damage worker can lead to locking cycles. The display update now runs while holding the fbdefio lock, which conflicts with locks in the modesetting code that updates the display. There's no easy fix for this, so let's restore the damage worker. The display update will then again run outside of the fbdefio lock.
See [1] for bug reports.
[1] https://intel-gfx-ci.01.org/tree/drm-tip/fi-kbl-8809g.html
:-(
Quoted 5 lines
Thomas Zimmermann (3):
Revert "drm/fb-helper: Remove damage worker"
Revert "drm/fb-helper: Schedule deferred-I/O worker after writing to
framebuffer"
Revert "drm/fb-helper: Perform damage handling in deferred-I/O helper"
On the series: Acked-by: Daniel Vetter <[email protected]>
Apologies for the late ack, I wasn't around yesterday afternoon. -Daniel
Quoted 10 lines
drivers/gpu/drm/drm_fb_helper.c | 30 +++++++++++++---------------- drivers/video/fbdev/core/fb_defio.c | 16 --------------- include/drm/drm_fb_helper.h | 2 ++ include/linux/fb.h | 1 - 4 files changed, 15 insertions(+), 34 deletions(-)Signature · 1 line
2.38.1
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch