diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-11-08 16:12:42 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-11-08 16:12:42 +1000 |
| commit | 21136946c495b0e1e0f7e25a8de6f170efbdeadf (patch) | |
| tree | ddaf2c1b279d5765aad254f5b205d9ddd5587124 /drivers | |
| parent | 4c60fac111961e7eb71a08928c22b43cff55f1fb (diff) | |
| download | blackbird-op-linux-21136946c495b0e1e0f7e25a8de6f170efbdeadf.tar.gz blackbird-op-linux-21136946c495b0e1e0f7e25a8de6f170efbdeadf.zip | |
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')
| -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) 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; |
