From nobody Thu Oct 2 23:49:44 2025 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C8EE8338F53 for ; Tue, 9 Sep 2025 12:49:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757422169; cv=none; b=Vn3dXrzelCbrpUeVxPcmS8LjSQ2NnZPNwgQMl4o1Ktw5w6/1wTm0LuYS94Y8zOkVH5WOc/bN/pvGFNVJ6cO8Py8oNGvq6olN079I5abjLdr6PHS1EwWud+tqcEUIPvOrgwb7f/uaaZbdrU1k6HxfyDtHzpq7c0z0haA0ABT/km0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757422169; c=relaxed/simple; bh=lL+kvbuubvLsUhD/Ea2na6fl33qse3s5rjzCMrWvCIU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tYgnMYmb7SWDreLQZ687fwQlbEFd6zBU2WrgckMlvLlOSzLNaegBRAVvRI927pfYFC8ZKh2I3Q3qgEZts9SctzhcR6DouXT2JArjoFLaJMUFe2im5lhz1pMCN4LVxMxWEjMDxZxSay2v3RV0oZv+5Epo2Zzm+HfZA1pBWOIIl7E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=fnO036Fu; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=AOaw69do; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=BHigqScE; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=y988j1Jh; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="fnO036Fu"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="AOaw69do"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="BHigqScE"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="y988j1Jh" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 2ED121FFD8; Tue, 9 Sep 2025 12:49:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1757422146; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fXbkr+4cgZLwwrnUjo+/GvjaLMuCY/Ju3904Tb+aKU0=; b=fnO036Fu3RJdegvx/pc9wOpsTV1UoybHRZBbBZyr/vcRrVn0oi+Ken5IfchiRfjJ8GU/DM PeUmG216gUjdCz38W6M1/gcTRkUmitxfAZtkGw5IA+j1ai5iHktz/5WSrDj+bqSkuaHi86 bLL/h6yfcIKVOwq/kxb+Uzgt6nnOu9A= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1757422146; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fXbkr+4cgZLwwrnUjo+/GvjaLMuCY/Ju3904Tb+aKU0=; b=AOaw69doyO0pB9NNqss+sf119DIs6N1TATn05fBf6atwbmPIST5klJqHImdY42/tIJ2RfL rItnCWZlGRHGUNDg== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=BHigqScE; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=y988j1Jh DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1757422145; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fXbkr+4cgZLwwrnUjo+/GvjaLMuCY/Ju3904Tb+aKU0=; b=BHigqScE4BfBkUAV7fn7TFFvrWXAVeynfbwjcnGCftFL9Relu0Szbn5c9pTzuD+q+T9O52 RgrdphSuApG0MgQTZerI7+FRWTJhJLmF3fA+XQyPg4B46l5Aejtz8ZntpxPwUW5h832EIS 9DjP9QZpGXxXvetsS8Kt85/3JqD4xyA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1757422145; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fXbkr+4cgZLwwrnUjo+/GvjaLMuCY/Ju3904Tb+aKU0=; b=y988j1JhBL2DPsrKJVSeXr0OzSLoI+8YP/V6tX9hLtL0iZ3JbzQxJh/iJV6YiMPg91fI4e RP8KJzFAbnQVDzDA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id F09DC13A56; Tue, 9 Sep 2025 12:49:04 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id OKqOOUAiwGilUAAAD6G6ig (envelope-from ); Tue, 09 Sep 2025 12:49:04 +0000 From: Thomas Zimmermann To: sam@ravnborg.org, simona@ffwll.ch, deller@gmx.de Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH v2 5/5] fbcon: Streamline setting rotated/unrotated bitops Date: Tue, 9 Sep 2025 14:44:45 +0200 Message-ID: <20250909124616.143365-6-tzimmermann@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250909124616.143365-1-tzimmermann@suse.de> References: <20250909124616.143365-1-tzimmermann@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; ARC_NA(0.00)[]; FREEMAIL_TO(0.00)[ravnborg.org,ffwll.ch,gmx.de]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MIME_TRACE(0.00)[0:+]; FUZZY_RATELIMITED(0.00)[rspamd.com]; TO_DN_SOME(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_SEVEN(0.00)[7]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.de:mid,suse.de:dkim,suse.de:email]; FROM_EQ_ENVFROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; FREEMAIL_ENVRCPT(0.00)[gmx.de] X-Spam-Flag: NO X-Spam-Level: X-Rspamd-Queue-Id: 2ED121FFD8 X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Action: no action X-Spam-Score: -3.01 Content-Type: text/plain; charset="utf-8" Support for console rotation is somewhat bolted onto the helper fbcon_set_bitops() for unrotated displays. Update fbcon_set_bitops() with a switch statement that picks the correct settings helper for the current rotation. For unrotated consoles, set the bitops for in the new helper fbcon_set_bitops_ur(). Rename the other, existing helpers to match the common naming scheme. The old helper fbcon_set_rotate() is no longer used. Signed-off-by: Thomas Zimmermann Reviewed-by: Sam Ravnborg --- drivers/video/fbdev/core/bitblit.c | 5 +---- drivers/video/fbdev/core/fbcon.c | 21 +++++++++++++++++++++ drivers/video/fbdev/core/fbcon.h | 8 +------- drivers/video/fbdev/core/fbcon_ccw.c | 2 +- drivers/video/fbdev/core/fbcon_cw.c | 2 +- drivers/video/fbdev/core/fbcon_rotate.c | 15 --------------- drivers/video/fbdev/core/fbcon_rotate.h | 15 ++++++++++++--- drivers/video/fbdev/core/fbcon_ud.c | 2 +- 8 files changed, 38 insertions(+), 32 deletions(-) diff --git a/drivers/video/fbdev/core/bitblit.c b/drivers/video/fbdev/core/= bitblit.c index 7a68372f0444..08cfcd81c6b4 100644 --- a/drivers/video/fbdev/core/bitblit.c +++ b/drivers/video/fbdev/core/bitblit.c @@ -393,10 +393,7 @@ static const struct fbcon_bitops bit_fbcon_bitops =3D { .update_start =3D bit_update_start, }; =20 -void fbcon_set_bitops(struct fbcon_par *par) +void fbcon_set_bitops_ur(struct fbcon_par *par) { par->bitops =3D &bit_fbcon_bitops; - - if (par->rotate) - fbcon_set_rotate(par); } diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fb= con.c index 1074dc90ed92..85f63f87d3c1 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -81,6 +81,7 @@ #include =20 #include "fbcon.h" +#include "fbcon_rotate.h" #include "fb_internal.h" =20 /* @@ -270,6 +271,26 @@ static void fbcon_rotate_all(struct fb_info *info, u32= rotate) } #endif /* CONFIG_FRAMEBUFFER_CONSOLE_ROTATION */ =20 +static void fbcon_set_bitops(struct fbcon_par *par) +{ + switch (par->rotate) { + default: + fallthrough; + case FB_ROTATE_UR: + fbcon_set_bitops_ur(par); + break; + case FB_ROTATE_CW: + fbcon_set_bitops_cw(par); + break; + case FB_ROTATE_UD: + fbcon_set_bitops_ud(par); + break; + case FB_ROTATE_CCW: + fbcon_set_bitops_ccw(par); + break; + } +} + static int fbcon_get_rotate(struct fb_info *info) { struct fbcon_par *par =3D info->fbcon_par; diff --git a/drivers/video/fbdev/core/fbcon.h b/drivers/video/fbdev/core/fb= con.h index 4bff4f5b3ec1..44ea4ae4bba0 100644 --- a/drivers/video/fbdev/core/fbcon.h +++ b/drivers/video/fbdev/core/fbcon.h @@ -191,7 +191,7 @@ static inline u_short fb_scrollmode(struct fbcon_displa= y *fb) #ifdef CONFIG_FB_TILEBLITTING extern void fbcon_set_tileops(struct vc_data *vc, struct fb_info *info); #endif -extern void fbcon_set_bitops(struct fbcon_par *par); +extern void fbcon_set_bitops_ur(struct fbcon_par *par); extern int soft_cursor(struct fb_info *info, struct fb_cursor *cursor); =20 #define FBCON_ATTRIBUTE_UNDERLINE 1 @@ -229,10 +229,4 @@ static inline int get_attribute(struct fb_info *info, = u16 c) (void) (&_r =3D=3D &_v); \ (i =3D=3D FB_ROTATE_UR || i =3D=3D FB_ROTATE_UD) ? _r : _v; }) =20 -#ifdef CONFIG_FRAMEBUFFER_CONSOLE_ROTATION -extern void fbcon_set_rotate(struct fbcon_par *par); -#else -#define fbcon_set_rotate(x) do {} while(0) -#endif /* CONFIG_FRAMEBUFFER_CONSOLE_ROTATION */ - #endif /* _VIDEO_FBCON_H */ diff --git a/drivers/video/fbdev/core/fbcon_ccw.c b/drivers/video/fbdev/cor= e/fbcon_ccw.c index 4721f4b5e29a..2f394b5a17f7 100644 --- a/drivers/video/fbdev/core/fbcon_ccw.c +++ b/drivers/video/fbdev/core/fbcon_ccw.c @@ -400,7 +400,7 @@ static const struct fbcon_bitops ccw_fbcon_bitops =3D { .rotate_font =3D fbcon_rotate_font, }; =20 -void fbcon_rotate_ccw(struct fbcon_par *par) +void fbcon_set_bitops_ccw(struct fbcon_par *par) { par->bitops =3D &ccw_fbcon_bitops; } diff --git a/drivers/video/fbdev/core/fbcon_cw.c b/drivers/video/fbdev/core= /fbcon_cw.c index 2771924d0fb7..3c3ad3471ec4 100644 --- a/drivers/video/fbdev/core/fbcon_cw.c +++ b/drivers/video/fbdev/core/fbcon_cw.c @@ -383,7 +383,7 @@ static const struct fbcon_bitops cw_fbcon_bitops =3D { .rotate_font =3D fbcon_rotate_font, }; =20 -void fbcon_rotate_cw(struct fbcon_par *par) +void fbcon_set_bitops_cw(struct fbcon_par *par) { par->bitops =3D &cw_fbcon_bitops; } diff --git a/drivers/video/fbdev/core/fbcon_rotate.c b/drivers/video/fbdev/= core/fbcon_rotate.c index 0c7cac71a9c2..1562a8f20b4f 100644 --- a/drivers/video/fbdev/core/fbcon_rotate.c +++ b/drivers/video/fbdev/core/fbcon_rotate.c @@ -92,18 +92,3 @@ int fbcon_rotate_font(struct fb_info *info, struct vc_da= ta *vc) finished: return err; } - -void fbcon_set_rotate(struct fbcon_par *par) -{ - switch (par->rotate) { - case FB_ROTATE_CW: - fbcon_rotate_cw(par); - break; - case FB_ROTATE_UD: - fbcon_rotate_ud(par); - break; - case FB_ROTATE_CCW: - fbcon_rotate_ccw(par); - break; - } -} diff --git a/drivers/video/fbdev/core/fbcon_rotate.h b/drivers/video/fbdev/= core/fbcon_rotate.h index 784f3231a958..8cb019e8a9c0 100644 --- a/drivers/video/fbdev/core/fbcon_rotate.h +++ b/drivers/video/fbdev/core/fbcon_rotate.h @@ -92,8 +92,17 @@ static inline void rotate_ccw(const char *in, char *out,= u32 width, u32 height) =20 int fbcon_rotate_font(struct fb_info *info, struct vc_data *vc); =20 -extern void fbcon_rotate_cw(struct fbcon_par *par); -extern void fbcon_rotate_ud(struct fbcon_par *par); -extern void fbcon_rotate_ccw(struct fbcon_par *par); +#if defined(CONFIG_FRAMEBUFFER_CONSOLE_ROTATION) +void fbcon_set_bitops_cw(struct fbcon_par *par); +void fbcon_set_bitops_ud(struct fbcon_par *par); +void fbcon_set_bitops_ccw(struct fbcon_par *par); +#else +static inline void fbcon_set_bitops_cw(struct fbcon_par *par) +{ } +static inline void fbcon_set_bitops_ud(struct fbcon_par *par) +{ } +static inline void fbcon_set_bitops_ccw(struct fbcon_par *par) +{ } +#endif =20 #endif diff --git a/drivers/video/fbdev/core/fbcon_ud.c b/drivers/video/fbdev/core= /fbcon_ud.c index 148ca9b539d1..6fc30cad5b19 100644 --- a/drivers/video/fbdev/core/fbcon_ud.c +++ b/drivers/video/fbdev/core/fbcon_ud.c @@ -427,7 +427,7 @@ static const struct fbcon_bitops ud_fbcon_bitops =3D { .rotate_font =3D fbcon_rotate_font, }; =20 -void fbcon_rotate_ud(struct fbcon_par *par) +void fbcon_set_bitops_ud(struct fbcon_par *par) { par->bitops =3D &ud_fbcon_bitops; } --=20 2.51.0