Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'iommu-fixes-v3.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

Pull IOMMU fixes from Joerg Roedel:
"Two small fixes for the Tegra GART IOMMU driver:

- provide a .map_sg function for iommu_ops
- do not register Tegra GART driver as a workaround because of issues
with it when used from DRM code"

* tag 'iommu-fixes-v3.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
iommu/tegra: gart: Provide default ->map_sg() callback
iommu/tegra: gart: Do not register with bus

+2 -1
+2 -1
drivers/iommu/tegra-gart.c
··· 315 315 .attach_dev = gart_iommu_attach_dev, 316 316 .detach_dev = gart_iommu_detach_dev, 317 317 .map = gart_iommu_map, 318 + .map_sg = default_iommu_map_sg, 318 319 .unmap = gart_iommu_unmap, 319 320 .iova_to_phys = gart_iommu_iova_to_phys, 320 321 .pgsize_bitmap = GART_IOMMU_PGSIZES, ··· 396 395 do_gart_setup(gart, NULL); 397 396 398 397 gart_handle = gart; 399 - bus_set_iommu(&platform_bus_type, &gart_iommu_ops); 398 + 400 399 return 0; 401 400 } 402 401