Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9724d3b authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-etnaviv-fixes' of git://git.pengutronix.de/git/lst/linux into drm-fixes 

just a single fix for a regression introduced by IOMMU API changes in
v4.7.

* 'drm-etnaviv-fixes' of git://git.pengutronix.de/git/lst/linux:
  drm/etnaviv: initialize iommu domain page size
parents e43fc946 13c34fe5

drivers/gpu/drm/etnaviv/etnaviv_iommu.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -225,6 +225,7 @@ struct iommu_domain *etnaviv_iommu_domain_alloc(struct etnaviv_gpu *gpu) 




	etnaviv_domain->domain.type = __IOMMU_DOMAIN_PAGING;

	etnaviv_domain->domain.type = __IOMMU_DOMAIN_PAGING;

	etnaviv_domain->domain.ops = &etnaviv_iommu_ops.ops;

	etnaviv_domain->domain.ops = &etnaviv_iommu_ops.ops;

	etnaviv_domain->domain.pgsize_bitmap = SZ_4K;

	etnaviv_domain->domain.geometry.aperture_start = GPU_MEM_START;

	etnaviv_domain->domain.geometry.aperture_start = GPU_MEM_START;

	etnaviv_domain->domain.geometry.aperture_end = GPU_MEM_START + PT_ENTRIES * SZ_4K - 1;

	etnaviv_domain->domain.geometry.aperture_end = GPU_MEM_START + PT_ENTRIES * SZ_4K - 1;