From 6df49a63ca5f9d77a6d7d6c7dbaaa0fba1b707ca Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Fri, 14 Apr 2017 13:11:18 -0700 Subject: 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 Reviewed-on: http://git-master/r/1463540 Reviewed-by: svccoveritychecker GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'drivers/gpu/nvgpu/gp10b/hal_gp10b.c') diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index 6990b4ef..0332897e 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c @@ -189,13 +189,12 @@ int gp10b_init_hal(struct gk20a *g) { struct gpu_ops *gops = &g->ops; struct nvgpu_gpu_characteristics *c = &g->gpu_characteristics; - struct gk20a_platform *platform = dev_get_drvdata(g->dev); u32 val; gops->clock_gating = gp10b_ops.clock_gating; gops->pmupstate = false; #ifdef CONFIG_TEGRA_ACR - if (platform->is_fmodel) { + if (g->is_fmodel) { gops->privsecurity = 0; gops->securegpccs = 0; } else if (gk20a_gpu_is_virtual(g->dev)) { @@ -213,7 +212,7 @@ int gp10b_init_hal(struct gk20a *g) } } #else - if (platform->is_fmodel) { + if (g->is_fmodel) { gk20a_dbg_info("running simulator with PRIV security disabled"); gops->privsecurity = 0; gops->securegpccs = 0; -- cgit v1.2.2