diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-04-14 16:11:18 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-04-19 16:24:30 -0400 |
commit | 6df49a63ca5f9d77a6d7d6c7dbaaa0fba1b707ca (patch) | |
tree | b50c57b2759fb4a20390880ea5b5d874d324d046 /drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c | |
parent | 15e9b433f3a33f4d68582d8eeabfcfd32db8c340 (diff) |
gpu: nvgpu: Move is_fmodel to struct gk20a
Copy is_fmodel to struct gk20a at probe time, and access it from
gk20a instead of platform_gk20a.
JIRA NVGPU-16
Change-Id: Ib8d793ea2b02b62da3bfdbb6372d9927658b7ec6
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1463540
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c index 07cdc9e5..1584ffda 100644 --- a/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/priv_ring_gk20a.c | |||
@@ -28,9 +28,7 @@ | |||
28 | 28 | ||
29 | void gk20a_enable_priv_ring(struct gk20a *g) | 29 | void gk20a_enable_priv_ring(struct gk20a *g) |
30 | { | 30 | { |
31 | struct gk20a_platform *platform = dev_get_drvdata(g->dev); | 31 | if (g->is_fmodel) |
32 | |||
33 | if (platform->is_fmodel) | ||
34 | return; | 32 | return; |
35 | 33 | ||
36 | if (g->ops.clock_gating.slcg_priring_load_gating_prod) | 34 | if (g->ops.clock_gating.slcg_priring_load_gating_prod) |
@@ -75,9 +73,8 @@ void gk20a_priv_ring_isr(struct gk20a *g) | |||
75 | s32 retry = 100; | 73 | s32 retry = 100; |
76 | u32 gpc; | 74 | u32 gpc; |
77 | u32 gpc_stride = nvgpu_get_litter_value(g, GPU_LIT_GPC_STRIDE); | 75 | u32 gpc_stride = nvgpu_get_litter_value(g, GPU_LIT_GPC_STRIDE); |
78 | struct gk20a_platform *platform = dev_get_drvdata(g->dev); | ||
79 | 76 | ||
80 | if (platform->is_fmodel) | 77 | if (g->is_fmodel) |
81 | return; | 78 | return; |
82 | 79 | ||
83 | status0 = gk20a_readl(g, pri_ringmaster_intr_status0_r()); | 80 | status0 = gk20a_readl(g, pri_ringmaster_intr_status0_r()); |