[PATCH 2/4] drm/vmwgfx: remove CONFIG_INTEL_IOMMU ifdefs

intel_iommu_enabled is defined as always false for !CONFIG_INTEL_IOMMU, so remove the ifdefs around it. Signed-off-by: Christoph Hellwig --- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 18 -- 1 file changed, 18 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

[PATCH 1/4] drm/vmwgfx: remove CONFIG_X86 ifdefs

The driver depends on CONFIG_X86 so these are dead code. Signed-off-by: Christoph Hellwig --- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 6 -- 1 file changed, 6 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index 25afb1d594e3..69e325b2d954

[PATCH 3/4] drm/vmwgfx: fix the check when to use dma_alloc_coherent

Since Linux 4.21 we merged the swiotlb ops into the DMA direct ops, so they would always have a the sync_single methods. But late in the cicle we also removed the direct ops entirely, so we'd see NULL DMA ops. Switch vmw_dma_select_mode to only detect swiotlb presence using swiotlb_nr_tbl()

fix DMA ops layering violations in vmwgfx

Hi Thomas, vmwgfx has been doing some odd checks based on DMA ops which rely on deep DMA mapping layer internals, and I think the changes in Linux 4.21 finally broke most of these implicit assumptions. The real fix is in patch 3, but I think the others are important to make it clear what is

[PATCH 4/4] drm/vmwgfx: unwind spaghetti code in vmw_dma_select_mode

Just use a simple if/else chain to select the DMA mode. Signed-off-by: Christoph Hellwig --- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 25 ++--- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

Re: use generic DMA mapping code in powerpc V4

Next step: c446404b041130fbd9d1772d184f24715cf2362f (powerpc/dma: remove dma_nommu_mmap_coherent) git clone git://git.infradead.org/users/hch/misc.git -b powerpc-dma.6 a git checkout c446404b041130fbd9d1772d184f24715cf2362f Output: Note: checking out