From 7acc993cdbcc202854f188e7f53646f387573a09 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Fri, 14 Apr 2017 15:12:57 -0700 Subject: gpu: nvgpu: Move can_railgate & railgate_delay to gk20a Copy can_railgate and railgate_delay to struct gk20a at probe time, and access them from gk20a instead of platform_gk20a. JIRA NVGPU-16 Change-Id: I63d4f4aff7eb17a167775fd7982a1b548bbca3a5 Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1463543 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c | 10 +++++----- drivers/gpu/nvgpu/tegra/linux/platform_gp10b_tegra.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'drivers/gpu/nvgpu/tegra/linux') diff --git a/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c index 5a178960..4ff4804f 100644 --- a/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c +++ b/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c @@ -955,7 +955,7 @@ static int gk20a_tegra_probe(struct device *dev) if (joint_xpu_rail) { gk20a_dbg_info("XPU rails are joint\n"); - platform->can_railgate = false; + platform->g->can_railgate = false; } platform->g->clk.gpc_pll.id = GK20A_GPC_PLL; @@ -1051,8 +1051,8 @@ struct gk20a_platform gk20a_tegra_platform = { .aggressive_sync_destroy_thresh = 64, /* power management configuration */ - .railgate_delay = 500, - .can_railgate = true, + .railgate_delay_init = 500, + .can_railgate_init = true, .can_elpg = true, .enable_slcg = true, .enable_blcg = true, @@ -1108,8 +1108,8 @@ struct gk20a_platform gm20b_tegra_platform = { .aggressive_sync_destroy_thresh = 64, /* power management configuration */ - .railgate_delay = 500, - .can_railgate = true, + .railgate_delay_init = 500, + .can_railgate_init = true, .can_elpg = true, .enable_slcg = true, .enable_blcg = true, diff --git a/drivers/gpu/nvgpu/tegra/linux/platform_gp10b_tegra.c b/drivers/gpu/nvgpu/tegra/linux/platform_gp10b_tegra.c index 138b8fda..2587d5fa 100644 --- a/drivers/gpu/nvgpu/tegra/linux/platform_gp10b_tegra.c +++ b/drivers/gpu/nvgpu/tegra/linux/platform_gp10b_tegra.c @@ -382,10 +382,10 @@ struct gk20a_platform gp10b_tegra_platform = { .has_syncpoints = true, /* power management configuration */ - .railgate_delay = 500, + .railgate_delay_init = 500, /* power management configuration */ - .can_railgate = true, + .can_railgate_init = true, .enable_elpg = true, .can_elpg = true, .enable_blcg = true, -- cgit v1.2.2