diff options
author | Dave Airlie <airlied@redhat.com> | 2013-11-08 01:12:42 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-11-08 01:12:42 -0500 |
commit | 21136946c495b0e1e0f7e25a8de6f170efbdeadf (patch) | |
tree | ddaf2c1b279d5765aad254f5b205d9ddd5587124 /drivers/gpu | |
parent | 4c60fac111961e7eb71a08928c22b43cff55f1fb (diff) |
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>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index 0b5c7818ebfb..ba1f8f1c6d5d 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) | |||
482 | dev_priv->map_mode = vmw_dma_map_populate; | 482 | dev_priv->map_mode = vmw_dma_map_populate; |
483 | #endif | 483 | #endif |
484 | 484 | ||
485 | #ifdef CONFIG_INTEL_IOMMU | ||
485 | out_fixup: | 486 | out_fixup: |
487 | #endif | ||
486 | if (dev_priv->map_mode == vmw_dma_map_populate && | 488 | if (dev_priv->map_mode == vmw_dma_map_populate && |
487 | vmw_restrict_iommu) | 489 | vmw_restrict_iommu) |
488 | dev_priv->map_mode = vmw_dma_map_bind; | 490 | dev_priv->map_mode = vmw_dma_map_bind; |