Skip to content

Commit b02897e

Browse files
author
Thomas Zimmermann
committed
Revert "drm/fb-helper: Perform damage handling in deferred-I/O helper"
This reverts commit 5fc586a. 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. Signed-off-by: Thomas Zimmermann <[email protected]> Acked-by: Daniel Vetter <[email protected]> Link: https://intel-gfx-ci.01.org/tree/drm-tip/fi-kbl-8809g.html # 1 Link: https://lore.kernel.org/dri-devel/[email protected]/T/#m06eedc0a468940e4cbbd14ca026733b639bc445a # 2 Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] (cherry picked from commit e3ddd2d)
1 parent 1ab4de2 commit b02897e

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

drivers/gpu/drm/drm_fb_helper.c

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -666,16 +666,10 @@ void drm_fb_helper_deferred_io(struct fb_info *info, struct list_head *pagerefli
666666

667667
if (min_off < max_off) {
668668
drm_fb_helper_memory_range_to_clip(info, min_off, max_off - min_off, &damage_area);
669-
drm_fb_helper_add_damage_clip(helper, damage_area.x1, damage_area.y1,
670-
drm_rect_width(&damage_area),
671-
drm_rect_height(&damage_area));
669+
drm_fb_helper_damage(helper, damage_area.x1, damage_area.y1,
670+
drm_rect_width(&damage_area),
671+
drm_rect_height(&damage_area));
672672
}
673-
674-
/*
675-
* Flushes all dirty pages from mmap's pageref list and the
676-
* areas that have been written by struct fb_ops callbacks.
677-
*/
678-
drm_fb_helper_fb_dirty(helper);
679673
}
680674
EXPORT_SYMBOL(drm_fb_helper_deferred_io);
681675

0 commit comments

Comments
 (0)