From nobody Fri Jun 19 03:09:46 2026 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 00278C433EF for ; Fri, 8 Apr 2022 16:13:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237917AbiDHQQB (ORCPT ); Fri, 8 Apr 2022 12:16:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230511AbiDHQPv (ORCPT ); Fri, 8 Apr 2022 12:15:51 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 277B690FF9 for ; Fri, 8 Apr 2022 09:13:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649434423; 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=siz3X/UqDfw+7svtYWKLABxX78u03m0eRqZg4+H+2FU=; b=i06gfDSaxusgLQ8Mxtpdkno17BkxGvyZJQrLfxGznHfqNsyS79UbACZzSQVRdySDrwnKD5 ZcqW8KK5/41wG+ATZuObV3ApFQ78h5H1UD6lpbldSYqrrzcEBFNb9eDeYXyqWzU7FHVrYo 23YzQE2c6yq9FqqFdydTYuqNpwH9Ye8= 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-632-kN5oLAwxMaaW4BHClx1emg-1; Fri, 08 Apr 2022 12:13:42 -0400 X-MC-Unique: kN5oLAwxMaaW4BHClx1emg-1 Received: by mail-wm1-f72.google.com with SMTP id x8-20020a7bc768000000b0038e73173886so4568082wmk.6 for ; Fri, 08 Apr 2022 09:13:42 -0700 (PDT) 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=siz3X/UqDfw+7svtYWKLABxX78u03m0eRqZg4+H+2FU=; b=fsynYV/Nh94jfV+f1bQIC49NDN2ett1rLxgiXtqmgwX9YZvZJ31fN3hyHhk6l4Drl+ EA0GCS2ZsUHHDRz0Un+2h6/sFybdVgKw4lFUo7/5OVKzye7iHrpLOqcBRKoWXHD+7kEa LzpV1SNf3fhCLLi76t4J6L8TfHO+LWo3oSbWGPMZ9sPXsR50AkV8obg/Q3CvM2id30aX e1+dTwYv/NGkqHLBC30pHCzP/zFibERWpaH1ivUXKWMBcRQtGX7L+NWcc8Kw7x5NjBdC QufRfB7tMWDGsonZ3Si2cn7yn8Lrs8hWA2xPuhM3YLelLFEQuHqm6BGY8cxwRpHl/UDt TcOQ== X-Gm-Message-State: AOAM5331E3OsLiIg596w1E2M7avJTrWm/7XENZ2tAwsMBLQCn2wOoi0n ioFsCevLO/L7dhnB0uEw/yDd/YUCRIqVB/AP3PKmIijduppgV5STdnNltE+poP5wILqnbqvkCcM ksmOOLeH9yHpWiJUfNcFdYM7yEoah8qIpv0Jg6VA2rY0dhVRLdCU1Uwy5qLzvzhq/oSBUN/D1oZ A= X-Received: by 2002:a7b:cc12:0:b0:37c:1ae:100a with SMTP id f18-20020a7bcc12000000b0037c01ae100amr17200088wmh.54.1649434420932; Fri, 08 Apr 2022 09:13:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwq9i7g5A8Qdq92aXqmOvWOWToxcYSKRxuzMjwX82CkOUOdA+5yc/tgzh001RXjv6GYYOhx5Q== X-Received: by 2002:a7b:cc12:0:b0:37c:1ae:100a with SMTP id f18-20020a7bcc12000000b0037c01ae100amr17200054wmh.54.1649434420622; Fri, 08 Apr 2022 09:13:40 -0700 (PDT) Received: from minerva.home ([92.176.231.205]) by smtp.gmail.com with ESMTPSA id t15-20020adfeb8f000000b002060d26c211sm14377455wrn.114.2022.04.08.09.13.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 09:13:40 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Daniel Vetter , dri-devel@lists.freedesktop.org, Thomas Zimmermann , Javier Martinez Canillas , Borislav Petkov , Johan Hovold , Miaoqian Lin Subject: [PATCH v2 1/5] firmware: sysfb: Make sysfb_create_simplefb() return a pdev pointer Date: Fri, 8 Apr 2022 18:13:18 +0200 Message-Id: <20220408161322.270176-2-javierm@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220408161322.270176-1-javierm@redhat.com> References: <20220408161322.270176-1-javierm@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This function just returned 0 on success or an errno code on error, but it could be useful for sysfb_init() callers to have a pointer to the device. Signed-off-by: Javier Martinez Canillas Reviewed-by: Daniel Vetter --- Changes in v2: - Rebase on top of latest drm-misc-next and fix conflicts (Daniel Vetter). drivers/firmware/sysfb.c | 4 ++-- drivers/firmware/sysfb_simplefb.c | 16 ++++++++-------- include/linux/sysfb.h | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/firmware/sysfb.c b/drivers/firmware/sysfb.c index 2bfbb05f7d89..b032f40a92de 100644 --- a/drivers/firmware/sysfb.c +++ b/drivers/firmware/sysfb.c @@ -46,8 +46,8 @@ static __init int sysfb_init(void) /* try to create a simple-framebuffer device */ compatible =3D sysfb_parse_mode(si, &mode); if (compatible) { - ret =3D sysfb_create_simplefb(si, &mode); - if (!ret) + pd =3D sysfb_create_simplefb(si, &mode); + if (!IS_ERR(pd)) return 0; } =20 diff --git a/drivers/firmware/sysfb_simplefb.c b/drivers/firmware/sysfb_sim= plefb.c index bda8712bfd8c..a353e27f83f5 100644 --- a/drivers/firmware/sysfb_simplefb.c +++ b/drivers/firmware/sysfb_simplefb.c @@ -57,8 +57,8 @@ __init bool sysfb_parse_mode(const struct screen_info *si, return false; } =20 -__init int sysfb_create_simplefb(const struct screen_info *si, - const struct simplefb_platform_data *mode) +__init struct platform_device *sysfb_create_simplefb(const struct screen_i= nfo *si, + const struct simplefb_platform_data *mode) { struct platform_device *pd; struct resource res; @@ -76,7 +76,7 @@ __init int sysfb_create_simplefb(const struct screen_info= *si, base |=3D (u64)si->ext_lfb_base << 32; if (!base || (u64)(resource_size_t)base !=3D base) { printk(KERN_DEBUG "sysfb: inaccessible VRAM base\n"); - return -EINVAL; + return ERR_PTR(-EINVAL); } =20 /* @@ -93,7 +93,7 @@ __init int sysfb_create_simplefb(const struct screen_info= *si, length =3D mode->height * mode->stride; if (length > size) { printk(KERN_WARNING "sysfb: VRAM smaller than advertised\n"); - return -EINVAL; + return ERR_PTR(-EINVAL); } length =3D PAGE_ALIGN(length); =20 @@ -104,11 +104,11 @@ __init int sysfb_create_simplefb(const struct screen_= info *si, res.start =3D base; res.end =3D res.start + length - 1; if (res.end <=3D res.start) - return -EINVAL; + return ERR_PTR(-EINVAL); =20 pd =3D platform_device_alloc("simple-framebuffer", 0); if (!pd) - return -ENOMEM; + return ERR_PTR(-ENOMEM); =20 sysfb_apply_efi_quirks(pd); =20 @@ -124,10 +124,10 @@ __init int sysfb_create_simplefb(const struct screen_= info *si, if (ret) goto err_put_device; =20 - return 0; + return pd; =20 err_put_device: platform_device_put(pd); =20 - return ret; + return ERR_PTR(ret); } diff --git a/include/linux/sysfb.h b/include/linux/sysfb.h index b0dcfa26d07b..708152e9037b 100644 --- a/include/linux/sysfb.h +++ b/include/linux/sysfb.h @@ -72,8 +72,8 @@ static inline void sysfb_apply_efi_quirks(struct platform= _device *pd) =20 bool sysfb_parse_mode(const struct screen_info *si, struct simplefb_platform_data *mode); -int sysfb_create_simplefb(const struct screen_info *si, - const struct simplefb_platform_data *mode); +struct platform_device *sysfb_create_simplefb(const struct screen_info *si, + const struct simplefb_platform_data *mode); =20 #else /* CONFIG_SYSFB_SIMPLE */ =20 @@ -83,10 +83,10 @@ static inline bool sysfb_parse_mode(const struct screen= _info *si, return false; } =20 -static inline int sysfb_create_simplefb(const struct screen_info *si, - const struct simplefb_platform_data *mode) +static inline struct platform_device *sysfb_create_simplefb(const struct s= creen_info *si, + const struct simplefb_platform_data *mode) { - return -EINVAL; + return ERR_PTR(-EINVAL); } =20 #endif /* CONFIG_SYSFB_SIMPLE */ --=20 2.35.1 From nobody Fri Jun 19 03:09:46 2026 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 0DAACC433EF for ; Fri, 8 Apr 2022 16:14:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237986AbiDHQQ0 (ORCPT ); Fri, 8 Apr 2022 12:16:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231365AbiDHQPv (ORCPT ); Fri, 8 Apr 2022 12:15:51 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id A03AEB245B for ; Fri, 8 Apr 2022 09:13:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649434424; 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=TJpTIeTAW53bGCMvTatNT6vUmRrWyDElzFlDd/19otY=; b=Zg1CPQMsKNWCT04j4ak9hgIePvQYJJjd9SbygvvFHHjOkLCvhFitHbZ+TpV9QrdSqWTWtU 0GrkjEMDuBiviZgDmuy6+0zE2ncG/0N8VzdzyYK8BtfBG9LFc5ZO545PqXuQXC/oiNx7KG W9qnt9ox+hk+9y+QZAAxfBY/qwNDfd0= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-562-d37frHIFP8SwFUlR_5pMxw-1; Fri, 08 Apr 2022 12:13:43 -0400 X-MC-Unique: d37frHIFP8SwFUlR_5pMxw-1 Received: by mail-wr1-f72.google.com with SMTP id j67-20020adf9149000000b00203e6b7d151so2354783wrj.13 for ; Fri, 08 Apr 2022 09:13:43 -0700 (PDT) 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=TJpTIeTAW53bGCMvTatNT6vUmRrWyDElzFlDd/19otY=; b=vAslPpazFGedZiia3Zqywy01tCbuSgG4OH28nj2ZxVepPS0ZPJpxP+yFGiFSIYRTcQ Afl2C3CfDfq3O3gk1QIwynCBX7NOsKrc+yOOrTVNAzM6D1QwmoedDwQDJQq8mGgrobGT GDjXJ2RaBgg5vQpg2W0Y+NhA+gi3uCHmopVhfjosVa3cLNjBvIT1nbiFCgcyAKRl04n7 f7T7JHNWLcOWEafPMTB4FSWVvIB4ALROTXdTHOeZSLni2gPxJhcPiQfkdGhS9loap+AP trIKcnKZum57EQGy77rvzwnXmSczmhNA7LjDwiCPW1B12fCSif+JTznNXRY+fVYlJtnL u7Vg== X-Gm-Message-State: AOAM53069TiAvlU0dPI2FT+8zwR82HCfQyFvR6fYwXfsGPab936W3TGb lNX8KNpvE3lkf2R5XuGWRlQIrSAlzQ21Gk5/oymiZAF44UOVZLSNBB/biPOVtb1dL0i4viCt+Sf ZTpDKGleNOZpnQKc1mxj1I+rHmXTUesEM1xonKck1r1CRr6wWC/i95vgUApbHEI8Q7PyP0zqVMV 8= X-Received: by 2002:a05:600c:3ba5:b0:38c:b19e:253c with SMTP id n37-20020a05600c3ba500b0038cb19e253cmr17515139wms.35.1649434422272; Fri, 08 Apr 2022 09:13:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyb1bR0lxJrypE9QzahDsl2bHOBw/ximpksO0RRlntgb9gNAXEXCpGe5WPVpBzMKq9R/nVknw== X-Received: by 2002:a05:600c:3ba5:b0:38c:b19e:253c with SMTP id n37-20020a05600c3ba500b0038cb19e253cmr17515110wms.35.1649434421957; Fri, 08 Apr 2022 09:13:41 -0700 (PDT) Received: from minerva.home ([92.176.231.205]) by smtp.gmail.com with ESMTPSA id t15-20020adfeb8f000000b002060d26c211sm14377455wrn.114.2022.04.08.09.13.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 09:13:41 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Daniel Vetter , dri-devel@lists.freedesktop.org, Thomas Zimmermann , Javier Martinez Canillas , Borislav Petkov , Jonathan Corbet , linux-doc@vger.kernel.org Subject: [PATCH v2 2/5] firmware: sysfb: Add helpers to unregister a pdev and disable registration Date: Fri, 8 Apr 2022 18:13:19 +0200 Message-Id: <20220408161322.270176-3-javierm@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220408161322.270176-1-javierm@redhat.com> References: <20220408161322.270176-1-javierm@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" These can be used by subsystems to unregister a platform device registered by sysfb and also to disable future platform device registration in sysfb. Suggested-by: Daniel Vetter Signed-off-by: Javier Martinez Canillas Reviewed-by: Daniel Vetter --- Changes in v2: - Add kernel-doc comments and include in other_interfaces.rst (Daniel Vette= r). .../driver-api/firmware/other_interfaces.rst | 6 ++ drivers/firmware/sysfb.c | 73 +++++++++++++++++-- include/linux/sysfb.h | 19 +++++ 3 files changed, 92 insertions(+), 6 deletions(-) diff --git a/Documentation/driver-api/firmware/other_interfaces.rst b/Docum= entation/driver-api/firmware/other_interfaces.rst index b81794e0cfbb..06ac89adaafb 100644 --- a/Documentation/driver-api/firmware/other_interfaces.rst +++ b/Documentation/driver-api/firmware/other_interfaces.rst @@ -13,6 +13,12 @@ EDD Interfaces .. kernel-doc:: drivers/firmware/edd.c :internal: =20 +Generic System Framebuffers Interface +------------------------------------- + +.. kernel-doc:: drivers/firmware/sysfb.c + :export: + Intel Stratix10 SoC Service Layer --------------------------------- Some features of the Intel Stratix10 SoC require a level of privilege diff --git a/drivers/firmware/sysfb.c b/drivers/firmware/sysfb.c index b032f40a92de..a50d2858ce4d 100644 --- a/drivers/firmware/sysfb.c +++ b/drivers/firmware/sysfb.c @@ -34,21 +34,78 @@ #include #include =20 +static struct platform_device *pd; +static DEFINE_MUTEX(load_lock); +static bool disabled; + +/** + * sysfb_disable() - disable the Generic System Framebuffers support + * + * This disables the registration of system framebuffer devices that match= the + * generic drivers that make use of the system framebuffer set up by firmw= are. + * + * Context: The function can sleep. A @load_lock mutex is acquired to seri= alize + * against sysfb_init(), that registers a system framebuffer devi= ce and + * sysfb_try_unregister(), that tries to unregister framebuffer d= evices. + */ +void sysfb_disable(void) +{ + mutex_lock(&load_lock); + disabled =3D true; + mutex_unlock(&load_lock); +} +EXPORT_SYMBOL_GPL(sysfb_disable); + +/** + * sysfb_try_unregister() - attempt to unregister a system framebuffer dev= ice + * @dev: device to unregister + * + * This tries to unregister a system framebuffer device if this was regist= ered + * by the Generic System Framebuffers. The device will only be unregistere= d if + * it was registered by sysfb_init(), otherwise it will not be unregistere= d. + * + * Context: The function can sleep. a @load_lock mutex is acquired to seri= alize + * against sysfb_init(), that registers a simple framebuffer devi= ce and + * sysfb_disable(), that disables the Generic System Framebuffers= support. + * + * Return: + * * true - the device was unregistered successfully + * * false - the device was not unregistered + */ +bool sysfb_try_unregister(struct device *dev) +{ + bool ret =3D true; + + mutex_lock(&load_lock); + if (!pd || pd !=3D to_platform_device(dev)) + return false; + + platform_device_unregister(to_platform_device(dev)); + pd =3D NULL; + mutex_unlock(&load_lock); + + return ret; +} +EXPORT_SYMBOL_GPL(sysfb_try_unregister); + static __init int sysfb_init(void) { struct screen_info *si =3D &screen_info; struct simplefb_platform_data mode; - struct platform_device *pd; const char *name; bool compatible; - int ret; + int ret =3D 0; + + mutex_lock(&load_lock); + if (disabled) + goto unlock_mutex; =20 /* try to create a simple-framebuffer device */ compatible =3D sysfb_parse_mode(si, &mode); if (compatible) { pd =3D sysfb_create_simplefb(si, &mode); if (!IS_ERR(pd)) - return 0; + goto unlock_mutex; } =20 /* if the FB is incompatible, create a legacy framebuffer device */ @@ -60,8 +117,10 @@ static __init int sysfb_init(void) name =3D "platform-framebuffer"; =20 pd =3D platform_device_alloc(name, 0); - if (!pd) - return -ENOMEM; + if (!pd) { + ret =3D -ENOMEM; + goto unlock_mutex; + } =20 sysfb_apply_efi_quirks(pd); =20 @@ -73,9 +132,11 @@ static __init int sysfb_init(void) if (ret) goto err; =20 - return 0; + goto unlock_mutex; err: platform_device_put(pd); +unlock_mutex: + mutex_unlock(&load_lock); return ret; } =20 diff --git a/include/linux/sysfb.h b/include/linux/sysfb.h index 708152e9037b..e8c0313fac8f 100644 --- a/include/linux/sysfb.h +++ b/include/linux/sysfb.h @@ -55,6 +55,25 @@ struct efifb_dmi_info { int flags; }; =20 +#ifdef CONFIG_SYSFB + +void sysfb_disable(void); +bool sysfb_try_unregister(struct device *dev); + +#else /* CONFIG_SYSFB */ + +static inline void sysfb_disable(void) +{ + +} + +static inline bool sysfb_try_unregister(struct device *dev) +{ + return false; +} + +#endif /* CONFIG_SYSFB */ + #ifdef CONFIG_EFI =20 extern struct efifb_dmi_info efifb_dmi_list[]; --=20 2.35.1 From nobody Fri Jun 19 03:09:46 2026 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 07F59C433F5 for ; Fri, 8 Apr 2022 16:14:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237953AbiDHQQN (ORCPT ); Fri, 8 Apr 2022 12:16:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230319AbiDHQPw (ORCPT ); Fri, 8 Apr 2022 12:15:52 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 75F4D106638 for ; Fri, 8 Apr 2022 09:13:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649434426; 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=zcEitY10iZAiJ+J3+u8UtqIoWNDWTfj8MjNNemYgu3M=; b=RT50AdxshudiL9//klnex79SPAzomTCteajelybwihE7Pze5BBXwnjSg9BSupBoTQFcaWZ 3V3K6ZtLldAgyq9SK+Qz8uzB1xYBqMiMUHPe3v/AizbTiQk9YD57xfJeZwSTetfKlxsU4L PSn2L9k55Ksoa5VsXVxl238ALk0tdbQ= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-590-4RV9tRvJOReX3hB0cxCATw-1; Fri, 08 Apr 2022 12:13:45 -0400 X-MC-Unique: 4RV9tRvJOReX3hB0cxCATw-1 Received: by mail-wm1-f71.google.com with SMTP id f12-20020a05600c154c00b0038ea9ed0a4aso712357wmg.1 for ; Fri, 08 Apr 2022 09:13:44 -0700 (PDT) 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=zcEitY10iZAiJ+J3+u8UtqIoWNDWTfj8MjNNemYgu3M=; b=1DfNZ0XIvDbiO1wanLau4cNCz86pNnVC75xx5fMgVDasev65GhEDSY6NgqLQkWAVRl aWM+Igk9h1rkACbmhIwpmTvf1OkRkkG+dt8HJfZa1B8QF+jMRXjN6O+mrBwwOgL3XsYd hjis95ZY11JnePH44H7mAgIEG40/kTuQlMM0PLLL84aFjHkzPN2l42bMVM7boRO4/XRL EKD9rmSa4F4xZyMV4Hb6r8cjSvT6dyKHKH6MIF1QChMnEVGI4C59QqZtLbLDMzDDLPoF UZhKDm+GEO6Zkrf4UGCeCCSR+EzDJ7py+sCW24dcuU+zR+qsICz+JUjLCO6P0q0R8eAm 0zQg== X-Gm-Message-State: AOAM533ebl1om4o9yIMHLKYAs6tfNXjnz3iYDKYwBeks2m4vLtypPYqG QtBKJBlPk3vmwLaoyyrign1u1imP0Bq2TmcC/cAu+qL9r75jZPMOodaMdrgYVhfDBK3GgspbdE8 La1zKKRjlN3QEjm7HLkSDqE71aSZAU8Chze+TeWQs2wPX4FqH7GLar2YVIHWjda+BgwvK5nckN3 w= X-Received: by 2002:a5d:6785:0:b0:204:f8f:8fab with SMTP id v5-20020a5d6785000000b002040f8f8fabmr15369353wru.353.1649434423709; Fri, 08 Apr 2022 09:13:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxt3Rj+zw8mIsN24LhLbQy+hWefHkvvpTKfeMVqAFvoZziJC7qiikDxng1MGBPfgLZBQiYEtg== X-Received: by 2002:a5d:6785:0:b0:204:f8f:8fab with SMTP id v5-20020a5d6785000000b002040f8f8fabmr15369313wru.353.1649434423340; Fri, 08 Apr 2022 09:13:43 -0700 (PDT) Received: from minerva.home ([92.176.231.205]) by smtp.gmail.com with ESMTPSA id t15-20020adfeb8f000000b002060d26c211sm14377455wrn.114.2022.04.08.09.13.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 09:13:43 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Daniel Vetter , dri-devel@lists.freedesktop.org, Thomas Zimmermann , Javier Martinez Canillas , Alex Deucher , Changcheng Deng , Daniel Vetter , Guenter Roeck , Helge Deller , Sam Ravnborg , Tetsuo Handa , Zhen Lei , linux-fbdev@vger.kernel.org Subject: [PATCH v2 3/5] fbdev: Restart conflicting fb removal loop when unregistering devices Date: Fri, 8 Apr 2022 18:13:20 +0200 Message-Id: <20220408161322.270176-4-javierm@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220408161322.270176-1-javierm@redhat.com> References: <20220408161322.270176-1-javierm@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Drivers that want to remove registered conflicting framebuffers prior to register their own framebuffer, calls remove_conflicting_framebuffers(). This function takes the registration_lock mutex, to prevent a races when drivers register framebuffer devices. But if a conflicting framebuffer device is found, the underlaying platform device is unregistered and this will lead to the platform driver .remove callback to be called, which in turn will call to the unregister_framebuffer() that takes the same lock. To prevent this, a struct fb_info.forced_out field was used as indication to unregister_framebuffer() whether the mutex has to be grabbed or not. A cleaner solution is to drop the lock before platform_device_unregister() so unregister_framebuffer() can take it when called from the fbdev driver, and just grab the lock again after the device has been registered and do a removal loop restart. Since the framebuffer devices will already be removed, the loop would just finish when no more conflicting framebuffers are found. Suggested-by: Daniel Vetter Signed-off-by: Javier Martinez Canillas Reviewed-by: Daniel Vetter --- (no changes since v1) drivers/video/fbdev/core/fbmem.c | 29 +++++++++++++++++++---------- include/linux/fb.h | 1 - 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fb= mem.c index bdd00d381bbc..bcdbbe543466 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -1553,6 +1553,7 @@ static void do_remove_conflicting_framebuffers(struct= apertures_struct *a, { int i; =20 +restart_removal: /* check all firmware fbs and kick off if the base addr overlaps */ for_each_registered_fb(i) { struct apertures_struct *gen_aper; @@ -1576,16 +1577,28 @@ static void do_remove_conflicting_framebuffers(stru= ct apertures_struct *a, * VESA, EFI, etc. A native driver will then be able to * allocate the memory range. * - * If it's not a platform device, at least print a warning. A - * fix would add code to remove the device from the system. + * Drop the lock because if the device is unregistered, its + * drivers will call to unregister_framebuffer() that takes + * this lock. */ + mutex_unlock(®istration_lock); if (dev_is_platform(device)) { - registered_fb[i]->forced_out =3D true; platform_device_unregister(to_platform_device(device)); } else { + /* + * If it's not a platform device, at least print a warning. A + * fix would add to code to remove the device from the system. + */ pr_warn("fb%d: cannot remove device\n", i); - do_unregister_framebuffer(registered_fb[i]); + /* call unregister_framebuffer() so it can take the lock */ + unregister_framebuffer(registered_fb[i]); } + mutex_lock(®istration_lock); + /* + * Restart the removal loop now that the device has been + * unregistered and its associated framebuffer gone. + */ + goto restart_removal; } } } @@ -1892,13 +1905,9 @@ EXPORT_SYMBOL(register_framebuffer); void unregister_framebuffer(struct fb_info *fb_info) { - bool forced_out =3D fb_info->forced_out; - - if (!forced_out) - mutex_lock(®istration_lock); + mutex_lock(®istration_lock); do_unregister_framebuffer(fb_info); - if (!forced_out) - mutex_unlock(®istration_lock); + mutex_unlock(®istration_lock); } EXPORT_SYMBOL(unregister_framebuffer); =20 diff --git a/include/linux/fb.h b/include/linux/fb.h index f95da1af9ff6..b781bc721113 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -502,7 +502,6 @@ struct fb_info { } *apertures; =20 bool skip_vt_switch; /* no VT switch on suspend/resume required */ - bool forced_out; /* set when being removed by another driver */ }; =20 static inline struct apertures_struct *alloc_apertures(unsigned int max_nu= m) { --=20 2.35.1 From nobody Fri Jun 19 03:09:46 2026 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 57132C433F5 for ; Fri, 8 Apr 2022 16:14:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237962AbiDHQQd (ORCPT ); Fri, 8 Apr 2022 12:16:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231387AbiDHQPy (ORCPT ); Fri, 8 Apr 2022 12:15:54 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 161F224F0C for ; Fri, 8 Apr 2022 09:13:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649434428; 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=7QI3SswaraTV8idrWcTwBVC+GiIL0ijW6quL8YZNa3g=; b=M3A6/acuehP4pghs7lbcXYlRcrvqgcCiesf0C7wwQH53XQcCZVS6HIvSV08a9UVqsZl4yh 1u+FJVBz9bha77tD/9m6YnBUJD71BaJ9MVTuCcF8WQN/RxGPioohCSIiWn4dEqvlhfkE7d 9V0LkH6Z9BjeJ/ImIJLaf+oKHbXYS2E= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-92-GiJLFevQMg-V8W47Nsf9Kw-1; Fri, 08 Apr 2022 12:13:47 -0400 X-MC-Unique: GiJLFevQMg-V8W47Nsf9Kw-1 Received: by mail-wm1-f69.google.com with SMTP id x8-20020a7bc768000000b0038e73173886so4568164wmk.6 for ; Fri, 08 Apr 2022 09:13:47 -0700 (PDT) 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=7QI3SswaraTV8idrWcTwBVC+GiIL0ijW6quL8YZNa3g=; b=KWE/G2tAnwRM9F80FdMYoNDhlM9htb5Br50vZb5MZ16xosA0Hwq3ZFPvre4bmrHlZz 0jY3CDaBQ/yiqPlTi8cjkb+1rhD2AWRshUTtGEg2/zEOYx8cYNZUUFnGgYpoKY5VoD68 hehMWRLDRqn3Rruc2dA81eOSm9GBQzmtW6C+SQHDogkxNg0M9eyA3AdBRkqqrSWSPOu4 o2nptSjzoOkoo9oUhsmhgSvjKP3LLQb8tRB/l7ryXwj12N40pu+RbXOweMPzZVjJwhYl zjnaxygj47+Ffc/lZ8koYgYDFFBrRs+kH5LyPt3iLAvF2Fb9lO4lnW1n1hTkG61Yyawx 6PJA== X-Gm-Message-State: AOAM5325em5dQGprhjE5w5DrHvCvc3r/lwkTX0t8cVpz8IMAHBsSSzze k16Ay1mmZIq4ufZ4WAKDlwYBHJCE2f2xdIAmrmn6o+OKEGKy8zYK+Ix/Qdpt6inCluELOphzsWG KwL64CKU2QaIY3FwuwPqrzKMHsEhtmFw57QM70/B46Xah+fshGuOXVTk62/uQy9nzK0oJ71S2en Q= X-Received: by 2002:adf:fa4c:0:b0:205:7cb2:e6f0 with SMTP id y12-20020adffa4c000000b002057cb2e6f0mr15284866wrr.218.1649434425717; Fri, 08 Apr 2022 09:13:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyYRy6iFg+nUxs9pKZmeBKF3byaeUvogbu8dmOibs9HJxOPyzETU8IRSiW1efmqzGmnYftbww== X-Received: by 2002:adf:fa4c:0:b0:205:7cb2:e6f0 with SMTP id y12-20020adffa4c000000b002057cb2e6f0mr15284837wrr.218.1649434425421; Fri, 08 Apr 2022 09:13:45 -0700 (PDT) Received: from minerva.home ([92.176.231.205]) by smtp.gmail.com with ESMTPSA id t15-20020adfeb8f000000b002060d26c211sm14377455wrn.114.2022.04.08.09.13.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 09:13:45 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Daniel Vetter , dri-devel@lists.freedesktop.org, Thomas Zimmermann , Javier Martinez Canillas , Alex Deucher , Changcheng Deng , Daniel Vetter , Guenter Roeck , Helge Deller , Sam Ravnborg , Xiyu Yang , Zhen Lei , linux-fbdev@vger.kernel.org Subject: [PATCH v2 4/5] fbdev: Fix some race conditions between fbmem and sysfb Date: Fri, 8 Apr 2022 18:13:21 +0200 Message-Id: <20220408161322.270176-5-javierm@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220408161322.270176-1-javierm@redhat.com> References: <20220408161322.270176-1-javierm@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The platform devices registered in sysfb match with a firmware-based fbdev or DRM driver, that are used to have early graphics using framebuffers set up by the system firmware. Real DRM drivers later are probed and remove all conflicting framebuffers, leading to these platform devices for generic drivers to be unregistered. But the current solution has two issues that this patch fixes: 1) It is a layering violation for the fbdev core to unregister a device that was registered by sysfb. Instead, the sysfb_try_unregister() helper function can be called for sysfb to attempt unregistering the device if is the one registered. 2) The sysfb_init() function could be called after a DRM driver is probed and requested to unregister devices for drivers with a conflicting fb. To prevent this, disable any future sysfb platform device registration by calling sysfb_disable(), if a driver requested to remove conflicting framebuffers with remove_conflicting_framebuffers(). There are video drivers (e.g: vga16fb) that register their own device and don't use the sysfb infrastructure for that, so an unregistration has to be forced by fbmem if sysfb_try_unregister() fails to do the unregister. Suggested-by: Daniel Vetter Signed-off-by: Javier Martinez Canillas Reviewed-by: Daniel Vetter --- Changes in v2: - Explain in the commit message that fbmem has to unregister the device as fallback if a driver registered the device itself (Daniel Vetter). - Also explain that fallback in a comment in the code (Daniel Vetter). - Don't encode in fbmem the assumption that sysfb will always register platform devices (Daniel Vetter). - Add a FIXME comment about drivers registering devices (Daniel Vetter). drivers/video/fbdev/core/fbmem.c | 42 +++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fb= mem.c index bcdbbe543466..6cb73193410e 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -1582,22 +1583,30 @@ static void do_remove_conflicting_framebuffers(stru= ct apertures_struct *a, * this lock. */ mutex_unlock(®istration_lock); - if (dev_is_platform(device)) { - platform_device_unregister(to_platform_device(device)); - } else { - /* - * If it's not a platform device, at least print a warning. A - * fix would add to code to remove the device from the system. - */ - pr_warn("fb%d: cannot remove device\n", i); - /* call unregister_framebuffer() so it can take the lock */ - unregister_framebuffer(registered_fb[i]); + if (!sysfb_try_unregister(device)) { + if (dev_is_platform(device)) { + /* + * FIXME: sysfb didn't register this device, is a platform + * device registered by a video driver (e.g: vga16fb), so + * force its unregistration here. A proper fix would be to + * move all device registration to the sysfb infrastructure. + */ + platform_device_unregister(to_platform_device(device)); + } else { + /* + * If it's not a platform device, at least print a warning. A + * fix would add to code to remove the device from the system. + */ + pr_warn("fb%d: cannot remove device\n", i); + /* call unregister_framebuffer() so it can take the lock */ + unregister_framebuffer(registered_fb[i]); + } } - mutex_lock(®istration_lock); /* * Restart the removal loop now that the device has been * unregistered and its associated framebuffer gone. */ + mutex_lock(®istration_lock); goto restart_removal; } } @@ -1758,6 +1767,17 @@ int remove_conflicting_framebuffers(struct apertures= _struct *a, do_free =3D true; } =20 + /* + * If a driver asked to unregister a platform device registered by + * sysfb, then can be assumed that this is a driver for a display + * that is set up by the system firmware and has a generic driver. + * + * Drivers for devices that don't have a generic driver will never + * ask for this, so let's assume that a real driver for the display + * was already probed and prevent sysfb to register devices later. + */ + sysfb_disable(); + mutex_lock(®istration_lock); do_remove_conflicting_framebuffers(a, name, primary); mutex_unlock(®istration_lock); --=20 2.35.1 From nobody Fri Jun 19 03:09:46 2026 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 D995DC433EF for ; Fri, 8 Apr 2022 16:14:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238007AbiDHQQi (ORCPT ); Fri, 8 Apr 2022 12:16:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229551AbiDHQPx (ORCPT ); Fri, 8 Apr 2022 12:15:53 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 16105E09E for ; Fri, 8 Apr 2022 09:13:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649434429; 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=+NpBw4lqbBFDRVqxgjOkgfaUZ1HLPBwF1iC6qPlab68=; b=gZC2T1piZGsRDNhvpGq6AFJrepK8Zp7z4dZR5KXE86WNIlmEM+dAThwlflxn0lmdQi39yf Raj6/HvdNwyGU1aT2WJHruOOdxjEVyWKPx0m8PcF/YyAtcPGDrShhBCM7UR1yp0R+++FQI Z8zWARRwlYvldtOvz6UC34Tyonjwi1A= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-206-KAjxjvcFM8-L0j2wHCJvOw-1; Fri, 08 Apr 2022 12:13:48 -0400 X-MC-Unique: KAjxjvcFM8-L0j2wHCJvOw-1 Received: by mail-wm1-f69.google.com with SMTP id c19-20020a05600c4a1300b0038e6b4a104cso6145546wmp.9 for ; Fri, 08 Apr 2022 09:13:48 -0700 (PDT) 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=+NpBw4lqbBFDRVqxgjOkgfaUZ1HLPBwF1iC6qPlab68=; b=EkiNcooOjzWRw/+W3ts4KeBvLmr9pqeXd7neESJeRSP39BgRC6rTr3G/2CDMlAJlEo eSufYJr6mq7ZsY77LXcpe9d5Mx6bFriif65U9a6hsSrVFExNf6a73StVwhx4l4pimaVQ lYs1RSSlzaWAp56XOHM/LysPliI9TtBGh+8NeMg2VfCWrerbWD+XPIKOo3sOOHRBVUYp Y0tjUe2N0yTYk4vov7RzMBPwfM1FrJOEvQFhwcVpqK+Uvgz7pUCRedKaR/NUaPfWdlnQ f+CdwBEtIRaQzdpCHGnLatBaJ7lC6Z5QD9F/GpPtbGh9fMGPaw3iitRtwv790w7B1bdJ 9rGA== X-Gm-Message-State: AOAM533M5W4l5zFZMU1IU8odZmn8FT53uTlcjJDSKWyqIen8FfSVjs5a zLv21En9oG3qnZ5In06HQtweE5BWSdqw0wDN/06HMboyGmj7wUA1bR0cM+kAym0io1M4tkFI9Ot c5N48TMEXSg/x1DqyrIf8QIsoh1rW4ns3FlTbcv2W2mq3sKIohnAXuCiN2hZXetOXgnR4eDDEsp g= X-Received: by 2002:a5d:526f:0:b0:206:1c39:810f with SMTP id l15-20020a5d526f000000b002061c39810fmr15159311wrc.139.1649434426865; Fri, 08 Apr 2022 09:13:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwORWvYYZa7FXQJJTC1f/+l/2/E9uRlYGrj8t0VKR/7z+nDTMUHBSWhuUjM5hw14PF+grH6Sg== X-Received: by 2002:a5d:526f:0:b0:206:1c39:810f with SMTP id l15-20020a5d526f000000b002061c39810fmr15159279wrc.139.1649434426543; Fri, 08 Apr 2022 09:13:46 -0700 (PDT) Received: from minerva.home ([92.176.231.205]) by smtp.gmail.com with ESMTPSA id t15-20020adfeb8f000000b002060d26c211sm14377455wrn.114.2022.04.08.09.13.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 09:13:46 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Daniel Vetter , dri-devel@lists.freedesktop.org, Thomas Zimmermann , Zack Rusin , Javier Martinez Canillas , Hans de Goede , Ilya Trukhanov , Daniel Vetter , Peter Jones , linux-fbdev@vger.kernel.org, Helge Deller Subject: [PATCH v2 5/5] Revert "fbdev: Prevent probing generic drivers if a FB is already registered" Date: Fri, 8 Apr 2022 18:13:22 +0200 Message-Id: <20220408161322.270176-6-javierm@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220408161322.270176-1-javierm@redhat.com> References: <20220408161322.270176-1-javierm@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Daniel Vetter This reverts commit fb561bf9abde49f7e00fdbf9ed2ccf2d86cac8ee. With commit 27599aacbaefcbf2af7b06b0029459bbf682000d Author: Thomas Zimmermann Date: Tue Jan 25 10:12:18 2022 +0100 fbdev: Hot-unplug firmware fb devices on forced removal this should be fixed properly and we can remove this somewhat hackish check here (e.g. this won't catch drm drivers if fbdev emulation isn't enabled). Cc: Thomas Zimmermann Cc: Zack Rusin Cc: Javier Martinez Canillas Cc: Zack Rusin Cc: Hans de Goede Cc: Ilya Trukhanov Signed-off-by: Daniel Vetter Signed-off-by: Daniel Vetter Reviewed-by: Javier Martinez Canillas Cc: Peter Jones Cc: linux-fbdev@vger.kernel.org Signed-off-by: Javier Martinez Canillas --- (no changes since v1) drivers/video/fbdev/efifb.c | 11 ----------- drivers/video/fbdev/simplefb.c | 11 ----------- 2 files changed, 22 deletions(-) diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c index ea42ba6445b2..edca3703b964 100644 --- a/drivers/video/fbdev/efifb.c +++ b/drivers/video/fbdev/efifb.c @@ -351,17 +351,6 @@ static int efifb_probe(struct platform_device *dev) char *option =3D NULL; efi_memory_desc_t md; =20 - /* - * Generic drivers must not be registered if a framebuffer exists. - * If a native driver was probed, the display hardware was already - * taken and attempting to use the system framebuffer is dangerous. - */ - if (num_registered_fb > 0) { - dev_err(&dev->dev, - "efifb: a framebuffer is already registered\n"); - return -EINVAL; - } - if (screen_info.orig_video_isVGA !=3D VIDEO_TYPE_EFI || pci_dev_disabled) return -ENODEV; =20 diff --git a/drivers/video/fbdev/simplefb.c b/drivers/video/fbdev/simplefb.c index 94fc9c6d0411..0ef41173325a 100644 --- a/drivers/video/fbdev/simplefb.c +++ b/drivers/video/fbdev/simplefb.c @@ -413,17 +413,6 @@ static int simplefb_probe(struct platform_device *pdev) struct simplefb_par *par; struct resource *res, *mem; =20 - /* - * Generic drivers must not be registered if a framebuffer exists. - * If a native driver was probed, the display hardware was already - * taken and attempting to use the system framebuffer is dangerous. - */ - if (num_registered_fb > 0) { - dev_err(&pdev->dev, - "simplefb: a framebuffer is already registered\n"); - return -EINVAL; - } - if (fb_get_options("simplefb", NULL)) return -ENODEV; =20 --=20 2.35.1