diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-04-14 18:12:57 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-05-14 03:05:12 -0400 |
commit | 7acc993cdbcc202854f188e7f53646f387573a09 (patch) | |
tree | 61d213424ed8985973fa7ee3e4580c7b1b95bd3b /drivers/gpu/nvgpu/tegra/linux | |
parent | ab22d66386e3a23e0dfe897bca25e01623f6d61c (diff) |
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 <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1463543
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/tegra/linux')
-rw-r--r-- | drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c | 10 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/tegra/linux/platform_gp10b_tegra.c | 4 |
2 files changed, 7 insertions, 7 deletions
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) | |||
955 | 955 | ||
956 | if (joint_xpu_rail) { | 956 | if (joint_xpu_rail) { |
957 | gk20a_dbg_info("XPU rails are joint\n"); | 957 | gk20a_dbg_info("XPU rails are joint\n"); |
958 | platform->can_railgate = false; | 958 | platform->g->can_railgate = false; |
959 | } | 959 | } |
960 | 960 | ||
961 | platform->g->clk.gpc_pll.id = GK20A_GPC_PLL; | 961 | platform->g->clk.gpc_pll.id = GK20A_GPC_PLL; |
@@ -1051,8 +1051,8 @@ struct gk20a_platform gk20a_tegra_platform = { | |||
1051 | .aggressive_sync_destroy_thresh = 64, | 1051 | .aggressive_sync_destroy_thresh = 64, |
1052 | 1052 | ||
1053 | /* power management configuration */ | 1053 | /* power management configuration */ |
1054 | .railgate_delay = 500, | 1054 | .railgate_delay_init = 500, |
1055 | .can_railgate = true, | 1055 | .can_railgate_init = true, |
1056 | .can_elpg = true, | 1056 | .can_elpg = true, |
1057 | .enable_slcg = true, | 1057 | .enable_slcg = true, |
1058 | .enable_blcg = true, | 1058 | .enable_blcg = true, |
@@ -1108,8 +1108,8 @@ struct gk20a_platform gm20b_tegra_platform = { | |||
1108 | .aggressive_sync_destroy_thresh = 64, | 1108 | .aggressive_sync_destroy_thresh = 64, |
1109 | 1109 | ||
1110 | /* power management configuration */ | 1110 | /* power management configuration */ |
1111 | .railgate_delay = 500, | 1111 | .railgate_delay_init = 500, |
1112 | .can_railgate = true, | 1112 | .can_railgate_init = true, |
1113 | .can_elpg = true, | 1113 | .can_elpg = true, |
1114 | .enable_slcg = true, | 1114 | .enable_slcg = true, |
1115 | .enable_blcg = true, | 1115 | .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 = { | |||
382 | .has_syncpoints = true, | 382 | .has_syncpoints = true, |
383 | 383 | ||
384 | /* power management configuration */ | 384 | /* power management configuration */ |
385 | .railgate_delay = 500, | 385 | .railgate_delay_init = 500, |
386 | 386 | ||
387 | /* power management configuration */ | 387 | /* power management configuration */ |
388 | .can_railgate = true, | 388 | .can_railgate_init = true, |
389 | .enable_elpg = true, | 389 | .enable_elpg = true, |
390 | .can_elpg = true, | 390 | .can_elpg = true, |
391 | .enable_blcg = true, | 391 | .enable_blcg = true, |