From patchwork Mon Jan 10 09:56:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 531643 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6A75AC433EF for ; Mon, 10 Jan 2022 09:56:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243467AbiAJJ4f (ORCPT ); Mon, 10 Jan 2022 04:56:35 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:58555 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243452AbiAJJ4c (ORCPT ); Mon, 10 Jan 2022 04:56:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641808591; h=from:from:reply-to:subject:subject: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=DGDm1oaaWKUbsURSYDtt3eA6CLvZDH+FDjQaP+AuY/8=; b=C3zX4jOmqYap+53SM/TkVYqwkS8y67VK05zxkVEjyNL+H2O+Y2qMJYOJn5ufDNJH0CkU9J eDzX71xjvuE+3MNfc7LZQsocqC9YKNW+4rPxRfAU+p1HMDwIvSa/K/H/yjw3p1p51hhyL/ zcDPQqSgNppra7varnquPFosqjatHGQ= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-528-pGOpqlN4OyG6zykx16Eibw-1; Mon, 10 Jan 2022 04:56:30 -0500 X-MC-Unique: pGOpqlN4OyG6zykx16Eibw-1 Received: by mail-wm1-f72.google.com with SMTP id ay41-20020a05600c1e2900b00345a568e6b2so4704945wmb.4 for ; Mon, 10 Jan 2022 01:56:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DGDm1oaaWKUbsURSYDtt3eA6CLvZDH+FDjQaP+AuY/8=; b=Imw2PpFfxRm10O1iWNpGhPAk9rD7fayGxY6qcBbDMbe0ggFijE2fp07hcX3KGPsnIS YeywxcCaSjSZ8J4dfpjL1fHgoj4vcrrnhkD73b+nezd3nkH4rKCPHpd2/mMN7RyNxfOK rOXgnkyVF1HIP2+6q6Wr4RgnsZn8hpU/HrQDpCg94qr+L/wED1xUD2s3As+Nqld3inTi tGS0O/5cwrWt0crSUtW0y2hALKepybog3FRXPq/78KyrZdkGV4ROqfNrkGkJSBWHVMWZ 9B0+sNzPzk/s00Uyj6oH85DMxAf0W65Cy0rjTYJ+w/oPED040ij//yrlVCOBSDI1umzb jr0A== X-Gm-Message-State: AOAM530BfSSfXQZtToR+AgNFNvORowj3HjgXvU46/wYPFOpLBpQg1RJD nWGonGeKu+NkTRg7AvXwX3zLizGHuO8anof1rrj46Vt52VzYIwYmy0oKn2dGciMwu2XJ3vqt9aU AaZmGdm57R/7ge8DG505hgWM= X-Received: by 2002:a5d:6302:: with SMTP id i2mr5349403wru.25.1641808589065; Mon, 10 Jan 2022 01:56:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJz6ths/AcE+USA4b9jT9nuUL+2SfOzOGrd7hBLtsih5mHKb9hQ17/vSxnWdP1FKhpwI1kRuhA== X-Received: by 2002:a5d:6302:: with SMTP id i2mr5349395wru.25.1641808588900; Mon, 10 Jan 2022 01:56:28 -0800 (PST) Received: from minerva.home ([92.176.231.205]) by smtp.gmail.com with ESMTPSA id b13sm6315167wrf.64.2022.01.10.01.56.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 01:56:28 -0800 (PST) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Kris Karas , Peter Robinson , Geert Uytterhoeven , Javier Martinez Canillas , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Subject: [PATCH v2 1/2] video: vga16fb: Fix logic that checks for the display standard Date: Mon, 10 Jan 2022 10:56:24 +0100 Message-Id: <20220110095625.278836-2-javierm@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220110095625.278836-1-javierm@redhat.com> References: <20220110095625.278836-1-javierm@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org The vga16fb framebuffer driver supports both Enhanced Graphics Adapter (EGA) and Video Graphics Array (VGA) 16 color graphic cards. But the logic to check whether the EGA or VGA standard are used is not correct. It just checks if screen_info.orig_video_isVGA is set, but it should check if is set to VIDEO_TYPE_VGAC instead. This means that it assumes to be VGA even if is set to VIDEO_TYPE_EGAC. All non-x86 architectures though treat orig_video_isVGA as a boolean so only do the change for x86 and keep the old logic for the other arches. Signed-off-by: Javier Martinez Canillas --- Changes in v2: - Make the change only for x86 (Geert Uytterhoeven) drivers/video/fbdev/vga16fb.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/video/fbdev/vga16fb.c b/drivers/video/fbdev/vga16fb.c index e2757ff1c23d..8c464409eb99 100644 --- a/drivers/video/fbdev/vga16fb.c +++ b/drivers/video/fbdev/vga16fb.c @@ -1332,7 +1332,12 @@ static int vga16fb_probe(struct platform_device *dev) printk(KERN_INFO "vga16fb: mapped to 0x%p\n", info->screen_base); par = info->par; +#if defined(CONFIG_X86) + par->isVGA = screen_info.orig_video_isVGA == VIDEO_TYPE_VGAC; +#else + /* non-x86 architectures treat orig_video_isVGA as a boolean flag */ par->isVGA = screen_info.orig_video_isVGA; +#endif par->palette_blanked = 0; par->vesa_blanked = 0; From patchwork Mon Jan 10 09:56:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 531029 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2596BC433F5 for ; Mon, 10 Jan 2022 09:56:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243473AbiAJJ4h (ORCPT ); Mon, 10 Jan 2022 04:56:37 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:49960 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243462AbiAJJ4d (ORCPT ); Mon, 10 Jan 2022 04:56:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641808593; h=from:from:reply-to:subject:subject: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=wJr2+TRe6SBb1BM5UDY1ejbky83MU/0sD3dvYedx6MA=; b=gHUMMFbPOyd0DQRc7yJeSuOaGsqaaaiUcv4bSagPH1I33VEJ8E5kONOroj0ZTGeud7JRid da4yV/ScagOwGOg6dcn9eWKuLx335Mk4WTwOQbN6YbY4nDv03XB8yiodYLW3JinckO1oh/ YH3RfVsdVXgixOSUzlTu6TeiB+OzcIU= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-37-O1sNKEMJOgup1f8XIZftwQ-1; Mon, 10 Jan 2022 04:56:31 -0500 X-MC-Unique: O1sNKEMJOgup1f8XIZftwQ-1 Received: by mail-wr1-f69.google.com with SMTP id t28-20020adf97dc000000b001a5b98d2c81so2448794wrb.3 for ; Mon, 10 Jan 2022 01:56:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wJr2+TRe6SBb1BM5UDY1ejbky83MU/0sD3dvYedx6MA=; b=vCRbr5RO7z9lAjPCz1g9wkNOz2YKVgNA4WkgwMsz3K+8IY86QMv25OhYIl+ClHcgLR ghBIG3wOeM0AMTz+JSTcdm5NkSf0ugC26kpNg5A9H8wgQSmVuNU2C8zDNm8TTLO3GThe ll9gt8SAUg62fVKb4t7uuQQVHYUpdpwAFMYmL9MgnYGA2FxL0mvCn+clw10d5mXHWwK9 m9oD67CoKpjwjwqN8b23qP+mfl2T+AjIRk3IAZvt9dY695v6aIyKy4B8VUJXOyL+Pptx /yQick6AJxOhmNqj9iiya8dvEYyFlNUtojGUpSDi5nODUHgNHy5gF+dJLSlY3mWoKahe OFQQ== X-Gm-Message-State: AOAM530BHolL7i8vKH5dVTLe7xLCMGyHsXzK+U0cyRtuL6L48dVSDOtX N2UVjKrvXK7XDKuyQX8T1CTwd0JdB/xhJho7c5VGaV3kjpaKgWTSt/cTlKZZY87Sfpsj7lSMWov W1yeWnkihNgtgvwxXWLNON8s= X-Received: by 2002:a05:6000:11c9:: with SMTP id i9mr6134103wrx.544.1641808590194; Mon, 10 Jan 2022 01:56:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJzvF1fUNv4N+g4L82v97FbltLNWdtemC8wnOpy3eswOBvCDx6S9Wvq2C8LmHTKllcM2hylVhA== X-Received: by 2002:a05:6000:11c9:: with SMTP id i9mr6134090wrx.544.1641808589966; Mon, 10 Jan 2022 01:56:29 -0800 (PST) Received: from minerva.home ([92.176.231.205]) by smtp.gmail.com with ESMTPSA id b13sm6315167wrf.64.2022.01.10.01.56.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 01:56:29 -0800 (PST) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Kris Karas , Peter Robinson , Geert Uytterhoeven , Javier Martinez Canillas , stable@vger.kernel.org, Borislav Petkov , Daniel Vetter , Greg Kroah-Hartman , Thomas Zimmermann , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Subject: [PATCH v2 2/2] video: vga16fb: Only probe for EGA and VGA 16 color graphic cards Date: Mon, 10 Jan 2022 10:56:25 +0100 Message-Id: <20220110095625.278836-3-javierm@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220110095625.278836-1-javierm@redhat.com> References: <20220110095625.278836-1-javierm@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org The vga16fb framebuffer driver only supports Enhanced Graphics Adapter (EGA) and Video Graphics Array (VGA) 16 color graphic cards. But it doesn't check if the adapter is one of those or if a VGA16 mode is used. This means that the driver will be probed even if a VESA BIOS Extensions (VBE) or Graphics Output Protocol (GOP) interface is used. This issue has been present for a long time but it was only exposed by commit d391c5827107 ("drivers/firmware: move x86 Generic System Framebuffers support") since the platform device registration to match the {vesa,efi}fb drivers is done later as a consequence of that change. All non-x86 architectures though treat orig_video_isVGA as a boolean so only do the supported video mode check for x86 and not for other arches. Link: https://bugzilla.kernel.org/show_bug.cgi?id=215001 Fixes: d391c5827107 ("drivers/firmware: move x86 Generic System Framebuffers support") Reported-by: Kris Karas Cc: # 5.15.x Signed-off-by: Javier Martinez Canillas Tested-by: Kris Karas --- Changes in v2: - Only check the suppported video mode for x86 (Geert Uytterhoeven). drivers/video/fbdev/vga16fb.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/video/fbdev/vga16fb.c b/drivers/video/fbdev/vga16fb.c index 8c464409eb99..d21f68f3ee44 100644 --- a/drivers/video/fbdev/vga16fb.c +++ b/drivers/video/fbdev/vga16fb.c @@ -184,6 +184,25 @@ static inline void setindex(int index) vga_io_w(VGA_GFX_I, index); } +/* Check if the video mode is supported by the driver */ +static inline int check_mode_supported(void) +{ + /* non-x86 architectures treat orig_video_isVGA as a boolean flag */ +#if defined(CONFIG_X86) + /* only EGA and VGA in 16 color graphic mode are supported */ + if (screen_info.orig_video_isVGA != VIDEO_TYPE_EGAC && + screen_info.orig_video_isVGA != VIDEO_TYPE_VGAC) + return -ENODEV; + + if (screen_info.orig_video_mode != 0x0D && /* 320x200/4 (EGA) */ + screen_info.orig_video_mode != 0x0E && /* 640x200/4 (EGA) */ + screen_info.orig_video_mode != 0x10 && /* 640x350/4 (EGA) */ + screen_info.orig_video_mode != 0x12) /* 640x480/4 (VGA) */ + return -ENODEV; +#endif + return 0; +} + static void vga16fb_pan_var(struct fb_info *info, struct fb_var_screeninfo *var) { @@ -1427,6 +1446,11 @@ static int __init vga16fb_init(void) vga16fb_setup(option); #endif + + ret = check_mode_supported(); + if (ret) + return ret; + ret = platform_driver_register(&vga16fb_driver); if (!ret) {