Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp9114477pxu; Mon, 28 Dec 2020 07:01:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJwwoowTFiUgXtSsx4O4ZBymd3PdHZKl9PgIEKj3/BB6m3w4gZH3s9VEY9qrYNjJ+WjM/u9N X-Received: by 2002:a17:906:34c3:: with SMTP id h3mr41718166ejb.132.1609167706021; Mon, 28 Dec 2020 07:01:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609167706; cv=none; d=google.com; s=arc-20160816; b=o0c4e5cGW5J9qA2rJx2OZwysEI8pZkFzSnPi3BmEzEOyWPoPSGVWGiv2HfhimZ1Drr 2JTPg8NmVEsk1HgyaNzCZlBXroD/amdrMh6jy2LMm3D/BzQ2InmHVhkVyN8+EG96Uqsj j+1XwNPyJWS4Eiror/HT0aYpolM2ctYbb5kyRBXH0Amp1l8Mk39Wcyj3hj5rHLprTmwb MnOjhunsIiCKrozQbFiIB47u2uFyTUWemjIhHTYgJ7nhQPj1kdJ2VlSNH7aQ10cHBwsZ MVnwf1Q4bSWiJj2VFIhoG8VPD3WmGRIrVvgEe/VcOrBFe158NKYcGlVotOf4fbnjHY1D yyTQ== 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=tJWBkizgbf/9fXb95FiC5KBD2/HPE+xnmG7cg+7xpEmt+TjLYRPhcfIAwBZJlDA/0K 29mYFidSizcaMG5LPvdH3tjXp7efnkrbolvpBU8foMYHO235UUYRrOohLN6j6Yworgld NEk8WEQzN/KROWNjguzNNxuxDncFoWOfLj1EWX5xcxP0GABq8BcWyOIqX+6VmunH6Y7d Qh2PHOfOu41U4IYhM07jufbf/h8rd0t5fBXEC1wdn68ZgUiSYAAKyv9D53rp6zWE6i6V CyaSGg7gCizcjCLci9AzSNZA42yVr4v1msRJkCb46qyanDwvz//cTuRu669YsQm65bXg mr9A== 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 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 j18si22004948edj.99.2020.12.28.07.01.22; Mon, 28 Dec 2020 07:01:46 -0800 (PST) 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=mAWr6iGA; 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 S1732518AbgL1O6t (ORCPT + 99 others); Mon, 28 Dec 2020 09:58:49 -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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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(-) 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 -- 2.27.0