Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp2836237pxv; Mon, 12 Jul 2021 03:08:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyTB5jVy+3hL8hGMmQ9VWikkH+QRLcvus92fe23li53eXGo32bxCejNOutVshoME3/2/E2V X-Received: by 2002:a5d:91cc:: with SMTP id k12mr38898606ior.103.1626084524060; Mon, 12 Jul 2021 03:08:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626084524; cv=none; d=google.com; s=arc-20160816; b=ZitqZzq7VUGIvijx5PrFUZDIiyPjt1yuSkCAGs3Fx9+fcqb2o4ZlHT7n0UOOh9j1Eu U26tk6UJjeTusCq3htgdY10P7uyKpkPnE5bggLogWhzsJWsZZdqpjJ8fS85dTxjCwbk2 OLmp26II2AcaNddGswSUiGHLCAsxSXosbgXqoue9MrBw4Z3naGWD9J0lzqDfwyfne49q /ktGehu61Bn77ZiHLdszfPNWJSFJM7p1Hvo6SZ7Kmj0CRHH5GXKhczbJeN9ZjN9hsSvw MJ0fpHRNTyBThdpduTv7WYluKbvsQT8gDRcSu0InC1HVJQwOX9FLOBWsn6RQEz1arj4E SwNw== 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=pTHswMlQhp312U+z3fzmATkGa2vnK5NUrSxulbYVtl2JohhdwjBuUjTQ/QIiqkscKa MdbvJIlTI5tUXQkW/7FsYum9qPh5/+/lXxXeBp8o/VaF8A18YGNu/pmlik8Eqau6jagh xryPVh4WoPHuMqYkQeAY7ON2n0O3POpqrlSQg6fQz6f6C9UgPLgFqQ3Wk889CGlYc5be jIm+tr9qx+AezDnddbZOB0MTsnEPhj3RCXTa0kenjjzdWfTjc4N2Z2BYFoLhBZUSiRIc 9C2MERK48o9QGh++AMdz/dHjV1pxMgKySPyaC2bsD9YYLuhsETsdUBBacL/JrP+uAeVD tW8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=2lQi7rT6; 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 o3si5805104ilc.27.2021.07.12.03.08.32; Mon, 12 Jul 2021 03:08:44 -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=2lQi7rT6; 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 S1349223AbhGLHuI (ORCPT + 99 others); Mon, 12 Jul 2021 03:50:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:49166 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243517AbhGLHPt (ORCPT ); Mon, 12 Jul 2021 03:15:49 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A22876143A; Mon, 12 Jul 2021 07:12:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626073948; bh=P5gMv8qj0JDbjGY/7Cjvl9fM5F0K85Pxyv3XwwRD7qA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2lQi7rT6Qi8mh1Jo+c9OhWFgcwBsoffIHKDVMXxsDzp6R+X0G59djudZlQnOe8vHe PPlfX6A/zXaFFdQXaHWkFTWahexa0hlPXlwhLD5NKCK57wCqee+jbsRVEetIX4TOq0 AGkNAhgRD/yKXCN/TI9T05LYwVqumAcK5s7RedUY= 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.12 396/700] drm/pl111: Actually fix CONFIG_VEXPRESS_CONFIG depends Date: Mon, 12 Jul 2021 08:07:59 +0200 Message-Id: <20210712061018.524520177@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060924.797321836@linuxfoundation.org> References: <20210712060924.797321836@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