OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4c60fac
)
drm/vmwgfx: fix warning if config intel iommu is off.
author
Dave Airlie
<airlied@redhat.com>
Fri, 8 Nov 2013 06:12:42 +0000
(16:12 +1000)
committer
Dave 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
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index
0b5c781
..
ba1f8f1
100644
(file)
--- 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;