Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp962754pxb; Wed, 6 Apr 2022 05:26:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyvI6CXSlxJ9XsSCmX65BoUTgVcd1s5AQGAawYmXnWEWdxXfnES5fgIyaJFccnmDogUQapd X-Received: by 2002:a63:f306:0:b0:399:1594:9eff with SMTP id l6-20020a63f306000000b0039915949effmr6858224pgh.478.1649247982106; Wed, 06 Apr 2022 05:26:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649247982; cv=none; d=google.com; s=arc-20160816; b=kcAi2UzNxp0jCH94zg5wtT9/ls5bGFmzwEA+dr8Dc9ilT5qM2jqFJhT0rwiU467Eh/ MBmBCvg82EqmIzhu4f+tlaPbE+JKrCxA6O1YQKDexivmms3RFpHIzgW8t0Q0vw12/M5g rS/9kBl8rQf4nnvyztILyXt8O4K7dhABIo71KqXWtEMe6HDpng15dLS37Upi+fMay1pC 3IIlCvbQW4sdOLaiexXzC8HN0dK/EYduc88U5L5kMHhIpsoks8vkMRB5kdoZRxeJCWmo c/rgv2YK31EhgWCmAicAHDUmXN8NKmVKb3y5n8gVGHmLShIyH1N7llvILV8ACsgcFa0z N3DQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=T/hZQaiX0XsPalL6broQJqueVe0CQG5dNTzKcyFwkFs=; b=vYoOAVTwRJ6yD9hEuwEwM/boKmrdLSCu1HFhY4MV9j2dj02tyVmVkGZvbJ5NXLaN8e 9mpnuU51QKCCEJbhlGJrUJv7VYY7iiEFBaYRm6jLArXxp34dwzR1kip/ZsF/xpGFX1tp R8uyi7yYP6IEyfjY/3oT1DfEMJaNEZzWBtyjNGI5xRlqJfEAniE+ozJJhiWLMd3IVSlj vYtP7xaLmZbIsx9n/3eAk5PVx4A35a9HP40Zh6hZNF8kO80ZJKUL/cPWW7s4EKFcJr0n /SBhUBooHIJ+D5szGU8OxYy2g5sjh73bM+BVNBE6eRQKNJfJ3yL20vlnVjqLBcMuSUL5 9T+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=y2iBKoys; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id j21-20020aa79295000000b004fa3a8e007esi14249426pfa.309.2022.04.06.05.26.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 05:26:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=y2iBKoys; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 247416E7D3B; Wed, 6 Apr 2022 04:36:30 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1578566AbiDEXYF (ORCPT + 99 others); Tue, 5 Apr 2022 19:24:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39510 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348903AbiDEJsp (ORCPT ); Tue, 5 Apr 2022 05:48:45 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0C96A2056; Tue, 5 Apr 2022 02:37:11 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 40408615E5; Tue, 5 Apr 2022 09:37:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4FFF2C385A3; Tue, 5 Apr 2022 09:37:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649151430; bh=nfzYUEHmVjBI8/t16EA5oHKdr/xnKdTbSxXCL6KLiZk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y2iBKoys3mD+DywKm/l7/QM6wv5Ea60nbTqmFNkSs36+06nt5XoJAzyNfIxkTmTkz 7txXhRBYt3sRKnQVKkA/dbn3rC4SIH2tml7TyuTo3HwsEzwxBdMwCO3z6MI0LyBTdW f2V22Mo/lccz7ZR2sxhbKo8pfvxQWlfV4Wu7lVoI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andre Przywara , Arnd Bergmann , Sasha Levin Subject: [PATCH 5.15 373/913] ARM: configs: multi_v5_defconfig: re-enable DRM_PANEL and FB_xxx Date: Tue, 5 Apr 2022 09:23:55 +0200 Message-Id: <20220405070351.027713984@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070339.801210740@linuxfoundation.org> References: <20220405070339.801210740@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no 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 From: Andre Przywara [ Upstream commit 9c44d0805f949c56121b4ae6949fb064537bf198 ] Commit 91185d55b32e ("drm: Remove DRM_KMS_FB_HELPER Kconfig option") led to de-selection of CONFIG_FB, which was a prerequisite for BACKLIGHT_CLASS_DEVICE, which CONFIG_DRM_PANEL_SIMPLE depended on. Explicitly set CONFIG_FB, to bring DRM_PANEL_SIMPLE, DRM_PANEL_EDP, FB_IMX and FB_ATMEL back into the generated .config. This also adds some new FB related features like fonts and the framebuffer console. See also commit 8c1768967e27 ("ARM: config: mutli v7: Reenable FB dependency"), which solved the same problem for multi_v7_defconfig. This relies on [1], to fix a broken Kconfig dependency. [1] https://lore.kernel.org/dri-devel/20220315084559.23510-1-tzimmermann@suse.de/raw Fixes: 91185d55b32e ("drm: Remove DRM_KMS_FB_HELPER Kconfig option") Signed-off-by: Andre Przywara Link: https://lore.kernel.org/r/20220317183043.948432-4-andre.przywara@arm.com' Signed-off-by: Arnd Bergmann Signed-off-by: Sasha Levin --- arch/arm/configs/multi_v5_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig index 6f789e8483c9..e883cb6dc645 100644 --- a/arch/arm/configs/multi_v5_defconfig +++ b/arch/arm/configs/multi_v5_defconfig @@ -196,6 +196,7 @@ CONFIG_DRM=y CONFIG_DRM_ATMEL_HLCDC=m CONFIG_DRM_PANEL_SIMPLE=y CONFIG_DRM_ASPEED_GFX=m +CONFIG_FB=y CONFIG_FB_IMX=y CONFIG_FB_ATMEL=y CONFIG_BACKLIGHT_ATMEL_LCDC=y -- 2.34.1