drm/vmwgfx: fix warning if config intel iommu is off.
authorDave Airlie <airlied@redhat.com>
Fri, 8 Nov 2013 06:12:42 +0000 (16:12 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 8 Nov 2013 06:12:42 +0000 (16:12 +1000)
Though I'm not really happy with how ugly this code is now.

Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

index 0b5c7818ebfb305dc2086d9960db88f78da67f99..ba1f8f1c6d5d23f37e801503e5337d37ef71094c 100644 (file)
@@ -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;