summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/gk20a.c
diff options
context:
space:
mode:
authorSam Payne <spayne@nvidia.com>2014-10-31 17:27:33 -0400
committerDan Willemsen <dwillemsen@nvidia.com>2015-03-18 15:11:56 -0400
commit8c6a9fd1151299697037d58f33cfa306d8ac5d87 (patch)
tree9bb909474f12565e7f61251b8b80f300030bde52 /drivers/gpu/nvgpu/gk20a/gk20a.c
parent4f6dddcf78233b9939ee32c6f09519f27c3b8fb4 (diff)
Revert "gpu: nvgpu: GR and LTC HAL to use const structs"
This reverts commit 41b82e97164138f45fbdaef6ab6939d82ca9419e. Change-Id: Iabd01fcb124e0d22cd9be62151a6552cbb27fc94 Signed-off-by: Sam Payne <spayne@nvidia.com> Reviewed-on: http://git-master/r/592221 Tested-by: Hoang Pham <hopham@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Mitch Luban <mluban@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 5dda7d74..cea53e00 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -612,7 +612,7 @@ static irqreturn_t gk20a_intr_thread_stall(int irq, void *dev_id)
612 if (mc_intr_0 & mc_intr_0_priv_ring_pending_f()) 612 if (mc_intr_0 & mc_intr_0_priv_ring_pending_f())
613 gk20a_priv_ring_isr(g); 613 gk20a_priv_ring_isr(g);
614 if (mc_intr_0 & mc_intr_0_ltc_pending_f()) 614 if (mc_intr_0 & mc_intr_0_ltc_pending_f())
615 g->ops.ltc->isr(g); 615 g->ops.ltc.isr(g);
616 if (mc_intr_0 & mc_intr_0_pbus_pending_f()) 616 if (mc_intr_0 & mc_intr_0_pbus_pending_f())
617 gk20a_pbus_isr(g); 617 gk20a_pbus_isr(g);
618 618
@@ -881,8 +881,8 @@ static int gk20a_pm_finalize_poweron(struct device *dev)
881 goto done; 881 goto done;
882 } 882 }
883 883
884 if (g->ops.ltc->init_fs_state) 884 if (g->ops.ltc.init_fs_state)
885 g->ops.ltc->init_fs_state(g); 885 g->ops.ltc.init_fs_state(g);
886 886
887 err = gk20a_init_mm_support(g); 887 err = gk20a_init_mm_support(g);
888 if (err) { 888 if (err) {
@@ -1818,7 +1818,7 @@ int gk20a_init_gpu_characteristics(struct gk20a *g)
1818{ 1818{
1819 struct nvgpu_gpu_characteristics *gpu = &g->gpu_characteristics; 1819 struct nvgpu_gpu_characteristics *gpu = &g->gpu_characteristics;
1820 1820
1821 gpu->L2_cache_size = g->ops.ltc->determine_L2_size_bytes(g); 1821 gpu->L2_cache_size = g->ops.ltc.determine_L2_size_bytes(g);
1822 gpu->on_board_video_memory_size = 0; /* integrated GPU */ 1822 gpu->on_board_video_memory_size = 0; /* integrated GPU */
1823 1823
1824 gpu->num_gpc = g->gr.gpc_count; 1824 gpu->num_gpc = g->gr.gpc_count;