diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2021-08-20 23:18:29 +0300 |
|---|---|---|
| committer | Lucas Stach <l.stach@pengutronix.de> | 2021-09-16 11:35:33 +0300 |
| commit | d6408538f091fb22d47f792d4efa58143d56c3fb (patch) | |
| tree | abffec513a82642983992fb8eaec6291932b7e3a /drivers/gpu/drm/etnaviv/etnaviv_iommu.c | |
| parent | f978a5302f5566480c58ffae64a16d34456801bd (diff) | |
| download | linux-d6408538f091fb22d47f792d4efa58143d56c3fb.tar.xz | |
drm/etnaviv: reference MMU context when setting up hardware state
Move the refcount manipulation of the MMU context to the point where the
hardware state is programmed. At that point it is also known if a previous
MMU state is still there, or the state needs to be reprogrammed with a
potentially different context.
Cc: stable@vger.kernel.org # 5.4
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Tested-by: Michael Walle <michael@walle.cc>
Tested-by: Marek Vasut <marex@denx.de>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Diffstat (limited to 'drivers/gpu/drm/etnaviv/etnaviv_iommu.c')
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_iommu.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_iommu.c b/drivers/gpu/drm/etnaviv/etnaviv_iommu.c index 1a7c89a67bea..afe5dd6a9925 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_iommu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_iommu.c @@ -92,6 +92,10 @@ static void etnaviv_iommuv1_restore(struct etnaviv_gpu *gpu, struct etnaviv_iommuv1_context *v1_context = to_v1_context(context); u32 pgtable; + if (gpu->mmu_context) + etnaviv_iommu_context_put(gpu->mmu_context); + gpu->mmu_context = etnaviv_iommu_context_get(context); + /* set base addresses */ gpu_write(gpu, VIVS_MC_MEMORY_BASE_ADDR_RA, context->global->memory_base); gpu_write(gpu, VIVS_MC_MEMORY_BASE_ADDR_FE, context->global->memory_base); |