From patchwork Wed Jul 19 08:15:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 122453 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2285030vqt; Wed, 19 Jul 2023 01:26:18 -0700 (PDT) X-Google-Smtp-Source: APBJJlEEw1IYZQT0em3UuBe/mFzSJk//UThi7iag09JmvEWxGREZ/XsPJjf+nI/1tiIuFM+YOZQW X-Received: by 2002:a19:4346:0:b0:4fb:9631:4bb with SMTP id m6-20020a194346000000b004fb963104bbmr3337082lfj.11.1689755178615; Wed, 19 Jul 2023 01:26:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689755178; cv=none; d=google.com; s=arc-20160816; b=Vdetfj1UWsr0vDZj/hPVdBM7se+fFjrmWb7PKLAuHM03QlhKPrjjFwJ/HP7QC2OpIX A8rj97iAbPOq9LSxkKpONeuQjcD4lGog/AJYvVVM50fye6lkmlFuI8Fp1m4fEYeESuf1 PEgo8FOiDhjzomq72qgWOwcyBSKUbH0Q4mRuZhOEVs/E8binIieQiwiPAKD8JXDCqgO1 C8uo01QYUGGPL44UVjcuAXxJq870213chn4wYx7ywF4PxU/Q9GwmzPO2QqQ6z2Byoq0l 2ylLgKlzgOh2YhlfKB2ZYxLVfnzo1LI7AmxqeZfvxKLBK2qelaG1v6Hsoyy1RVfwDpVq SSgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=pl7rDesBC4To4uNjgzRPqO8NIm8bPxHEaiAgd1Bj9kg=; fh=ghiyFGLbJeQtMZxhV8TehTHJi2vQmlwBvPeiNQZXxVw=; b=JEXitZSguLJWsY3TlXcem4OCNNCAhRpNAqO9lIgcXe4wXPCkJ+vYhVTOiXupbfCE/r M3yUUgE+649qBi3n1teLfaaxVhhkdjB7MYGog67jJRutihdNPY/3ekK8ptEs/ke/zBLo DAo9wyKqjCUuEvc3wcRO7uLtNLIZKljMajuwLVaX1Mg6rUvPSJ6Zj3eC365W6sHw9FXD S9cpBLQ4fI5g4/Km7chd088FJe8OjPkJ9rUKQdKHJkCLiPNgpK3JfKP5zVh/8e4uLmP5 b07qrn5/1L2UUT3UoBUs5wjai/IY5rqVNfGtUkZUUGVOzVW8CSlgTTmPPTSAdTtLfZeb F85A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PfSa6n63; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e19-20020a50fb93000000b0050bc94fe05csi2706408edq.117.2023.07.19.01.25.54; Wed, 19 Jul 2023 01:26:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PfSa6n63; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230440AbjGSIRK (ORCPT + 99 others); Wed, 19 Jul 2023 04:17:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230356AbjGSIQr (ORCPT ); Wed, 19 Jul 2023 04:16:47 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9DA05171E for ; Wed, 19 Jul 2023 01:15:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689754556; 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=pl7rDesBC4To4uNjgzRPqO8NIm8bPxHEaiAgd1Bj9kg=; b=PfSa6n63zHE8uNzDWqdIszLbwAAWuipTPAHdMKmS5SispHpM2kYNzUdDFTqtgFOxUL3T3E 3xTbB5/Zo1MIz3LudN3xAtbiZHVsW+rI110E4PUfg2mFrmQvyee8h4NzZBDKPG344UYFLJ wBgVMq1wiYEpEezBLL0qG+5Trv8UXD8= 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.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-317-qhygSuatNCWqqhMFycYFFA-1; Wed, 19 Jul 2023 04:15:55 -0400 X-MC-Unique: qhygSuatNCWqqhMFycYFFA-1 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3143b999f6eso3821324f8f.3 for ; Wed, 19 Jul 2023 01:15:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689754554; x=1690359354; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pl7rDesBC4To4uNjgzRPqO8NIm8bPxHEaiAgd1Bj9kg=; b=I9M2kn3oBS8clLE9pNcc+qxFegiqnvlOpf0W0AjiCnthEv+PQ8SY1QH9KpYKv9lukF FHOaAbB2lchfPc+OV+KAID0tngg0gF4tjOa2k3LL2e9e1t0WmsjkSJhcyfZt9eN/nQpT 6RUI6nVltUPO0pxelR3LYEvIYxpTnMQUXgvxcGha6uDUDgNAYWWArAiX2HSebLxaEBZC 0UpWnhm22MorhWqI91e3IAMuKBfBsAao88k22K90Ypdg6UNM0mu6/ZB5yZhmnewcr0lj QZ2RDDOAOJWt2d69XBYPiloOs0KuyGDQXFUf6NdItEXMoeX5xYirh1mix36GvWzxuHAH /Udg== X-Gm-Message-State: ABy/qLZNy3VuwqycnB9sSx6mCNUHz1p9B75j71E9g3F73mWCnjOleDRm qokkTxjpXgDZAj+wyBlCMORnceHofPqpDzDZ/0hWfbxANp+wvwlV/aKMmVhXnzLxewv3y8PKwru IOcJitcESZnryjuLzwXqZAVmqWBXPJNqEodCqyVHZIlc0iyRf3F2TeSdEezoI70nWUTTy/s1bpD OtSbX/xJY= X-Received: by 2002:adf:f087:0:b0:314:4c78:8b84 with SMTP id n7-20020adff087000000b003144c788b84mr4142575wro.17.1689754554457; Wed, 19 Jul 2023 01:15:54 -0700 (PDT) X-Received: by 2002:adf:f087:0:b0:314:4c78:8b84 with SMTP id n7-20020adff087000000b003144c788b84mr4142546wro.17.1689754554100; Wed, 19 Jul 2023 01:15:54 -0700 (PDT) Received: from minerva.home (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id d5-20020a5d5385000000b0031423a8f4f7sm4574354wrv.56.2023.07.19.01.15.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jul 2023 01:15:53 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Thomas Zimmermann , Geert Uytterhoeven , Arnd Bergmann , Javier Martinez Canillas , Greg Kroah-Hartman , Helge Deller , Jacek Lawrynowicz , Jeffrey Hugo , Nipun Gupta , Oded Gabbay , Pieter Jansen van Vuuren , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Subject: [PATCH v6 1/4] video: Add auxiliary display drivers to Graphics support menu Date: Wed, 19 Jul 2023 10:15:35 +0200 Message-ID: <20230719081544.741051-2-javierm@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230719081544.741051-1-javierm@redhat.com> References: <20230719081544.741051-1-javierm@redhat.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771836726524062493 X-GMAIL-MSGID: 1771836726524062493 The drivers in this subsystem are for character-based LCD displays, which can fall into the same category of the DRM/KMS and fbdev drivers that are located under the "Graphics support" menu. Add auxdisplay there as well. Suggested-by: Thomas Zimmermann Signed-off-by: Javier Martinez Canillas Reviewed-by: Arnd Bergmann Tested-by: Arnd Bergmann --- (no changes since v5) Changes in v5: - Take the auxdisplay/Kconfig source out of "if HAS_IOMEM" (Geert Uytterhoeven). drivers/Kconfig | 2 -- drivers/video/Kconfig | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/Kconfig b/drivers/Kconfig index 514ae6b24cb2..496ca02ee18f 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -129,8 +129,6 @@ source "drivers/dma-buf/Kconfig" source "drivers/dca/Kconfig" -source "drivers/auxdisplay/Kconfig" - source "drivers/uio/Kconfig" source "drivers/vfio/Kconfig" diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 8b2b9ac37c3d..e5b1cc54cafa 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -25,6 +25,8 @@ config VIDEO_NOMODESET bool default n +source "drivers/auxdisplay/Kconfig" + if HAS_IOMEM config HAVE_FB_ATMEL From patchwork Wed Jul 19 08:15:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 122452 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2284827vqt; Wed, 19 Jul 2023 01:25:44 -0700 (PDT) X-Google-Smtp-Source: APBJJlELQhbZespqRM3pJsFgPVNZ8jbZ4uuT2LgvMP+gOk+jVKsaRM9SM8+TyXvnhDlpSadk5cY/ X-Received: by 2002:a17:906:197:b0:994:1844:549c with SMTP id 23-20020a170906019700b009941844549cmr1595807ejb.0.1689755143938; Wed, 19 Jul 2023 01:25:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689755143; cv=none; d=google.com; s=arc-20160816; b=O1YoNa093uNCIZp9irjeOgix2YWMcjBiNV2fIB89UIu3E0ViKCUti7e5Vnh2cy54SJ dAerLAKEyJ1vlNz2fTAqCfV10YtskUqBk2we8aQ805R8daZfqSTUa4NCBfO8bKW2ek6N XjYQSk93QH1Cwu7Q6Ych6QiQG7NlxVLrhRWJW8KmFC14i4VzP4iOHs3SIrmtved3dlZ0 jLIaRK2dyWnxQ/s+IrokLUoD24EJE2u0YAnipFYJxoUHtnh/BEK/uBdcvrJyilCwNu3b gpjRu0rERakTBTp3m5G7JtA+lR/z3XrI29ndQ8wXYhWedQ3jnaUvzUKD3x5XyVR9fgkK ilhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Pd9+AMWEkVJOiciXCYw1Tf+rzcgyczWb3kQKGEiVtIU=; fh=usfNKgtwtwPf8sxagR1x6Ag24hkrDKqUz4IXfiICwhg=; b=Y3bj2J+Avgk7cFN35e8dXQWles/TcRp5F9TsWkhTO3DTrSXctW6H3qJqn2m895mS3N Q/1b7OI1DSuYaKHp3CBWvf2u9NZ8p89PfNCivFi16djhawhFOIMgIPIUHCa3SadqeiJQ dSHWiGzkIU2HIja/rfBKy5d0Gy3sfifzXUrCieUR3cxDbZ/RN4dTFn2mzX5otuVkld5D gE4/8Oron1H1yiq0BYGkE9L095qsiRSS0ipkcDGd0P3QkmMmKUMO1Kb3jwoikqXfCQFa fwgNHPEwDYbaaSNnOQpQrTkt2kbBfgmyFx30t1BiXtC7gmbncRqqc+s5B6WaI676YpNZ 1nHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=do2+z8Mg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k25-20020a170906159900b009932d8a227asi2501703ejd.277.2023.07.19.01.25.19; Wed, 19 Jul 2023 01:25:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=do2+z8Mg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230330AbjGSIQn (ORCPT + 99 others); Wed, 19 Jul 2023 04:16:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55682 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230227AbjGSIQj (ORCPT ); Wed, 19 Jul 2023 04:16:39 -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 ESMTPS id 9EB47E47 for ; Wed, 19 Jul 2023 01:15:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689754558; 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=Pd9+AMWEkVJOiciXCYw1Tf+rzcgyczWb3kQKGEiVtIU=; b=do2+z8Mg9pLEiMDAN0rIm+txqUfowWtziGxSRR+077k6NS+/atxDmiietlm1MMccTsAK12 df4EtNXJTZubLeN9T9nCgqIHQWnWhyAOFBQ6OQGZZE3DMNaRPb820mJHveta0ztdyHprRH hA1R5xuC7r7tZcC3lHsK2T0lpzOi76E= Received: from mail-lf1-f71.google.com (mail-lf1-f71.google.com [209.85.167.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-460-_eFub2IcPCq0xeRV-pQOHg-1; Wed, 19 Jul 2023 04:15:57 -0400 X-MC-Unique: _eFub2IcPCq0xeRV-pQOHg-1 Received: by mail-lf1-f71.google.com with SMTP id 2adb3069b0e04-4fb76659d44so5666756e87.3 for ; Wed, 19 Jul 2023 01:15:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689754556; x=1690359356; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Pd9+AMWEkVJOiciXCYw1Tf+rzcgyczWb3kQKGEiVtIU=; b=AF2V5b3JSklenhDGJfE08KgU2yKMWMM4fTIu0kJRMBEMPTlf/++l+pcYMTt+KrJjkM UgKIq7A6im1skezfGG5ZXmQ3dONC/t1XhLqkqOLZDmt+hUoo2ZNuaHV6zxLslnHCxxpn nTm9ApcgUQoBFNl+8XMn1FLcCsv5htOVrOn7FZr3CQ+sDVSCkN5zF79vUrmaxbUZqg3F f8oHVlEgbLTdLdVO68cGORKRcEk8o/JaUFDPRXC8kTkq3uQDXJ8NcCGubgIvvcTFJT1H PZcFAJvl115BugkelCIJisVzpkRyfYJg/LwoX1+9EZDCN4JsU4LARagYcgDuyNlEtg9o bgRw== X-Gm-Message-State: ABy/qLYuhEBUXBn793eNF+5OWd66+TGM08ESwVw9U2H12fkEuPvimZHm +GbAUP6TC2q6ZWdykXMsP6PSbGFHu4k5un44+pq4dWnxfzXoWpLLDTrOdyUqn0jeKZUPL30akMV Ursxh6avmAN4dqf6MAm4Bf8DrieSbreuDQA4xh9765v/WCLTJ04rwc/F7dGf/ViUoj542AZmUr1 FgW66mHpY= X-Received: by 2002:a19:7b15:0:b0:4fd:b223:92c with SMTP id w21-20020a197b15000000b004fdb223092cmr1230928lfc.60.1689754555770; Wed, 19 Jul 2023 01:15:55 -0700 (PDT) X-Received: by 2002:a19:7b15:0:b0:4fd:b223:92c with SMTP id w21-20020a197b15000000b004fdb223092cmr1230906lfc.60.1689754555255; Wed, 19 Jul 2023 01:15:55 -0700 (PDT) Received: from minerva.home (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id d5-20020a5d5385000000b0031423a8f4f7sm4574354wrv.56.2023.07.19.01.15.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jul 2023 01:15:54 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Thomas Zimmermann , Geert Uytterhoeven , Arnd Bergmann , Javier Martinez Canillas , Andy Shevchenko , Daniel Vetter , Helge Deller , Randy Dunlap , Sam Ravnborg , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Subject: [PATCH v6 2/4] fbdev: Move core fbdev symbols to a separate Kconfig file Date: Wed, 19 Jul 2023 10:15:36 +0200 Message-ID: <20230719081544.741051-3-javierm@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230719081544.741051-1-javierm@redhat.com> References: <20230719081544.741051-1-javierm@redhat.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771836690018036960 X-GMAIL-MSGID: 1771836690018036960 The drivers/video/fbdev/Kconfig defines both symbols for fbdev drivers and core fbdev symbols, that can be enabled independently of the fbdev drivers. Split the Kconfig in two, one that only has the symbols for fbdev drivers and another one that contains the fbdev core symbols. Suggested-by: Arnd Bergmann Signed-off-by: Javier Martinez Canillas Reviewed-by: Arnd Bergmann Tested-by: Arnd Bergmann --- Changes in v6: - Don't move FB_{HECUBA,SVGALIB,MACMODES} to config/Kcore (Arnd Bergmann). drivers/video/fbdev/Kconfig | 187 +------------------------------ drivers/video/fbdev/core/Kconfig | 186 ++++++++++++++++++++++++++++++ 2 files changed, 188 insertions(+), 185 deletions(-) create mode 100644 drivers/video/fbdev/core/Kconfig diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index c12c166be7d1..ed881d5b3ee0 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -3,9 +3,6 @@ # fbdev configuration # -config FB_NOTIFY - bool - menuconfig FB tristate "Support for frame buffer devices" select FB_NOTIFY @@ -42,153 +39,6 @@ menuconfig FB (e.g. an accelerated X server) and that are not frame buffer device-aware may cause unexpected results. If unsure, say N. -config FIRMWARE_EDID - bool "Enable firmware EDID" - depends on FB - help - This enables access to the EDID transferred from the firmware. - On the i386, this is from the Video BIOS. Enable this if DDC/I2C - transfers do not work for your driver and if you are using - nvidiafb, i810fb or savagefb. - - In general, choosing Y for this option is safe. If you - experience extremely long delays while booting before you get - something on your display, try setting this to N. Matrox cards in - combination with certain motherboards and monitors are known to - suffer from this problem. - -config FB_DEVICE - bool "Provide legacy /dev/fb* device" - depends on FB - default y - help - Say Y here if you want the legacy /dev/fb* device file and - interfaces within sysfs anc procfs. It is only required if you - have userspace programs that depend on fbdev for graphics output. - This does not affect the framebuffer console. If unsure, say N. - -config FB_DDC - tristate - depends on FB - select I2C_ALGOBIT - select I2C - -config FB_CFB_FILLRECT - tristate - depends on FB - help - Include the cfb_fillrect function for generic software rectangle - filling. This is used by drivers that don't provide their own - (accelerated) version. - -config FB_CFB_COPYAREA - tristate - depends on FB - help - Include the cfb_copyarea function for generic software area copying. - This is used by drivers that don't provide their own (accelerated) - version. - -config FB_CFB_IMAGEBLIT - tristate - depends on FB - help - Include the cfb_imageblit function for generic software image - blitting. This is used by drivers that don't provide their own - (accelerated) version. - -config FB_CFB_REV_PIXELS_IN_BYTE - bool - depends on FB - help - Allow generic frame-buffer functions to work on displays with 1, 2 - and 4 bits per pixel depths which has opposite order of pixels in - byte order to bytes in long order. - -config FB_SYS_FILLRECT - tristate - depends on FB - help - Include the sys_fillrect function for generic software rectangle - filling. This is used by drivers that don't provide their own - (accelerated) version and the framebuffer is in system RAM. - -config FB_SYS_COPYAREA - tristate - depends on FB - help - Include the sys_copyarea function for generic software area copying. - This is used by drivers that don't provide their own (accelerated) - version and the framebuffer is in system RAM. - -config FB_SYS_IMAGEBLIT - tristate - depends on FB - help - Include the sys_imageblit function for generic software image - blitting. This is used by drivers that don't provide their own - (accelerated) version and the framebuffer is in system RAM. - -config FB_PROVIDE_GET_FB_UNMAPPED_AREA - bool - depends on FB - help - Allow generic frame-buffer to provide get_fb_unmapped_area - function to provide shareable character device support on nommu. - -menuconfig FB_FOREIGN_ENDIAN - bool "Framebuffer foreign endianness support" - depends on FB - help - This menu will let you enable support for the framebuffers with - non-native endianness (e.g. Little-Endian framebuffer on a - Big-Endian machine). Most probably you don't have such hardware, - so it's safe to say "n" here. - -choice - prompt "Choice endianness support" - depends on FB_FOREIGN_ENDIAN - -config FB_BOTH_ENDIAN - bool "Support for Big- and Little-Endian framebuffers" - -config FB_BIG_ENDIAN - bool "Support for Big-Endian framebuffers only" - -config FB_LITTLE_ENDIAN - bool "Support for Little-Endian framebuffers only" - -endchoice - -config FB_SYS_FOPS - tristate - depends on FB - -config FB_DEFERRED_IO - bool - depends on FB - -config FB_IO_HELPERS - bool - depends on FB - select FB_CFB_COPYAREA - select FB_CFB_FILLRECT - select FB_CFB_IMAGEBLIT - -config FB_SYS_HELPERS - bool - depends on FB - select FB_SYS_COPYAREA - select FB_SYS_FILLRECT - select FB_SYS_FOPS - select FB_SYS_IMAGEBLIT - -config FB_SYS_HELPERS_DEFERRED - bool - depends on FB - select FB_DEFERRED_IO - select FB_SYS_HELPERS - config FB_HECUBA tristate depends on FB @@ -205,41 +55,6 @@ config FB_MACMODES tristate depends on FB -config FB_BACKLIGHT - tristate - depends on FB - select BACKLIGHT_CLASS_DEVICE - -config FB_MODE_HELPERS - bool "Enable Video Mode Handling Helpers" - depends on FB - help - This enables functions for handling video modes using the - Generalized Timing Formula and the EDID parser. A few drivers rely - on this feature such as the radeonfb, rivafb, and the i810fb. If - your driver does not take advantage of this feature, choosing Y will - just increase the kernel size by about 5K. - -config FB_TILEBLITTING - bool "Enable Tile Blitting Support" - depends on FB - help - This enables tile blitting. Tile blitting is a drawing technique - where the screen is divided into rectangular sections (tiles), whereas - the standard blitting divides the screen into pixels. Because the - default drawing element is a tile, drawing functions will be passed - parameters in terms of number of tiles instead of number of pixels. - For example, to draw a single character, instead of using bitmaps, - an index to an array of bitmaps will be used. To clear or move a - rectangular section of a screen, the rectangle will be described in - terms of number of tiles in the x- and y-axis. - - This is particularly important to one driver, matroxfb. If - unsure, say N. - -comment "Frame buffer hardware drivers" - depends on FB - config FB_GRVGA tristate "Aeroflex Gaisler framebuffer support" depends on FB && SPARC @@ -2223,3 +2038,5 @@ config FB_SM712 source "drivers/video/fbdev/omap/Kconfig" source "drivers/video/fbdev/omap2/Kconfig" source "drivers/video/fbdev/mmp/Kconfig" + +source "drivers/video/fbdev/core/Kconfig" diff --git a/drivers/video/fbdev/core/Kconfig b/drivers/video/fbdev/core/Kconfig new file mode 100644 index 000000000000..fd3b7f5b4b7a --- /dev/null +++ b/drivers/video/fbdev/core/Kconfig @@ -0,0 +1,186 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# fbdev core configuration +# + +config FB_NOTIFY + bool + +config FIRMWARE_EDID + bool "Enable firmware EDID" + depends on FB + help + This enables access to the EDID transferred from the firmware. + On the i386, this is from the Video BIOS. Enable this if DDC/I2C + transfers do not work for your driver and if you are using + nvidiafb, i810fb or savagefb. + + In general, choosing Y for this option is safe. If you + experience extremely long delays while booting before you get + something on your display, try setting this to N. Matrox cards in + combination with certain motherboards and monitors are known to + suffer from this problem. + +config FB_DEVICE + bool "Provide legacy /dev/fb* device" + depends on FB + default y + help + Say Y here if you want the legacy /dev/fb* device file and + interfaces within sysfs anc procfs. It is only required if you + have userspace programs that depend on fbdev for graphics output. + This does not affect the framebuffer console. If unsure, say N. + +config FB_DDC + tristate + depends on FB + select I2C_ALGOBIT + select I2C + +config FB_CFB_FILLRECT + tristate + depends on FB + help + Include the cfb_fillrect function for generic software rectangle + filling. This is used by drivers that don't provide their own + (accelerated) version. + +config FB_CFB_COPYAREA + tristate + depends on FB + help + Include the cfb_copyarea function for generic software area copying. + This is used by drivers that don't provide their own (accelerated) + version. + +config FB_CFB_IMAGEBLIT + tristate + depends on FB + help + Include the cfb_imageblit function for generic software image + blitting. This is used by drivers that don't provide their own + (accelerated) version. + +config FB_CFB_REV_PIXELS_IN_BYTE + bool + depends on FB + help + Allow generic frame-buffer functions to work on displays with 1, 2 + and 4 bits per pixel depths which has opposite order of pixels in + byte order to bytes in long order. + +config FB_SYS_FILLRECT + tristate + depends on FB + help + Include the sys_fillrect function for generic software rectangle + filling. This is used by drivers that don't provide their own + (accelerated) version and the framebuffer is in system RAM. + +config FB_SYS_COPYAREA + tristate + depends on FB + help + Include the sys_copyarea function for generic software area copying. + This is used by drivers that don't provide their own (accelerated) + version and the framebuffer is in system RAM. + +config FB_SYS_IMAGEBLIT + tristate + depends on FB + help + Include the sys_imageblit function for generic software image + blitting. This is used by drivers that don't provide their own + (accelerated) version and the framebuffer is in system RAM. + +config FB_PROVIDE_GET_FB_UNMAPPED_AREA + bool + depends on FB + help + Allow generic frame-buffer to provide get_fb_unmapped_area + function to provide shareable character device support on nommu. + +menuconfig FB_FOREIGN_ENDIAN + bool "Framebuffer foreign endianness support" + depends on FB + help + This menu will let you enable support for the framebuffers with + non-native endianness (e.g. Little-Endian framebuffer on a + Big-Endian machine). Most probably you don't have such hardware, + so it's safe to say "n" here. + +choice + prompt "Choice endianness support" + depends on FB_FOREIGN_ENDIAN + +config FB_BOTH_ENDIAN + bool "Support for Big- and Little-Endian framebuffers" + +config FB_BIG_ENDIAN + bool "Support for Big-Endian framebuffers only" + +config FB_LITTLE_ENDIAN + bool "Support for Little-Endian framebuffers only" + +endchoice + +config FB_SYS_FOPS + tristate + depends on FB + +config FB_DEFERRED_IO + bool + depends on FB + +config FB_IO_HELPERS + bool + depends on FB + select FB_CFB_COPYAREA + select FB_CFB_FILLRECT + select FB_CFB_IMAGEBLIT + +config FB_SYS_HELPERS + bool + depends on FB + select FB_SYS_COPYAREA + select FB_SYS_FILLRECT + select FB_SYS_FOPS + select FB_SYS_IMAGEBLIT + +config FB_SYS_HELPERS_DEFERRED + bool + depends on FB + select FB_DEFERRED_IO + select FB_SYS_HELPERS + +config FB_BACKLIGHT + tristate + depends on FB + select BACKLIGHT_CLASS_DEVICE + +config FB_MODE_HELPERS + bool "Enable Video Mode Handling Helpers" + depends on FB + help + This enables functions for handling video modes using the + Generalized Timing Formula and the EDID parser. A few drivers rely + on this feature such as the radeonfb, rivafb, and the i810fb. If + your driver does not take advantage of this feature, choosing Y will + just increase the kernel size by about 5K. + +config FB_TILEBLITTING + bool "Enable Tile Blitting Support" + depends on FB + help + This enables tile blitting. Tile blitting is a drawing technique + where the screen is divided into rectangular sections (tiles), whereas + the standard blitting divides the screen into pixels. Because the + default drawing element is a tile, drawing functions will be passed + parameters in terms of number of tiles instead of number of pixels. + For example, to draw a single character, instead of using bitmaps, + an index to an array of bitmaps will be used. To clear or move a + rectangular section of a screen, the rectangle will be described in + terms of number of tiles in the x- and y-axis. + + This is particularly important to one driver, matroxfb. If + unsure, say N. From patchwork Wed Jul 19 08:15:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 122461 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2293462vqt; Wed, 19 Jul 2023 01:48:48 -0700 (PDT) X-Google-Smtp-Source: APBJJlG77BMRgW66q/1XZ3rD7b6eQ6RuWYn4IlcREiou8uvp0hhP1WTjYBh2ghbffTDfBq9IbeT+ X-Received: by 2002:a17:902:e846:b0:1b5:5aa0:cfd9 with SMTP id t6-20020a170902e84600b001b55aa0cfd9mr2018724plg.48.1689756527962; Wed, 19 Jul 2023 01:48:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689756527; cv=none; d=google.com; s=arc-20160816; b=TKDsXwvkraUUc6N8fZGrl36eO/jamp/kjg1S2I0IkWdEPCksSPcTLV+kzsiOuNrG7b AzgcPZ0u0IN4Ac42IF/O1aBWXF/YTEeOxX6yPgSAsKTfKiGfLg7dzDuJ6Lcz1wxLwilG 7iPxQmZUgDKvkoP4qmhHC+7GJKXgUNBycXNJ1ZXWIkkRR0EphkYaA4Y2e3rRU8e5wD+Y KU9VQjKM9tO7vbm3Lr738pLz/RxsWDUuCDHfypZUpcEwohOWfbx9u/6pxysRjGBPMv7H mMjhX/kFesIdBGNMwc0eYMChMMvwj7t1V7DmZtHZe9vnP762RBPw13sOIaIv+0piDA1R 0Rqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ZeeOgXhUO/vClYx94S4+R9MkQtXVmG+u/hRQc6B/8fg=; fh=dQ6jV4qzznSOFEp31WUQphwACmzyXN/jiKDVNt6xZJw=; b=qyiphvq5rvMPy1lqiBSNeh8sk9veHUpBcO/ln83bst3F68nsQ9Li7RRG/Vd0cMp7yo inXwsQ1P8hvOeF9HYYSfyfV1dR3z2JQ5j3H14OpS6cjNsX2GObyDL1t81fUrwKvTutiw J+ZaO70+GgG/S9JRiHrWMUlrAeNljQi9PPvEqWU6LChFmSbhApXx7aHz9GrZkj18+82u m2skEMANfw0RRIUF79HDOxCOJNJrud0+LrprXUicMetLkqbihkvwNGSeQrTa9Pz6EEz1 2exMO0gOq5zSEtLOKjGws+8R2cowfPSV7DVoFX+w8Q2qg/AdDXP2+kDr3yM/NGlAuW6w ujew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PE1PBtXw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u11-20020a17090341cb00b001b9c992945fsi3145044ple.555.2023.07.19.01.48.35; Wed, 19 Jul 2023 01:48:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PE1PBtXw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230417AbjGSIRC (ORCPT + 99 others); Wed, 19 Jul 2023 04:17:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230297AbjGSIQr (ORCPT ); Wed, 19 Jul 2023 04:16:47 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1CADD172E for ; Wed, 19 Jul 2023 01:16:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689754560; 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=ZeeOgXhUO/vClYx94S4+R9MkQtXVmG+u/hRQc6B/8fg=; b=PE1PBtXw/icKjKrkQyCaiLwpNhEEoWfjzLMbmoKuarjR1e8J/zl+sEeecHgUcAEI54i1Gq Kk9YaU0alx1S6J6apI2cVBSPJ5O1F1mmibMNivqXC6csCAGLQS96CEBTI76QrhE/F4obAb 3hYAgu4o9uTQOmAkTH/TDGy2xSWf1SQ= 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.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-211-eyasQ6boOdOl0GHT-agmmQ-1; Wed, 19 Jul 2023 04:15:58 -0400 X-MC-Unique: eyasQ6boOdOl0GHT-agmmQ-1 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-3143b999f6eso3821345f8f.3 for ; Wed, 19 Jul 2023 01:15:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689754557; x=1690359357; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZeeOgXhUO/vClYx94S4+R9MkQtXVmG+u/hRQc6B/8fg=; b=Qti7L2tluwBnHG5+toLIpxbN2LYOi+/pDbVMPNoB6AvQwabQmO3Gu1j8VRDE3MvkWI /Ee6NP9iNXfAadNjfUb+ceOhkqQPEaxbW6StX4EvHfjJxSwt8iOWyLxuHlkKkNrlhHhv +uXzy6AJtPOgustkm2QOGMsIxBRByJt74/0IgtfTKDNZ5L/v5lLsCzRgdalyaN59stBB saa/ghTL5MTfqBa2VKPI8xezhofCzHg/64/JxiA0upQkyjeMvVdJUgsx+u0RJdRgCb3r 602JdMAhsdCSfpiMTK0+OExsFufuRZPbLe2ZSts1HOAKx232DVBRwTo5cAlMVBu/qMJA NV+g== X-Gm-Message-State: ABy/qLY86Ygrq7u5BYubWz3rIKD081UuemmYaVK44NexqLqcQbDZIz9q ScqQGCvMVS43tqaRlJqiKaBiWt8JyfggixeT2cC833P+yd08eGuZmoIzip1xGw7pboWMlGueDTv JYGAUnVO6iRvG3g/nzJHVXA2XO2I9/qyj4NJ0gKlRzfIyknRKRzs2T6ORwyKQKis/hgVSx9aiiz /qLL+dhNw= X-Received: by 2002:adf:d092:0:b0:314:220d:7 with SMTP id y18-20020adfd092000000b00314220d0007mr3554085wrh.45.1689754557326; Wed, 19 Jul 2023 01:15:57 -0700 (PDT) X-Received: by 2002:adf:d092:0:b0:314:220d:7 with SMTP id y18-20020adfd092000000b00314220d0007mr3554049wrh.45.1689754556937; Wed, 19 Jul 2023 01:15:56 -0700 (PDT) Received: from minerva.home (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id d5-20020a5d5385000000b0031423a8f4f7sm4574354wrv.56.2023.07.19.01.15.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jul 2023 01:15:56 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Thomas Zimmermann , Geert Uytterhoeven , Arnd Bergmann , Javier Martinez Canillas , Andy Shevchenko , Borislav Petkov , Daniel Thompson , Daniel Vetter , Dave Hansen , Greg Kroah-Hartman , "H. Peter Anvin" , Helge Deller , Ingo Molnar , Jingoo Han , Lee Jones , Randy Dunlap , Sam Ravnborg , Thomas Gleixner , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, x86@kernel.org Subject: [PATCH v6 3/4] fbdev: Split frame buffer support in FB and FB_CORE symbols Date: Wed, 19 Jul 2023 10:15:37 +0200 Message-ID: <20230719081544.741051-4-javierm@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230719081544.741051-1-javierm@redhat.com> References: <20230719081544.741051-1-javierm@redhat.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771838140756794873 X-GMAIL-MSGID: 1771838140756794873 Currently the CONFIG_FB option has to be enabled even if no legacy fbdev drivers are needed (e.g: only to have support for framebuffer consoles). The DRM subsystem has a fbdev emulation layer, but depends on CONFIG_FB and so it can only be enabled if that dependency is enabled as well. That means fbdev drivers have to be explicitly disabled if users want to enable CONFIG_FB, only to use fbcon and/or the DRM fbdev emulation layer. This patch introduces a non-visible CONFIG_FB_CORE symbol that could be enabled just to have core support needed for CONFIG_DRM_FBDEV_EMULATION, allowing CONFIG_FB to be disabled (and automatically disabling all the fbdev drivers). Nothing from fb_backlight.o and fbmon.o is used by the DRM fbdev emulation layer so these two objects can be compiled out when CONFIG_FB is disabled. Signed-off-by: Javier Martinez Canillas Reviewed-by: Arnd Bergmann Tested-by: Arnd Bergmann --- Changes in v6: - Fix link error when CONFIG_FB_CORE=y and CONFIG_FB=m (Arnd Bergmann). Changes in v5: - Fix ifdef guard check in drivers/video/backlight/backlight.c (Arnd Bergmann). Changes in v4: - Fix menuconfig hierarchy that was broken in v3 (Arnd Bergmann). Changes in v3: - Really make a hidden symbol by removing the prompt (Arnd Bergmann). - Change FB_CORE to config instead of menuconfig (Arnd Bergmann). - Keep "depends on FB" for FIRMWARE_EDID (Arnd Bergmann). - Compile out fb_backlight.o and fbmon.o that are only needed for FB (Arnd Bergmann). - Make FB_DEVICE to depend on FB_CORE instead of selecting it. Changes in v2: - Keep "depends on FB" for FB_DDC, FB_HECUBA, FB_SVGALIB, FB_MACMODES, FB_BACKLIGHT, FB_MODE_HELPERS and FB_TILEBLITTING (Arnd Bergmann). - Don't change the fb.o object name (Arnd Bergmann). - Make FB_CORE a non-visible Kconfig symbol instead (Thomas Zimmermann). arch/x86/Makefile | 2 +- arch/x86/video/Makefile | 2 +- drivers/video/backlight/backlight.c | 6 +++--- drivers/video/console/Kconfig | 2 +- drivers/video/fbdev/Kconfig | 10 ++++++++-- drivers/video/fbdev/core/Kconfig | 30 ++++++++++++++++------------- drivers/video/fbdev/core/Makefile | 10 ++++++---- 7 files changed, 37 insertions(+), 25 deletions(-) diff --git a/arch/x86/Makefile b/arch/x86/Makefile index b39975977c03..89a02e69be5f 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -259,7 +259,7 @@ drivers-$(CONFIG_PCI) += arch/x86/pci/ # suspend and hibernation support drivers-$(CONFIG_PM) += arch/x86/power/ -drivers-$(CONFIG_FB) += arch/x86/video/ +drivers-$(CONFIG_FB_CORE) += arch/x86/video/ #### # boot loader support. Several targets are kept for legacy purposes diff --git a/arch/x86/video/Makefile b/arch/x86/video/Makefile index 11640c116115..5ebe48752ffc 100644 --- a/arch/x86/video/Makefile +++ b/arch/x86/video/Makefile @@ -1,2 +1,2 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_FB) += fbdev.o +obj-$(CONFIG_FB_CORE) += fbdev.o diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c index 9a885d398c22..86e1cdc8e369 100644 --- a/drivers/video/backlight/backlight.c +++ b/drivers/video/backlight/backlight.c @@ -79,8 +79,8 @@ static const char *const backlight_scale_types[] = { [BACKLIGHT_SCALE_NON_LINEAR] = "non-linear", }; -#if defined(CONFIG_FB) || (defined(CONFIG_FB_MODULE) && \ - defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)) +#if defined(CONFIG_FB_CORE) || (defined(CONFIG_FB_CORE_MODULE) && \ + defined(CONFIG_BACKLIGHT_CLASS_DEVICE_MODULE)) /* * fb_notifier_callback * @@ -155,7 +155,7 @@ static inline int backlight_register_fb(struct backlight_device *bd) static inline void backlight_unregister_fb(struct backlight_device *bd) { } -#endif /* CONFIG_FB */ +#endif /* CONFIG_FB_CORE */ static void backlight_generate_event(struct backlight_device *bd, enum backlight_update_reason reason) diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig index a2a88d42edf0..1b5a319971ed 100644 --- a/drivers/video/console/Kconfig +++ b/drivers/video/console/Kconfig @@ -72,7 +72,7 @@ config DUMMY_CONSOLE_ROWS config FRAMEBUFFER_CONSOLE bool "Framebuffer Console support" - depends on FB && !UML + depends on FB_CORE && !UML select VT_HW_CONSOLE_BINDING select CRC32 select FONT_SUPPORT diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index ed881d5b3ee0..c0b0419e98b6 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -4,9 +4,9 @@ # menuconfig FB - tristate "Support for frame buffer devices" + tristate "Support for frame buffer device drivers" + select FB_CORE select FB_NOTIFY - select VIDEO_CMDLINE help The frame buffer device provides an abstraction for the graphics hardware. It represents the frame buffer of some video hardware and @@ -30,6 +30,12 @@ menuconfig FB for more information. + This enables support for native frame buffer device (fbdev) drivers. + + The DRM subsystem provides support for emulated frame buffer devices + on top of KMS drivers, but this option allows legacy fbdev drivers to + be enabled as well. + Say Y here and to the driver for your graphics board below if you are compiling a kernel for a non-x86 architecture. diff --git a/drivers/video/fbdev/core/Kconfig b/drivers/video/fbdev/core/Kconfig index fd3b7f5b4b7a..528e4dd2199c 100644 --- a/drivers/video/fbdev/core/Kconfig +++ b/drivers/video/fbdev/core/Kconfig @@ -3,6 +3,10 @@ # fbdev core configuration # +config FB_CORE + select VIDEO_CMDLINE + tristate + config FB_NOTIFY bool @@ -23,7 +27,7 @@ config FIRMWARE_EDID config FB_DEVICE bool "Provide legacy /dev/fb* device" - depends on FB + depends on FB_CORE default y help Say Y here if you want the legacy /dev/fb* device file and @@ -39,7 +43,7 @@ config FB_DDC config FB_CFB_FILLRECT tristate - depends on FB + depends on FB_CORE help Include the cfb_fillrect function for generic software rectangle filling. This is used by drivers that don't provide their own @@ -47,7 +51,7 @@ config FB_CFB_FILLRECT config FB_CFB_COPYAREA tristate - depends on FB + depends on FB_CORE help Include the cfb_copyarea function for generic software area copying. This is used by drivers that don't provide their own (accelerated) @@ -55,7 +59,7 @@ config FB_CFB_COPYAREA config FB_CFB_IMAGEBLIT tristate - depends on FB + depends on FB_CORE help Include the cfb_imageblit function for generic software image blitting. This is used by drivers that don't provide their own @@ -63,7 +67,7 @@ config FB_CFB_IMAGEBLIT config FB_CFB_REV_PIXELS_IN_BYTE bool - depends on FB + depends on FB_CORE help Allow generic frame-buffer functions to work on displays with 1, 2 and 4 bits per pixel depths which has opposite order of pixels in @@ -71,7 +75,7 @@ config FB_CFB_REV_PIXELS_IN_BYTE config FB_SYS_FILLRECT tristate - depends on FB + depends on FB_CORE help Include the sys_fillrect function for generic software rectangle filling. This is used by drivers that don't provide their own @@ -79,7 +83,7 @@ config FB_SYS_FILLRECT config FB_SYS_COPYAREA tristate - depends on FB + depends on FB_CORE help Include the sys_copyarea function for generic software area copying. This is used by drivers that don't provide their own (accelerated) @@ -87,7 +91,7 @@ config FB_SYS_COPYAREA config FB_SYS_IMAGEBLIT tristate - depends on FB + depends on FB_CORE help Include the sys_imageblit function for generic software image blitting. This is used by drivers that don't provide their own @@ -126,22 +130,22 @@ endchoice config FB_SYS_FOPS tristate - depends on FB + depends on FB_CORE config FB_DEFERRED_IO bool - depends on FB + depends on FB_CORE config FB_IO_HELPERS bool - depends on FB + depends on FB_CORE select FB_CFB_COPYAREA select FB_CFB_FILLRECT select FB_CFB_IMAGEBLIT config FB_SYS_HELPERS bool - depends on FB + depends on FB_CORE select FB_SYS_COPYAREA select FB_SYS_FILLRECT select FB_SYS_FOPS @@ -149,7 +153,7 @@ config FB_SYS_HELPERS config FB_SYS_HELPERS_DEFERRED bool - depends on FB + depends on FB_CORE select FB_DEFERRED_IO select FB_SYS_HELPERS diff --git a/drivers/video/fbdev/core/Makefile b/drivers/video/fbdev/core/Makefile index 9150bafd9e89..edfde2948e5c 100644 --- a/drivers/video/fbdev/core/Makefile +++ b/drivers/video/fbdev/core/Makefile @@ -1,10 +1,12 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_FB_NOTIFY) += fb_notify.o -obj-$(CONFIG_FB) += fb.o -fb-y := fb_backlight.o \ - fb_info.o \ - fbmem.o fbmon.o fbcmap.o \ +obj-$(CONFIG_FB_CORE) += fb.o +fb-y := fb_info.o \ + fbmem.o fbcmap.o \ modedb.o fbcvt.o fb_cmdline.o fb_io_fops.o +ifdef CONFIG_FB +fb-y += fb_backlight.o fbmon.o +endif fb-$(CONFIG_FB_DEFERRED_IO) += fb_defio.o fb-$(CONFIG_FB_DEVICE) += fb_chrdev.o \ fb_procfs.o \ From patchwork Wed Jul 19 08:15:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 122457 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2291486vqt; Wed, 19 Jul 2023 01:43:32 -0700 (PDT) X-Google-Smtp-Source: APBJJlGa4MgBVvUboBPJ9wtndaaJQ2iKOyDn36E8tl/eKKbLKL2fCSKAPr20Wk5mUHru5OcNQSBt X-Received: by 2002:a17:906:2dd:b0:993:ef26:c6e3 with SMTP id 29-20020a17090602dd00b00993ef26c6e3mr1917525ejk.26.1689756212168; Wed, 19 Jul 2023 01:43:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689756212; cv=none; d=google.com; s=arc-20160816; b=X8PD3HJaoQP4bbsbkWus3bit86eoywV/+4St8CUf4/BQOk+5kxXHe7zDECzWqwJ91h O/aRZIb4U1isVtMSKwvy4mGdjC/LipXexHo8zBH+bf2i289hKhBKNsbNsKHxBvaWJpa8 Qf6ujzfesn2++Q1KQjVjXrjQHCSONq6vwdSmAc54/wfOOvIAVxC0jZKfGL1S2y9H9BFT OUS+kFLRTzWGEJBKYXYSy/oXihz71WJpg9d9PAcrp/nP8jQfFpdhWhXbT7cFpenD1vMl U/FgxYN2Vo5WFumJ3+Kb2rHLm/LioCb+13ZX5iobsE3B0qnzICoTdLgkE+45HcK/KQ3F yaXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=bcU/rlpXrVWc1+sSauJ1JjLJG+mGlwSz84SkWL7yj6M=; fh=Wuo9Ai4cr4THPK5V/OvoOkR7TmhLFGgWe+/KrWl7aQo=; b=AnASjyhVp4adcQp+vFKEaUuWq4oZe0kvM/Ia4Qqrg5nycgiX/lzGD+uEBbVr7+xq// NOYVZZrT1R0o9C9Vg3Dt9/vxfM4cWtcTdjuiB1eayjFjzL9uEUDRTTCMzv30mwsON1GL LhfE7mOh7BcXMj/CMFOSUha2616kNPaRyGUQhtkpksu7sZAfHC5FSPPgCCIUOWezji7Z DN1HLtbIOggiXyt2XRsmVcp4s7n4bmstv7LXlFZ75+0rFfhfS6iSWgUtbgoy8kmZ2qV7 WzRsW3D8gcJcvCj/8Yep059xDtTS10rUooSS91hx/lLosbA3DYhScYlUFyp2uLvYW5SX RZXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=RuhC6Ulh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o20-20020a17090611d400b009952c411261si2568219eja.192.2023.07.19.01.43.06; Wed, 19 Jul 2023 01:43:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=RuhC6Ulh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230400AbjGSIQ6 (ORCPT + 99 others); Wed, 19 Jul 2023 04:16:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55742 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230269AbjGSIQr (ORCPT ); Wed, 19 Jul 2023 04:16:47 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1184199D for ; Wed, 19 Jul 2023 01:16:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689754560; 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=bcU/rlpXrVWc1+sSauJ1JjLJG+mGlwSz84SkWL7yj6M=; b=RuhC6Ulhq6vATitW+k2GZ4MHmSdbxPS4TBd5dKwg1LNlS1B4PQ2Tqh4G70tK/aqNEJOoBF 5wqXf6CRayjXOMgIJ/eQEMKokOD4hnoQJaIH2BLs+aMB/nqYdSKe8M+4Xv6kHXUZvLiDOv AdAHAPChxFc4x0W8qD/R+JPi7q2BVL8= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-463-o8aDADOxPnGndmO5r2i3kA-1; Wed, 19 Jul 2023 04:15:59 -0400 X-MC-Unique: o8aDADOxPnGndmO5r2i3kA-1 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-314326f6e23so3685463f8f.2 for ; Wed, 19 Jul 2023 01:15:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689754558; x=1690359358; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bcU/rlpXrVWc1+sSauJ1JjLJG+mGlwSz84SkWL7yj6M=; b=YrIrERba/CvNkfeaHMnGh4z3ttO+ZooU+Z29SmfcFxJ+sAEASFsvGDgAtpZ7m0lHkg 5NP4H8C6aibSiZhLPy2Po+N+gj7CAW7o8oMjjO801NKL/25CTmX+6pWmYcG6+V7rhd2K ygFATduz7vMbPOhgKIaEIf89i/r2RmpNE8g00vJ+j4TKxNSp2K0NJyVzq7Y/Z2Y5F2ek cW/BhRua/73IUlpwkexXFlA9VOmargbYuTh4vFEdR2QBihGHlnyBf10jxwHiUqu/3KvR LH0n6lZjC/29XPHr9/QhGgad+nwCDL1092ZmVIEiQT+AAH0Fefv/4CX1enmellsbbtsT TSBA== X-Gm-Message-State: ABy/qLbTJm4yYPSMCpmNLdVNimGyZZqDP4jA1GKc7MJ3a0Lhs2X3GKV/ +78VdtAeI1CCeeqHbh2/9VWfaGhyn/SFb3uhBmd/7yiI3KvqLvYQNHbnnEn0rzYxO+wgI57EPs1 DCCryh7uoRblKMZxk422nvjOp564vyo4xPwuLG3zn4hVROTjiGBsgoKbQp5txS/78CLjQdV0TF1 b25U3Fi9Y= X-Received: by 2002:a05:6000:1372:b0:314:12b8:641c with SMTP id q18-20020a056000137200b0031412b8641cmr11957818wrz.70.1689754558441; Wed, 19 Jul 2023 01:15:58 -0700 (PDT) X-Received: by 2002:a05:6000:1372:b0:314:12b8:641c with SMTP id q18-20020a056000137200b0031412b8641cmr11957800wrz.70.1689754558149; Wed, 19 Jul 2023 01:15:58 -0700 (PDT) Received: from minerva.home (205.pool92-176-231.dynamic.orange.es. [92.176.231.205]) by smtp.gmail.com with ESMTPSA id d5-20020a5d5385000000b0031423a8f4f7sm4574354wrv.56.2023.07.19.01.15.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jul 2023 01:15:57 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Thomas Zimmermann , Geert Uytterhoeven , Arnd Bergmann , Javier Martinez Canillas , Daniel Vetter , David Airlie , Maarten Lankhorst , Maxime Ripard , dri-devel@lists.freedesktop.org Subject: [PATCH v6 4/4] drm: Make FB_CORE to be selected if DRM fbdev emulation is enabled Date: Wed, 19 Jul 2023 10:15:38 +0200 Message-ID: <20230719081544.741051-5-javierm@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230719081544.741051-1-javierm@redhat.com> References: <20230719081544.741051-1-javierm@redhat.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771837809549180927 X-GMAIL-MSGID: 1771837809549180927 Now that fbdev core has been split in FB_CORE and FB, make the DRM symbol to select the FB_CORE option if the DRM fbdev emulation layer is enabled. This allows to disable the CONFIG_FB option if is not needed, which will avoid the need to explicitly disable each of the legacy fbdev drivers. Signed-off-by: Javier Martinez Canillas Reviewed-by: Arnd Bergmann Tested-by: Arnd Bergmann --- (no changes since v3) Changes in v3: - Make the DRM symbol to select FB_CORE if DRM_FBDEV_EMULATION is enabled (Arnd Bergmann). - Also make DRM select FB_SYS_HELPERS_DEFERRED if DRM_FBDEV_EMULATION - Make DRM_FBDEV_EMULATION to depend on DRM instead of DRM_KMS_HELPER. Changes in v2: - Make CONFIG_DRM_FBDEV_EMULATION to select FB_CORE (Thomas Zimmermann). drivers/gpu/drm/Kconfig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 22c1ba9ea28c..4f209e5c958c 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -9,6 +9,9 @@ menuconfig DRM tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)" depends on (AGP || AGP=n) && !EMULATED_CMPXCHG && HAS_DMA select DRM_PANEL_ORIENTATION_QUIRKS + select DRM_KMS_HELPER if DRM_FBDEV_EMULATION + select FB_CORE if DRM_FBDEV_EMULATION + select FB_SYS_HELPERS_DEFERRED if DRM_FBDEV_EMULATION select HDMI select I2C select DMA_SHARED_BUFFER @@ -96,7 +99,6 @@ config DRM_KUNIT_TEST config DRM_KMS_HELPER tristate depends on DRM - select FB_SYS_HELPERS_DEFERRED if DRM_FBDEV_EMULATION help CRTC helpers for KMS drivers. @@ -132,8 +134,7 @@ config DRM_DEBUG_MODESET_LOCK config DRM_FBDEV_EMULATION bool "Enable legacy fbdev support for your modesetting driver" - depends on DRM_KMS_HELPER - depends on FB=y || FB=DRM_KMS_HELPER + depends on DRM select FRAMEBUFFER_CONSOLE if !EXPERT select FRAMEBUFFER_CONSOLE_DETECT_PRIMARY if FRAMEBUFFER_CONSOLE default y