From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966692AbdAKNfB (ORCPT ); Wed, 11 Jan 2017 08:35:01 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:64421 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966666AbdAKNe7 (ORCPT ); Wed, 11 Jan 2017 08:34:59 -0500 From: Arnd Bergmann To: Daniel Vetter Cc: Benjamin Gaignard , Arnd Bergmann , Russell King , David Airlie , Lucas Stach , Christian Gmeiner , Rob Clark , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, etnaviv@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org Subject: [PATCH 2/2] drm: add more MMU dependencies Date: Wed, 11 Jan 2017 14:33:35 +0100 Message-Id: <20170111133357.3664191-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170111133357.3664191-1-arnd@arndb.de> References: <20170111133357.3664191-1-arnd@arndb.de> X-Provags-ID: V03:K0:r68fkm9BywjT9mX4NDbTJlJzJXd1C7lHG9A5kyHNX+EH3hh/TAS JfoUUWlOBRDPhJU8A6NVBdYLXCYgmMSwNN+dAgiaCwMz8XBjs+tH7p5a0RTXSu++V9JT0Jv LQBwSUzsBKzZnPR6pRYrn8IRcZmJVCVNfsmmALgSjjzo7T7fFA2EFvjJov9oXHEK2v7yGc5 8W9HArLyqUl+lM9BVxv+Q== X-UI-Out-Filterresults: notjunk:1;V01:K0:1XlgAT2zt2k=:rxX2YwZeY/fNmDJbbECf3G JnQPQWtBAvp+bvVwqUSVBqC8L6IhWvHd11aAVEb3PGZ38CiRoThJpQ5Po6q3Gp24Dv9frrRuy paPJnWrozE2/U3+cQV1+T1FMp3+4D9/2sgXjucitUsRWhSZgok6GShM0LnzIwfuWKCFxifuVW +Ud1Hoinsn/YlPROaIdvqEYnlyoioZMYaIFCaus2/aGVGt+Bd23lTomZtv+VdmXOZ4pa15Pp8 W3ym/fYYKmWgOtysxSPLXJfKmhRX0vICXNBdNA/v4jjxwz5YWX4TnNVAehRs6vtFx6ot0p9cR FBJHg+Ml/KjZmIunEq2rzp2BvPSruhMIA1qtpEzoWgHKuNNAtlMO3HS+DaNYHvcy/8v58YWRN HuIr7vgQtrPdmRUIQJtTe42Jx9OsAXiax+QgcgWsPmn9xReoEaAaVCKwDS23VgFOadnz0mp8J aCyC9xN3myJ24oxShrqs61zfTjiv0ta7M9hLzH0Q6Xqe9Wp0/ZCgS1vw3iRWhLj/mH0X+3hBU 1a8mrkMCBSs82r9LswP/UmwrRbpbgYr7c9OUKiw7UdcPJ62PvGLOuR/O79nBVZRwjrPMHk9HD td5V3eYL5vGW+yoxRXH0DkKgFLnmrMuYwKs3Hb8gfCdLvaMfqf3wLPQb05uFe/x5yPLenH4yK 041fMaWZ8+3jHxkpBQiVB1M7X772zStZ6/NnyJ+BnyOs/mLV4/9cembtHloJHnvBU6O4= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Many DRM drivers only work with an MMU, and after the patch to enable core DRM support without MMU, we already had one fixup for many of them. The etnaviv, armada and msm drivers were missed and have the same problem: warning: (DRM_ETNAVIV) selects IOMMU_SUPPORT which has unmet direct dependencies (MMU) warning: (DRM_I915 && DRM_MSM && DRM_ETNAVIV) selects SHMEM which has unmet direct dependencies (MMU) drivers/gpu/drm/armada/armada_gem.o: In function `armada_gem_vm_fault': armada_gem.c:(.text.armada_gem_vm_fault+0x14): undefined reference to `vm_insert_pfn' arch/arm/mm/dma-mapping.c: In function '__iommu_alloc_remap': arch/arm/mm/dma-mapping.c:1390:4: error: 'VM_ARM_DMA_CONSISTENT' undeclared (first use in this function) arch/arm/mm/dma-mapping.c:1456:31: error: 'atomic_pool' undeclared (first use in this function); did you mean 'atomic_xor'? Fixes: 011cda589938 ("drm: fix compilations issues introduced by "drm: allow to use mmuless SoC"") Fixes: 62a0d98a188c ("drm: allow to use mmuless SoC") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/armada/Kconfig | 2 +- drivers/gpu/drm/etnaviv/Kconfig | 1 + drivers/gpu/drm/msm/Kconfig | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/armada/Kconfig b/drivers/gpu/drm/armada/Kconfig index 15f3ecfb16f1..eafaeeb7b5b1 100644 --- a/drivers/gpu/drm/armada/Kconfig +++ b/drivers/gpu/drm/armada/Kconfig @@ -1,6 +1,6 @@ config DRM_ARMADA tristate "DRM support for Marvell Armada SoCs" - depends on DRM && HAVE_CLK && ARM + depends on DRM && HAVE_CLK && ARM && MMU select DRM_KMS_HELPER help Support the "LCD" controllers found on the Marvell Armada 510 diff --git a/drivers/gpu/drm/etnaviv/Kconfig b/drivers/gpu/drm/etnaviv/Kconfig index 2cde7a5442fb..656c061b439d 100644 --- a/drivers/gpu/drm/etnaviv/Kconfig +++ b/drivers/gpu/drm/etnaviv/Kconfig @@ -3,6 +3,7 @@ config DRM_ETNAVIV tristate "ETNAVIV (DRM support for Vivante GPU IP cores)" depends on DRM depends on ARCH_MXC || ARCH_DOVE + depends on MMU select SHMEM select TMPFS select IOMMU_API diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig index d96b2b6898a3..7f78da695dff 100644 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig @@ -4,6 +4,7 @@ config DRM_MSM depends on DRM depends on ARCH_QCOM || (ARM && COMPILE_TEST) depends on OF && COMMON_CLK + depends on MMU select REGULATOR select DRM_KMS_HELPER select DRM_PANEL -- 2.9.0