From e2e9681845da4385014a039e1e0152c7e6a476ec Mon Sep 17 00:00:00 2001 From: Oscar Salvador Date: Apr 04 2024 11:53:21 +0000 Subject: Merge remote-tracking branch 'origin/users/pjakobsson/SLE15-SP6-GA/for-next' into SLE15-SP6-GA Delete fbdev offending patch by Patrik Jakobsson --- diff --git a/blacklist.conf b/blacklist.conf index 50bc249..f1a05f9 100644 --- a/blacklist.conf +++ b/blacklist.conf @@ -272,3 +272,4 @@ e7b02296fb400ee64822fbdd81a0718449066333 # bluetooth: BT_HS removal; breaks kABI ffa55858330f267beec995fc4f68098c91311c64 # already applied 6a26310273c323380da21eb23fcfd50e31140913 # already applied 7e82a8745b951b1e794cc780d46f3fbee5e93447 # already applied +33cd6ea9c0673517cdb06ad5c915c6f22e9615fc # fbdev: causes a regression in the fb deferred io code (bsc#1221814) diff --git a/patches.suse/fbdev-flush-deferred-IO-before-closing.patch b/patches.suse/fbdev-flush-deferred-IO-before-closing.patch deleted file mode 100644 index 15e2f68..0000000 --- a/patches.suse/fbdev-flush-deferred-IO-before-closing.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 33cd6ea9c0673517cdb06ad5c915c6f22e9615fc Mon Sep 17 00:00:00 2001 -From: Nam Cao -Date: Mon, 18 Dec 2023 10:57:31 +0100 -Subject: [PATCH] fbdev: flush deferred IO before closing -Git-commit: 33cd6ea9c0673517cdb06ad5c915c6f22e9615fc -Patch-mainline: v6.8-rc1 -References: git-fixes - -When framebuffer gets closed, the queued deferred IO gets cancelled. This -can cause some last display data to vanish. This is problematic for users -who send a still image to the framebuffer, then close the file: the image -may never appear. - -To ensure none of display data get lost, flush the queued deferred IO -first before closing. - -Another possible solution is to delete the cancel_delayed_work_sync() -instead. The difference is that the display may appear some time after -closing. However, the clearing of page mapping after this needs to be -removed too, because the page mapping is used by the deferred work. It is -not completely obvious whether it is okay to not clear the page mapping. -For a patch intended for stable trees, go with the simple and obvious -solution. - -Fixes: 60b59beafba8 ("fbdev: mm: Deferred IO support") -Cc: stable@vger.kernel.org -Signed-off-by: Nam Cao -Reviewed-by: Sebastian Andrzej Siewior -Signed-off-by: Helge Deller -Acked-by: Takashi Iwai - ---- - drivers/video/fbdev/core/fb_defio.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c -index 6c8b81c452f0..1ae1d35a5942 100644 ---- a/drivers/video/fbdev/core/fb_defio.c -+++ b/drivers/video/fbdev/core/fb_defio.c -@@ -313,7 +313,7 @@ static void fb_deferred_io_lastclose(struct fb_info *info) - struct page *page; - int i; - -- cancel_delayed_work_sync(&info->deferred_work); -+ flush_delayed_work(&info->deferred_work); - - /* clear out the mapping that we setup */ - for (i = 0 ; i < info->fix.smem_len; i += PAGE_SIZE) { --- -2.35.3 - diff --git a/series.conf b/series.conf index e655979..c389de6 100644 --- a/series.conf +++ b/series.conf @@ -18471,7 +18471,6 @@ patches.suse/fbdev-imxfb-fix-left-margin-setting.patch patches.suse/fbdev-mmp-Fix-typo-and-wording-in-code-comment.patch patches.suse/fbdev-flush-deferred-work-in-fb_deferred_io_fsync.patch - patches.suse/fbdev-flush-deferred-IO-before-closing.patch patches.suse/HID-wacom-Correct-behavior-when-processing-some-conf.patch patches.suse/pwm-stm32-Use-hweight32-in-stm32_pwm_detect_channels.patch patches.suse/pwm-stm32-Fix-enable-count-for-clk-in-.probe.patch