From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794046401; b=NpKZHRtXrxgeQnEdLoUF7aKj852Ktc0TmbDrWYZoAEDkqW2y+Iv3EI3VmIGzIqY5wyw6 N4yY3ZPNJsgVfk/RybNz6r7A622/J+Zna84CzNyrjfzBokivlhFPiZ1c1iU4a3cq16o3V W1L1o1c3CRq0R/zC+4erqHBUDPHYA7kKAEfJS5Sl4oDKJw6uckCXPOCAHr70KuYSRFfuy CcwsXyjlVyDJe+QX1ovCIjRaPnwb7FDMhMvHZ8SqUzNz4Bg2lH5LfJtnBncul7aMjAZsJ I6j2u5huUr+oRt7BiLmxWqXN46LxIpy39mrxHp5z48X8Em6xWxZ46Bbcr2bS8SIejQA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794046401; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=7XAcAC8qbl5WSzmT4DXZICSs5nHNVaA8/P6rn6EEOaE=; b=vy5M9eg9dtTgA9741BXQvyv7wZxT3BkgG1jMdYzMILQfAajN2I4d16ICbEN0LKvAjElR 3ujytO6IyB6XJ6NgenE/La8dRrXzmkLHwscTc/0PzfGZCcuDb/V1uJseRtQ4pGzDrpkHF C3cTuKWNCAt38Jtje9IDY9gXM0FaMQJDZM1/ZKfZpWZaRjum7OsTZkwwqoPbTmD+Ys4iZ rg3j3XN1VdIHn7lXzcXGmHpp0VkRAc1en5EfeQVvv5tUFgwU9NFnuqUgrSHMT/H4Dcadg zdf7Qle93uUZkuUESjXA+C1g/QAPEdu/E9+Y2fNIR10uWirFu1k6BCIDQ+lF3czRgxA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=Ev4kGcqv; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 144EB606A32C for ; Sat, 7 Nov 2026 10:13:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=Ev4kGcqv Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6FB601F0089F; Sat, 7 Nov 2026 10:13:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794046400; bh=7XAcAC8qbl5WSzmT4DXZICSs5nHNVaA8/P6rn6EEOaE=; h=From:To:Cc:Subject:Date; b=Ev4kGcqv99FmPmdQISW8+QnLLLQUzdVne+rlQBRHSwc/UvsLZtLClsFzaP8n9zU/m ujetlxe3nZXOyOci33BLspB9gr/O2q1OxsqRfeTe2G6aULZ2Yf5VpZqdxhvrzJZQIc 4rE1O3miNiQs67rzh+d+/JHsqovQ6k8NrCE6j7is6QyluQSAJqbOCKqi20C+KWyBfD RWHvroF0XhjRrBuJmeoLRO92EJ1VgMs+omq6mvrLhdXpf6gSw5wixR/FTNnWpjnu6o P3Ftzp1PGiO41eJCrI0X7I5D4m13CevbCNUyXqTfHPGBo+/mCxUBbcEo4OjV0hULf7 e9SFP3gdaKYLw== From: Sasha Levin To: yaoyiqi3@huawei.com, tzimmermann@suse.de, deller@gmx.de Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] fbcon: Include font geometry in the rotated font cache" failed to apply to 6.18-stable tree Date: Sat, 7 Nov 2026 05:13:19 -0500 Message-ID: <20261107051319-failed-6.18-10463bcd4349@kernel.org> X-Mailer: git-send-email 2.53.0 X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.18-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.18.y git checkout FETCH_HEAD git cherry-pick -x 10463bcd43495fb88ff667b2c5348200860f6bdc # git commit -s git send-email --to '' --in-reply-to '20261107051319-failed-6.18-10463bcd4349@kernel.org' --subject-prefix 'PATCH 6.18.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From 10463bcd43495fb88ff667b2c5348200860f6bdc Mon Sep 17 00:00:00 2001 From: Yao Yiqi Date: Mon, 19 Oct 2026 17:43:29 +0800 Subject: [PATCH] fbcon: Include font geometry in the rotated font cache fbcon_rotate_font() caches a rotated copy of the console font and skips the rebuild when the fontdata pointer and the rotation match. Raw font data carries no geometry, though: width, height and charcount live in vc->vc_font. fbcon_set_font() deduplicates uploads by byte equality, so the same bytes re-uploaded with different dimensions keep the fontdata pointer while the geometry changes, and the early-out skips the rebuild. The rotated cell size depends on the geometry (rotation swaps width and height), so the stale buffer is indexed with the new cell size. Re-uploading a 4x16 font as 16x8 on a CW-rotated console, for example, doubles the rotated cell size and reads past the end of the old buffer. Record the geometry the buffer was built from and compare it in the early-out. The pointer-only key used to be backed by an explicit width check in the deduplication, which commit 1e3c49aa03fb ("lib/fonts: Compare font data for equality with font_data_is_equal()") dropped. Fixes: 6cc50e1c5b57 ("[PATCH] fbcon: Console Rotation - Add support to rotate font bitmap") Cc: stable@vger.kernel.org Signed-off-by: Yao Yiqi Acked-by: Thomas Zimmermann Signed-off-by: Helge Deller --- drivers/video/fbdev/core/fbcon.h | 9 ++++++--- drivers/video/fbdev/core/fbcon_rotate.c | 9 ++++++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/video/fbdev/core/fbcon.h b/drivers/video/fbdev/core/fbcon.h index 054cf66b15fa0..91b59b2990d29 100644 --- a/drivers/video/fbdev/core/fbcon.h +++ b/drivers/video/fbdev/core/fbcon.h @@ -89,10 +89,13 @@ struct fbcon_par { char *cursor_data; #ifdef CONFIG_FRAMEBUFFER_CONSOLE_ROTATION struct { - font_data_t *fontdata; /* source font */ - u8 *buf; /* rotated glyphs */ + font_data_t *fontdata; /* source font */ + u8 *buf; /* rotated glyphs */ size_t bufsize; - int buf_rotate; /* rotation of buf */ + int buf_rotate; /* rotation of buf */ + unsigned int buf_width; /* geometry of source font */ + unsigned int buf_height; + unsigned int buf_charcount; } rotated; #endif u8 *cursor_src; diff --git a/drivers/video/fbdev/core/fbcon_rotate.c b/drivers/video/fbdev/core/fbcon_rotate.c index 6cdbc96eeca6f..660a3fa81baed 100644 --- a/drivers/video/fbdev/core/fbcon_rotate.c +++ b/drivers/video/fbdev/core/fbcon_rotate.c @@ -21,11 +21,18 @@ int fbcon_rotate_font(struct fb_info *info, struct vc_data *vc) unsigned char *buf; int ret; - if (par->p->fontdata == par->rotated.fontdata && par->rotate == par->rotated.buf_rotate) + if (par->p->fontdata == par->rotated.fontdata && + par->rotate == par->rotated.buf_rotate && + vc->vc_font.width == par->rotated.buf_width && + vc->vc_font.height == par->rotated.buf_height && + vc->vc_font.charcount == par->rotated.buf_charcount) return 0; par->rotated.fontdata = par->p->fontdata; par->rotated.buf_rotate = par->rotate; + par->rotated.buf_width = vc->vc_font.width; + par->rotated.buf_height = vc->vc_font.height; + par->rotated.buf_charcount = vc->vc_font.charcount; if (info->fbops->fb_sync) info->fbops->fb_sync(info); -- 2.53.0