Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp2829351pxv; Mon, 12 Jul 2021 02:59:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxCTkW18SFyNims0EbpCf9HYrsdWpgpLYxkDD2IbWvMtdTul/ZbSCaMHn5FE5hEOHpWO0al X-Received: by 2002:a05:6e02:219a:: with SMTP id j26mr37500008ila.272.1626083980433; Mon, 12 Jul 2021 02:59:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626083980; cv=none; d=google.com; s=arc-20160816; b=cq4jsc+oKDp9z13WmIkzqieA+4+Ol/eL691j06468LHL7rtQkf+DZANHkLi8bQEI12 6QCFrmMzJQXTU6ma+I/h1J/FcgLKcp5H/jDqeauLIFdfzuyyhVo4voyXsbBT52uSM4bC 23P6KOcUosJ8B6jpbZhlQzWLohJcnfoGkVSNNhLSmbvvZFEHyE47eiZIzdU3nZT+H8jU rPhKtqrpUtIK83XsEQ/qNhMqiOn8Kei8vbo1FBCf2zB9nxOVeCu4q1a4GYLdVYVMg1U+ PemPu1sYRwHV0TSQYppeR8c2CB3GFQePNX0UOUAiv2Bi25hFxaAgvWhOEh6pRvObWeh/ 8qgQ== 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=aWyFTlev6gWRUfu2tZXbVHQeXfmy7eaYgBjGulcS/0U=; b=Ri5QZuIzfgRu3Wy2r1vAHCy5GinxQ1HlQk1/OBkKGQodivZPE67ZBCuBVFk5h5ZX6d uho+AvNMLTBZbbIEsg+nqp0pvS4Q6P8v9yyR763HhrlmLzb5p2zuQD3zqYLYrQhRwMbN L2h5ap5n0XSm0iFnDuoRK6vKSxgosNjacJ+bfezndXrC4yTVqAVZ4RNDCkZYw85yScTI sY6ZCcuCJrgmciqQXk1RTUXaxLQNDW7d/Y6e/yDXNLkrQK982bj431Eb2LANM26p/15i O8bSU+pQfrU8nWf8nP3qteOa4fKX6zS7bGG2kE9ZKUgV8f78+RnLr48XKCATDA78FxfS Ue0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NwNh9FuU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.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 vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n2si18599276jaj.36.2021.07.12.02.59.16; Mon, 12 Jul 2021 02:59:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NwNh9FuU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.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: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242647AbhGLHBZ (ORCPT + 99 others); Mon, 12 Jul 2021 03:01:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:41504 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239162AbhGLGou (ORCPT ); Mon, 12 Jul 2021 02:44:50 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 15BDD611CB; Mon, 12 Jul 2021 06:40:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626072060; bh=P5gMv8qj0JDbjGY/7Cjvl9fM5F0K85Pxyv3XwwRD7qA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NwNh9FuUd/2fLNyWxGLSdeUK3jD97+s8Subwg1FuAL5rwS2dU6l+hamNWEuez07Wm sXDAxZ6b/TzlIpIVO6DczadpX4/cHpGS//3idVK690jUYLhmkLIRJqHHMwkHf1E1f1 RqtUDhY+86SBXCmd+QWjytSHqWxpcJi7k4k4GqF8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kees Cook , Linus Walleij , Rob Herring , Sasha Levin Subject: [PATCH 5.10 335/593] drm/pl111: Actually fix CONFIG_VEXPRESS_CONFIG depends Date: Mon, 12 Jul 2021 08:08:15 +0200 Message-Id: <20210712060922.759596523@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060843.180606720@linuxfoundation.org> References: <20210712060843.180606720@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: Kees Cook [ Upstream commit 4e566003571244f508408f59ce78f6ac2ccdba8e ] VEXPRESS_CONFIG needs to either be missing, built-in, or modular when pl111 is modular. Update the Kconfig to reflect the need. Fixes: 4dc7c97d04dc ("drm/pl111: depend on CONFIG_VEXPRESS_CONFIG") Signed-off-by: Kees Cook Reviewed-by: Linus Walleij Acked-by: Rob Herring Signed-off-by: Linus Walleij Link: https://patchwork.freedesktop.org/patch/msgid/20210604014055.4060521-1-keescook@chromium.org Signed-off-by: Sasha Levin --- drivers/gpu/drm/pl111/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/pl111/Kconfig b/drivers/gpu/drm/pl111/Kconfig index c5210a5bef1b..3aae387a96af 100644 --- a/drivers/gpu/drm/pl111/Kconfig +++ b/drivers/gpu/drm/pl111/Kconfig @@ -2,7 +2,8 @@ config DRM_PL111 tristate "DRM Support for PL111 CLCD Controller" depends on DRM - depends on VEXPRESS_CONFIG + depends on ARM || ARM64 || COMPILE_TEST + depends on VEXPRESS_CONFIG || VEXPRESS_CONFIG=n depends on COMMON_CLK select DRM_KMS_HELPER select DRM_KMS_CMA_HELPER -- 2.30.2