summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
diff options
context:
space:
mode:
authorLucas Stach <l.stach@pengutronix.de>2016-08-16 11:48:49 +0200
committerLucas Stach <l.stach@pengutronix.de>2016-09-15 15:29:34 +0200
commit99f861bc83ab87b9ab3a404e7d7befe3837220a5 (patch)
treeae10bb80dec3a2a3fb9a643e83c692db409cb1cd /drivers/gpu/drm/etnaviv/etnaviv_gpu.c
parent99aeeb7c58b24121e7951ef239ccf0626d4d566b (diff)
downloadop-kernel-dev-99f861bc83ab87b9ab3a404e7d7befe3837220a5.zip
op-kernel-dev-99f861bc83ab87b9ab3a404e7d7befe3837220a5.tar.gz
drm/etnaviv: move linear window setup into etnaviv_iommuv1_restore
It is only relevant for the V1 MMU, so we should not do this in the common code. Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Diffstat (limited to 'drivers/gpu/drm/etnaviv/etnaviv_gpu.c')
-rw-r--r--drivers/gpu/drm/etnaviv/etnaviv_gpu.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
index 6828fc1..0dde3f7 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
@@ -568,14 +568,7 @@ static void etnaviv_gpu_hw_init(struct etnaviv_gpu *gpu)
gpu_write(gpu, VIVS_MC_BUS_CONFIG, bus_config);
}
- /* set base addresses */
- gpu_write(gpu, VIVS_MC_MEMORY_BASE_ADDR_RA, gpu->memory_base);
- gpu_write(gpu, VIVS_MC_MEMORY_BASE_ADDR_FE, gpu->memory_base);
- gpu_write(gpu, VIVS_MC_MEMORY_BASE_ADDR_TX, gpu->memory_base);
- gpu_write(gpu, VIVS_MC_MEMORY_BASE_ADDR_PEZ, gpu->memory_base);
- gpu_write(gpu, VIVS_MC_MEMORY_BASE_ADDR_PE, gpu->memory_base);
-
- /* setup the MMU page table pointers */
+ /* setup the MMU */
etnaviv_iommuv1_restore(gpu);
/* Start command processor */
OpenPOWER on IntegriCloud