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=1794050826; b=BXWyIs9lGkHZUqzaJg05YzyFozmSVJ9r+WztHHgrfatK3lbgMhIfQ/s1/9C+7ecJoeqG WgciIOegglKYlQdlT42adSjKSiowoaOikFDWLro4Cv7pUoEn06u0/nblzexK18XeugsyN qK2LKP4PMICjed4KkuxQReS7LxFkeHrnBLubeI6ZbxjGGBd4HVEmG9II+OA75KaOYwedY oMFhBoiSCikmn6+QLWyolF9X/E9pjyqWnK2pskKNi5OAI0xNOiZfBMawJqAjnDP6D05yw gcSJhG/5cLYJ2v4GCs6FR9FDFptPesT8nO3IoObyb7cRn20ZJsNQ5vY+2/d0u7mdU9g== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794050826; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=A4G/bBGDJ3+2XHscwYGZq6D06YmVz4SR11roWn48Big=; b=DQssjndDKoCkAgudsRPSrh2AUtn/Vqpjt9qdehza6EncmBPNuhb3yW2B9bQVZTvMRKdH iDVylchBBXrNruVbd+XwhXRs/bOJRtceu3f4tTZwVM1Hb7BsMiFHc2SfogXAMVFoCz1He Uwg0AxeNzH596eu5Qu+5jLI2NGEIz5mBGEMHrJGfd5fZuiA8WQOasLg8v/nElhlZYAot4 Z2pUD5qIi+ka5cACjkUUNKfYF8PMC3Bs/hGTF/Kzr0V7toxNayFi3F0BIBfBcV9FkdW4g 9gzBHXMi8x/uEjQhVWzV0kOsahdQJLCdMJAeRnnwJwZxx95i/Rc1sOjB9xnSRj+dxfg== 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=L9zXZMk6; 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 E61E6606A326 for ; Sat, 7 Nov 2026 11:27:05 +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=L9zXZMk6 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 47CC31F0089F; Sat, 7 Nov 2026 11:27:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794050825; bh=A4G/bBGDJ3+2XHscwYGZq6D06YmVz4SR11roWn48Big=; h=From:To:Cc:Subject:Date; b=L9zXZMk60dUmmmDyPIOjpkfeVh1fWE6w/0chS7rdmTGubpflw2Pk/gbjRykjBA+Zh YvfRNvsL5zIdSXr6VI6zLt9ZuQVZ0SLp4nenSIqQS5T2Lg7Vov8+jZgAWArGOQJPXJ 05ZkWByP8E2ER+crGRVjwQQ2aBg6cig5aFm1SUciD9ZV869kVb+pZfNN8m9gbHmrPU QezzMGc24fIWNFQXUZ1iYWm/HTxbisuPd4VOEVs8jerf04mKxwd1z+2FhElfnT4a2m 4KPelkON0VcJGUvHsl+cvkpuB5KHnLPi4W3JaDWlCG5DMwKOUbV9jcDfopNmvvg4iB cYCBh4nCIuT3g== 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 5.10-stable tree Date: Sat, 7 Nov 2026 06:27:03 -0500 Message-ID: <20261107062703-failed-5.10-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 5.10-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-5.10.y git checkout FETCH_HEAD git cherry-pick -x 10463bcd43495fb88ff667b2c5348200860f6bdc # git commit -s git send-email --to '' --in-reply-to '20261107062703-failed-5.10-10463bcd4349@kernel.org' --subject-prefix 'PATCH 5.10.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