diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-06-16 06:27:05 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-06-16 06:27:05 +1000 |
| commit | d9724d3b1d007fa042c768a2eec708f33d70539d (patch) | |
| tree | 81739b9f9ffb5999b137d624f10f88ca8a71207c | |
| parent | e43fc9467e96bbaf1b65bb975e6820e0db993469 (diff) | |
| parent | 13c34fe518624e27589827aa49f68f5f38c95f11 (diff) | |
| download | linux-d9724d3b1d007fa042c768a2eec708f33d70539d.tar.gz | |
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
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_iommu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_iommu.c b/drivers/gpu/drm/etnaviv/etnaviv_iommu.c index 522cfd4478922d..16353ee816516e 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_iommu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_iommu.c @@ -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.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_end = GPU_MEM_START + PT_ENTRIES * SZ_4K - 1; |