From patchwork Mon Dec 28 12:45:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 352695 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp9807117jai; Mon, 28 Dec 2020 06:59:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJz+MIXY8zc3B4pf+qTJPUw60oEUMbmlbwYo6jBm68GlL6YCKiefnarP9vIqt2VUixs3bef/ X-Received: by 2002:a17:906:6d47:: with SMTP id a7mr42790721ejt.340.1609167542681; Mon, 28 Dec 2020 06:59:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609167542; cv=none; d=google.com; s=arc-20160816; b=I6ShJm/6eo1SWBqfoe6IdLrt06M4qC1dAmP50FTWI96mF8kPgvIJmFU1c5S9m5Fm1G Voap9mbAcVHomhnrz0H6jczhwSiAbCS7Jb4ispz6jYF33wW9m5H5VNSwMBT2Qo6abwMM kfrRxGZ1rslZlukyb7kWeIYy29KQB+X4IhbI5T52QaBwFbmKG8RyUKEFwTGj66QVoDi0 36cPT5UkSzHB1+zUBQvb+o2cdMvcRhG3sDxmf9B8kl2I1BqtolRJ+CSs9AAAOIFGcIrl w4FcQWHq1dy09/VjP8hZ7P13uuow4wy9XUMDVBz88TRWAZcyUFabCT4l2jnhuzlt/aUW cJjQ== 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=Zk7pDcGCG+2YWdvd4ekCrwx1Kj7QWl/ppOOK1t44eYw=; b=UDROHPALlB5VMNrxD59B8J5ehMAfWpwydzdob/3hgKr1TgmoHRwk+qRInz/bVzqQPJ +gX6MswN+bdQ/FwuIqpPhwI5rghfHwsdaKyPrmLPYr4OlH+gzq+FYp2K1gs+b6pI564A W+aq0A1BAiRr+nwQ5jBycI925b3Ygo4fEr4Cg5PV1FcPXXnbsEdp4WPMtwuTGTSd/JfW B5BoC16x2dFxk7UHRmBU477/ee1zljVYcPFVE1gOR5z+tUfOQ1pWxU3nNeiKGyxB/pJG BDZmWg9ZhcvNT9n72cL/HEpNUllTkhJ4YGymooFr6+ahKrvXzqzALix1Eyke/frDbPe5 fEKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=mAWr6iGA; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 m6si19388054edr.532.2020.12.28.06.59.02; Mon, 28 Dec 2020 06:59:02 -0800 (PST) Received-SPF: pass (google.com: domain of stable-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=mAWr6iGA; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 S2389882AbgL1O6q (ORCPT + 14 others); Mon, 28 Dec 2020 09:58:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:49580 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2440484AbgL1OOq (ORCPT ); Mon, 28 Dec 2020 09:14:46 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 484872063A; Mon, 28 Dec 2020 14:14:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1609164845; bh=pQKWXOZ5V9CeMrt1ZTHykB/khVq3Jm9H8wkFfRqg76o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mAWr6iGAPb4cA20Qa38fwgh/2G3rpXaB3ou62qY919PB5ETuWs5TxEg1vS8ZcKC0a WLxiwJj2h0H++a0alKkdE5iacDhlzZZarD7gA+b0vtjoPh9vHtbq5j995HX9+y9M2s FdYaML8YvNPtN+RncooSn0GFAGZA0tqsYycmRskU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Rob Clark , Sasha Levin Subject: [PATCH 5.10 320/717] drm/msm: add IOMMU_SUPPORT dependency Date: Mon, 28 Dec 2020 13:45:18 +0100 Message-Id: <20201228125036.367073525@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228125020.963311703@linuxfoundation.org> References: <20201228125020.963311703@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit e319a1b956f785f618611857cd946dca2bb68542 ] The iommu pgtable support is only available when IOMMU support is built into the kernel: WARNING: unmet direct dependencies detected for IOMMU_IO_PGTABLE Depends on [n]: IOMMU_SUPPORT [=n] Selected by [y]: - DRM_MSM [=y] && HAS_IOMEM [=y] && DRM [=y] && (ARCH_QCOM [=y] || SOC_IMX5 || ARM && COMPILE_TEST [=y]) && OF [=y] && COMMON_CLK [=y] && MMU [=y] && (QCOM_OCMEM [=y] || QCOM_OCMEM [=y]=n) Fix the dependency accordingly. There is no need for depending on CONFIG_MMU any more, as that is implied by the iommu support. Fixes: b145c6e65eb0 ("drm/msm: Add support to create a local pagetable") Signed-off-by: Arnd Bergmann Signed-off-by: Rob Clark Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.27.0 diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig index e5816b4984942..dabb4a1ccdcf7 100644 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig @@ -4,8 +4,8 @@ config DRM_MSM tristate "MSM DRM" depends on DRM depends on ARCH_QCOM || SOC_IMX5 || (ARM && COMPILE_TEST) + depends on IOMMU_SUPPORT depends on OF && COMMON_CLK - depends on MMU depends on QCOM_OCMEM || QCOM_OCMEM=n select IOMMU_IO_PGTABLE select QCOM_MDT_LOADER if ARCH_QCOM