diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-03-15 19:07:24 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-03-26 12:55:15 -0400 |
commit | 4f5996e23d7ea3d576c33f9b0ec5c7b590d6adca (patch) | |
tree | eade673d7b4462bcc45aa9d034efa926b30e7a03 /drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |
parent | f01c36986e22de0f4a049bf6897dd276b17a18ba (diff) |
gpu: nvgpu: Remove MC accesses from gk20a.c
Clean up gk20a.c by removing direct accesses to MC and moving the
accesses to happen via MC HAL.
The chip detection logic has to violate the HAL and call gk20a
version directly, because HAL ops cannot be set up before chip has
been identified.
Change-Id: I4cdd0ef3fcf7d3b561a3fca4247a8356fe8d18e1
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1321576
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/fifo_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index 8f7a2e22..6c4f12df 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |||
@@ -766,7 +766,7 @@ int gk20a_init_fifo_reset_enable_hw(struct gk20a *g) | |||
766 | 766 | ||
767 | gk20a_dbg_fn(""); | 767 | gk20a_dbg_fn(""); |
768 | /* enable pmc pfifo */ | 768 | /* enable pmc pfifo */ |
769 | gk20a_reset(g, mc_enable_pfifo_enabled_f()); | 769 | g->ops.mc.reset(g, mc_enable_pfifo_enabled_f()); |
770 | 770 | ||
771 | if (g->ops.clock_gating.slcg_ce2_load_gating_prod) | 771 | if (g->ops.clock_gating.slcg_ce2_load_gating_prod) |
772 | g->ops.clock_gating.slcg_ce2_load_gating_prod(g, | 772 | g->ops.clock_gating.slcg_ce2_load_gating_prod(g, |
@@ -1249,7 +1249,7 @@ void gk20a_fifo_reset_engine(struct gk20a *g, u32 engine_id) | |||
1249 | } | 1249 | } |
1250 | if ((engine_enum == ENGINE_GRCE_GK20A) || | 1250 | if ((engine_enum == ENGINE_GRCE_GK20A) || |
1251 | (engine_enum == ENGINE_ASYNC_CE_GK20A)) { | 1251 | (engine_enum == ENGINE_ASYNC_CE_GK20A)) { |
1252 | gk20a_reset(g, engine_info->reset_mask); | 1252 | g->ops.mc.reset(g, engine_info->reset_mask); |
1253 | } | 1253 | } |
1254 | } | 1254 | } |
1255 | 1255 | ||