From: Dave Airlie <airlied@redhat.com>
Date: Fri, 8 Nov 2013 06:12:42 +0000 (+1000)
Subject: drm/vmwgfx: fix warning if config intel iommu is off.
X-Git-Tag: v3.13-rc1~69^2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=21136946c495b0e1e0f7e25a8de6f170efbdeadf;p=platform%2Fkernel%2Flinux-exynos.git

drm/vmwgfx: fix warning if config intel iommu is off.

Though I'm not really happy with how ugly this code is now.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 0b5c781..ba1f8f1 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -482,7 +482,9 @@ static int vmw_dma_select_mode(struct vmw_private *dev_priv)
 		dev_priv->map_mode = vmw_dma_map_populate;
 #endif
 
+#ifdef CONFIG_INTEL_IOMMU
 out_fixup:
+#endif
 	if (dev_priv->map_mode == vmw_dma_map_populate &&
 	    vmw_restrict_iommu)
 		dev_priv->map_mode = vmw_dma_map_bind;