From patchwork Tue May 19 12:53:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 6436851 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 24E529F1C1 for ; Tue, 19 May 2015 12:53:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4D5E820453 for ; Tue, 19 May 2015 12:53:40 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 7C2DB20421 for ; Tue, 19 May 2015 12:53:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CD9D96E289; Tue, 19 May 2015 05:53:35 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.131]) by gabe.freedesktop.org (Postfix) with ESMTP id 973D86E289 for ; Tue, 19 May 2015 05:53:34 -0700 (PDT) Received: from wuerfel.localnet ([149.172.15.242]) by mrelayeu.kundenserver.de (mreue004) with ESMTPSA (Nemesis) id 0LipzN-1ZSfSe2nmv-00czVH; Tue, 19 May 2015 14:53:29 +0200 From: Arnd Bergmann To: David Airlie Subject: [PATCH] drm/nouveau/platform: add IOMMU dependency Date: Tue, 19 May 2015 14:53:26 +0200 Message-ID: <2918377.0irYYn09PU@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:YaU7jHGRJVH2HmG93QRcr19zu8pTCAoZaDtoaxWAxEy20AQLL48 /n2Zy1KtFjdUlKlBBj8kcdmc9R2A/Wp29uujuCXK93reJr0ygqpxwXP7nxhF0yicEh0LZRv uO6pWVZrj4bZg4vc+xmH3nhQcwsFpCzVkm3s5/QwybJNHJjpvUlDVVwPdUlyuAqWXft5YEI aYgJ88ZnMkQ286zHi1cdA== X-UI-Out-Filterresults: notjunk:1; Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Ben Skeggs , Thierry Reding , linux-arm-kernel@lists.infradead.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The recently added iommu code in the nouveau driver fails to build when the IOMMU support is disabled: drivers/gpu/drm/nouveau/nouveau_platform.c: In function 'nouveau_platform_probe_iommu': drivers/gpu/drm/nouveau/nouveau_platform.c:113:41: error: 'const struct iommu_ops' has no mem To avoid the build error, this now adds an explicit dependency on the IOMMU implementation. Signed-off-by: Arnd Bergmann Fixes: 58fd9375c2c5 ("drm/nouveau/platform: probe IOMMU if present") Acked-by: Thierry Reding diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig index 5ab13e7939db..18dfa4af60ea 100644 --- a/drivers/gpu/drm/nouveau/Kconfig +++ b/drivers/gpu/drm/nouveau/Kconfig @@ -28,6 +28,7 @@ config DRM_NOUVEAU config NOUVEAU_PLATFORM_DRIVER bool "Nouveau (NVIDIA) SoC GPUs" depends on DRM_NOUVEAU && ARCH_TEGRA + depends on IOMMU default y help Support for Nouveau platform driver, used for SoC GPUs as found