Commit 99aeeb7c authored by Lucas Stach's avatar Lucas Stach

drm/etnaviv: rename etnaviv_iommu_domain_restore to etnaviv_iommuv1_restore

This function has external visibility and only handles the Vivant IOMMU
version 1. Rename to make this more clear and allow a clear separation
of the different IOMMU versions.

Also drop the domain parameter, as we can infer it from the GPU we are
dealing with.
Signed-off-by: default avatarLucas Stach <l.stach@pengutronix.de>
parent acfee0ec
...@@ -576,7 +576,7 @@ static void etnaviv_gpu_hw_init(struct etnaviv_gpu *gpu) ...@@ -576,7 +576,7 @@ static void etnaviv_gpu_hw_init(struct etnaviv_gpu *gpu)
gpu_write(gpu, VIVS_MC_MEMORY_BASE_ADDR_PE, gpu->memory_base); gpu_write(gpu, VIVS_MC_MEMORY_BASE_ADDR_PE, gpu->memory_base);
/* setup the MMU page table pointers */ /* setup the MMU page table pointers */
etnaviv_iommu_domain_restore(gpu, gpu->mmu->domain); etnaviv_iommuv1_restore(gpu);
/* Start command processor */ /* Start command processor */
prefetch = etnaviv_buffer_init(gpu); prefetch = etnaviv_buffer_init(gpu);
......
...@@ -196,10 +196,10 @@ static struct etnaviv_iommu_ops etnaviv_iommu_ops = { ...@@ -196,10 +196,10 @@ static struct etnaviv_iommu_ops etnaviv_iommu_ops = {
.dump = etnaviv_iommuv1_dump, .dump = etnaviv_iommuv1_dump,
}; };
void etnaviv_iommu_domain_restore(struct etnaviv_gpu *gpu, void etnaviv_iommuv1_restore(struct etnaviv_gpu *gpu)
struct iommu_domain *domain)
{ {
struct etnaviv_iommu_domain *etnaviv_domain = to_etnaviv_domain(domain); struct etnaviv_iommu_domain *etnaviv_domain =
to_etnaviv_domain(gpu->mmu->domain);
u32 pgtable; u32 pgtable;
/* set page table address in MC */ /* set page table address in MC */
......
...@@ -21,8 +21,7 @@ ...@@ -21,8 +21,7 @@
struct etnaviv_gpu; struct etnaviv_gpu;
struct iommu_domain *etnaviv_iommu_domain_alloc(struct etnaviv_gpu *gpu); struct iommu_domain *etnaviv_iommu_domain_alloc(struct etnaviv_gpu *gpu);
void etnaviv_iommu_domain_restore(struct etnaviv_gpu *gpu, void etnaviv_iommuv1_restore(struct etnaviv_gpu *gpu);
struct iommu_domain *domain);
struct iommu_domain *etnaviv_iommu_v2_domain_alloc(struct etnaviv_gpu *gpu); struct iommu_domain *etnaviv_iommu_v2_domain_alloc(struct etnaviv_gpu *gpu);
#endif /* __ETNAVIV_IOMMU_H__ */ #endif /* __ETNAVIV_IOMMU_H__ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment