From patchwork Tue Jun 3 15:48:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 893904 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (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 BC26F23D2B3 for ; Tue, 3 Jun 2025 15:52:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748965939; cv=none; b=Kmikju2m+huVharLSKJfzxfUldC8keGuJ5a+rOyEZymmcLssOFiVxDY3K1oQswDljPlIWp2bmsrGjUo3vwWesI4H5j2ucLXkCIPq2t8Zb2wHMs1LSFOTlh6WGXOrobJZlX5s94LX1ULZDx3tZy8S4SsE+y3Xn2vgV11RrVsMLOc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748965939; c=relaxed/simple; bh=/44qJs2HfdGw2OUEI5WOBfoJIrm5ef8d7RM1T2h8OPI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=mBj90W67qcKF1ixH8Gl/jcRb+fsfU0H6q8azXk1FJ6dAF48CgdgcIuPSFUCOYEcDUoSxigEhpm+WPWT/3VheHgtaIkAOSXkNR92D2trmHr5Uye5LK0osE01zul3PUYguDXkGSEbaND3x6RxZ7VFWxSLfmArWwOsY7DWx1LN+vaE= 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=tlHAVM2W; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=rUE07HBX; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=LWr5n/Au; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=/yIPd/Dv; arc=none smtp.client-ip=195.135.223.130 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="tlHAVM2W"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="rUE07HBX"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="LWr5n/Au"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="/yIPd/Dv" Received: from imap1.dmz-prg2.suse.org (unknown [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-out1.suse.de (Postfix) with ESMTPS id D62FD21AAE; Tue, 3 Jun 2025 15:52:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1748965936; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FnYa67cqiWnPUqruK5qg6QSnua73y8Kcq4VF0lmQj/M=; b=tlHAVM2WezBxXX/tBJvyKQ5CcGntV6d+M0vykYW6sIhRx1U5DpZWdgMu5W+l6/tfjHk3X4 cX7ST35YsjIKlk/KINXBsNpSS704V3+bJJMGq+mfet2Lo5jNyST5zvW7V41YIUJAyY/v+m PwO6osQEFoxZB1K2EcJClF50r86EcA8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1748965936; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FnYa67cqiWnPUqruK5qg6QSnua73y8Kcq4VF0lmQj/M=; b=rUE07HBXslhRIiCBYLKr03x9EnOJNTRVhMHoBc61swIrc40juE+6hiYfu0BVmjWjasbHo0 EKzNyxafxhZ8O5BQ== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1748965935; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FnYa67cqiWnPUqruK5qg6QSnua73y8Kcq4VF0lmQj/M=; b=LWr5n/AuFo2/M7gnxepHhn8A81bNW4noPSn8nzXbfiijY6DIa40C5DQJt3QMbAdVIVbobT EljsLd/fI88Q1oalZMb/04QDmxttvj1Mdb6sslaNAWS8q+Kr2AsQTbNxR1aO9juRHGAFPC Vja4cKs2NIPOc1SXKtmR5ZEYLZ4kfzk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1748965935; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FnYa67cqiWnPUqruK5qg6QSnua73y8Kcq4VF0lmQj/M=; b=/yIPd/DvZa3xsX3iSFGapQsVpAj+aRA9K7o22xDsGLVUC6MILi1PbBWK8ILvLwHywVekBW avgDHxeh8VpEpRBg== 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 8D99A13A92; Tue, 3 Jun 2025 15:52:15 +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 eR7kIC8aP2gCPwAAD6G6ig (envelope-from ); Tue, 03 Jun 2025 15:52:15 +0000 From: Thomas Zimmermann To: javierm@redhat.com Cc: dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, Thomas Zimmermann , Alex Deucher , Tzung-Bi Shih , Helge Deller , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Zsolt Kajtar , stable@vger.kernel.org Subject: [PATCH] sysfb: Fix screen_info type check for VGA Date: Tue, 3 Jun 2025 17:48:20 +0200 Message-ID: <20250603154838.401882-1-tzimmermann@suse.de> X-Mailer: git-send-email 2.49.0 Precedence: bulk X-Mailing-List: linux-fbdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spamd-Result: default: False [-3.30 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCPT_COUNT_SEVEN(0.00)[10]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmx.de]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_HAS_DN(0.00)[]; FREEMAIL_CC(0.00)[lists.freedesktop.org,vger.kernel.org,suse.de,amd.com,kernel.org,gmx.de,baylibre.com,c64.rulez.org]; TO_DN_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; DBL_BLOCKED_OPENRESOLVER(0.00)[amd.com:email,suse.de:email,suse.de:mid] X-Spam-Level: X-Spam-Flag: NO X-Spam-Score: -3.30 Use the helper screen_info_video_type() to get the framebuffer type from struct screen_info. Handle supported values in sorted switch statement. Reading orig_video_isVGA is unreliable. On most systems it is a VIDEO_TYPE_ constant. On some systems with VGA it is simply set to 1 to signal the presence of a VGA output. See vga_probe() for an example. Retrieving the screen_info type with the helper screen_info_video_type() detects these cases and returns the appropriate VIDEO_TYPE_ constant. For VGA, sysfb creates a device named "vga-framebuffer". The sysfb code has been taken from vga16fb, where it likely didn't work correctly either. With this bugfix applied, vga16fb loads for compatible vga-framebuffer devices. Fixes: 0db5b61e0dc0 ("fbdev/vga16fb: Create EGA/VGA devices in sysfb code") Cc: Thomas Zimmermann Cc: Javier Martinez Canillas Cc: Alex Deucher Cc: Tzung-Bi Shih Cc: Helge Deller Cc: "Uwe Kleine-König" Cc: Zsolt Kajtar Cc: # v6.1+ Signed-off-by: Thomas Zimmermann Reviewed-by: Javier Martinez Canillas --- drivers/firmware/sysfb.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/drivers/firmware/sysfb.c b/drivers/firmware/sysfb.c index 7c5c03f274b9..889e5b05c739 100644 --- a/drivers/firmware/sysfb.c +++ b/drivers/firmware/sysfb.c @@ -143,6 +143,7 @@ static __init int sysfb_init(void) { struct screen_info *si = &screen_info; struct device *parent; + unsigned int type; struct simplefb_platform_data mode; const char *name; bool compatible; @@ -170,17 +171,26 @@ static __init int sysfb_init(void) goto put_device; } + type = screen_info_video_type(si); + /* if the FB is incompatible, create a legacy framebuffer device */ - if (si->orig_video_isVGA == VIDEO_TYPE_EFI) - name = "efi-framebuffer"; - else if (si->orig_video_isVGA == VIDEO_TYPE_VLFB) - name = "vesa-framebuffer"; - else if (si->orig_video_isVGA == VIDEO_TYPE_VGAC) - name = "vga-framebuffer"; - else if (si->orig_video_isVGA == VIDEO_TYPE_EGAC) + switch (type) { + case VIDEO_TYPE_EGAC: name = "ega-framebuffer"; - else + break; + case VIDEO_TYPE_VGAC: + name = "vga-framebuffer"; + break; + case VIDEO_TYPE_VLFB: + name = "vesa-framebuffer"; + break; + case VIDEO_TYPE_EFI: + name = "efi-framebuffer"; + break; + default: name = "platform-framebuffer"; + break; + } pd = platform_device_alloc(name, 0); if (!pd) {