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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04E41C433EF for ; Fri, 19 Nov 2021 17:40:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E48F66120F for ; Fri, 19 Nov 2021 17:40:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237220AbhKSRnI (ORCPT ); Fri, 19 Nov 2021 12:43:08 -0500 Received: from mail.kernel.org ([198.145.29.99]:44938 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237153AbhKSRm4 (ORCPT ); Fri, 19 Nov 2021 12:42:56 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 03234611F2; Fri, 19 Nov 2021 17:39:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1637343594; bh=eIoi5cb2uZ1SjAlT+hsn1si6Fb8c/lJZZRrAwsiuqmA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q9QRxKnUwg7UFXcz7sd5KoHvc7jNi5TeI+GYJlSJaU90XuiGxZkU5D9CHupMxpQ0W 0VLXjPcM5c6ydPHBjwURKgBejgb1ArhDh/7hQCde6TJDNvJEccz1kyMJVw3S9Q/XYu +rBOfTu0AcuhnVWDLJLs/6dQWqcD/vzd28Lp7px0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jiri Slaby , Jani Nikula , Javier Martinez Canillas , Arnd Bergmann , Kees Cook , Daniel Vetter , Sasha Levin Subject: [PATCH 5.15 02/20] Revert "drm: fb_helper: improve CONFIG_FB dependency" Date: Fri, 19 Nov 2021 18:39:20 +0100 Message-Id: <20211119171444.717200425@linuxfoundation.org> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211119171444.640508836@linuxfoundation.org> References: <20211119171444.640508836@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Greg Kroah-Hartman This reverts commit 94e18f5a5dd1b5e3b89c665fc5ff780858b1c9f6 which is commit 9d6366e743f37d36ef69347924ead7bcc596076e upstream. It causes some build problems as reported by Jiri. Link: https://lore.kernel.org/r/9fdb2bf1-de52-1b9d-4783-c61ce39e8f51@kernel.org Reported-by: Jiri Slaby Cc: Jani Nikula Cc: Javier Martinez Canillas Cc: Arnd Bergmann Cc: Kees Cook Cc: Daniel Vetter Cc: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/Kconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -102,8 +102,9 @@ config DRM_DEBUG_DP_MST_TOPOLOGY_REFS 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 + depends on FB=y || FB=DRM + select DRM_KMS_HELPER select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT