Commit f3a34041 authored Jan 30, 2015 by Linus Torvalds

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

parents c6591c81 35577079

drivers/iommu/tegra-gart.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -315,6 +315,7 @@ static const struct iommu_ops gart_iommu_ops = {
		.attach_dev = gart_iommu_attach_dev,
		.detach_dev = gart_iommu_detach_dev,
		.map = gart_iommu_map,
		.map_sg = default_iommu_map_sg,
		.unmap = gart_iommu_unmap,
		.iova_to_phys = gart_iommu_iova_to_phys,
		.pgsize_bitmap = GART_IOMMU_PGSIZES,
		@@ -395,7 +396,7 @@ static int tegra_gart_probe(struct platform_device *pdev)
		do_gart_setup(gart, NULL);

		gart_handle = gart;
		bus_set_iommu(&platform_bus_type, &gart_iommu_ops);

		return 0;
		}