From mboxrd@z Thu Jan 1 00:00:00 1970 From: arnd@arndb.de (Arnd Bergmann) Date: Tue, 19 May 2015 14:53:26 +0200 Subject: [PATCH] drm/nouveau/platform: add IOMMU dependency Message-ID: <2918377.0irYYn09PU@wuerfel> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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") 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Subject: [PATCH] drm/nouveau/platform: add IOMMU dependency Date: Tue, 19 May 2015 14:53:26 +0200 Message-ID: <2918377.0irYYn09PU@wuerfel> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: 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) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: David Airlie Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Ben Skeggs , Thierry Reding , linux-arm-kernel@lists.infradead.org List-Id: dri-devel@lists.freedesktop.org VGhlIHJlY2VudGx5IGFkZGVkIGlvbW11IGNvZGUgaW4gdGhlIG5vdXZlYXUgZHJpdmVyIGZhaWxz IHRvIGJ1aWxkCndoZW4gdGhlIElPTU1VIHN1cHBvcnQgaXMgZGlzYWJsZWQ6Cgpkcml2ZXJzL2dw dS9kcm0vbm91dmVhdS9ub3V2ZWF1X3BsYXRmb3JtLmM6IEluIGZ1bmN0aW9uICdub3V2ZWF1X3Bs YXRmb3JtX3Byb2JlX2lvbW11JzoKZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbm91dmVhdV9wbGF0 Zm9ybS5jOjExMzo0MTogZXJyb3I6ICdjb25zdCBzdHJ1Y3QgaW9tbXVfb3BzJyBoYXMgbm8gbWVt CgpUbyBhdm9pZCB0aGUgYnVpbGQgZXJyb3IsIHRoaXMgbm93IGFkZHMgYW4gZXhwbGljaXQgZGVw ZW5kZW5jeSBvbiB0aGUKSU9NTVUgaW1wbGVtZW50YXRpb24uCgpTaWduZWQtb2ZmLWJ5OiBBcm5k IEJlcmdtYW5uIDxhcm5kQGFybmRiLmRlPgpGaXhlczogNThmZDkzNzVjMmM1ICgiZHJtL25vdXZl YXUvcGxhdGZvcm06IHByb2JlIElPTU1VIGlmIHByZXNlbnQiKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9ub3V2ZWF1L0tjb25maWcgYi9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9LY29u ZmlnCmluZGV4IDVhYjEzZTc5MzlkYi4uMThkZmE0YWY2MGVhIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vbm91dmVhdS9LY29uZmlnCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L0tj b25maWcKQEAgLTI4LDYgKzI4LDcgQEAgY29uZmlnIERSTV9OT1VWRUFVCiBjb25maWcgTk9VVkVB VV9QTEFURk9STV9EUklWRVIKIAlib29sICJOb3V2ZWF1IChOVklESUEpIFNvQyBHUFVzIgogCWRl cGVuZHMgb24gRFJNX05PVVZFQVUgJiYgQVJDSF9URUdSQQorCWRlcGVuZHMgb24gSU9NTVUKIAlk ZWZhdWx0IHkKIAloZWxwCiAJICBTdXBwb3J0IGZvciBOb3V2ZWF1IHBsYXRmb3JtIGRyaXZlciwg dXNlZCBmb3IgU29DIEdQVXMgYXMgZm91bmQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755817AbbESMyI (ORCPT ); Tue, 19 May 2015 08:54:08 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:63632 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754820AbbESMyE (ORCPT ); Tue, 19 May 2015 08:54:04 -0400 From: Arnd Bergmann To: David Airlie Cc: Alexandre Courbot , Ben Skeggs , Thierry Reding , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:YaU7jHGRJVH2HmG93QRcr19zu8pTCAoZaDtoaxWAxEy20AQLL48 /n2Zy1KtFjdUlKlBBj8kcdmc9R2A/Wp29uujuCXK93reJr0ygqpxwXP7nxhF0yicEh0LZRv uO6pWVZrj4bZg4vc+xmH3nhQcwsFpCzVkm3s5/QwybJNHJjpvUlDVVwPdUlyuAqWXft5YEI aYgJ88ZnMkQ286zHi1cdA== X-UI-Out-Filterresults: notjunk:1; Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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") 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