diff options
author | Arto Merilainen <amerilainen@nvidia.com> | 2014-07-28 08:58:13 -0400 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:10:38 -0400 |
commit | ccead861f2b0b679b3b38faf35e2372b74bbb334 (patch) | |
tree | 2cd59791257e73f610be7c42c4faebefecb7851b | |
parent | 8554e9a9c8ba67835d023da2a9148a5af5db2b17 (diff) |
gpu: nvgpu: gm20b: Store LTC configuration
Change-Id: Ia780e6a7cb3579f0d6ed2dca9949a349799535fd
Signed-off-by: Arto Merilainen <amerilainen@nvidia.com>
Reviewed-on: http://git-master/r/448115
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/ltc_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/ltc_gm20b.c | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h index dadcbca2..d4f7bc70 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.h | |||
@@ -211,7 +211,7 @@ struct gr_gk20a { | |||
211 | u32 num_fbps; | 211 | u32 num_fbps; |
212 | 212 | ||
213 | u32 comptags_per_cacheline; | 213 | u32 comptags_per_cacheline; |
214 | u32 slices_per_fbp; | 214 | u32 slices_per_ltc; |
215 | u32 cacheline_size; | 215 | u32 cacheline_size; |
216 | 216 | ||
217 | u32 max_gpc_count; | 217 | u32 max_gpc_count; |
diff --git a/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c b/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c index db7f81b4..db00fa1a 100644 --- a/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c | |||
@@ -96,7 +96,7 @@ static int gk20a_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr) | |||
96 | 1); /* align */ | 96 | 1); /* align */ |
97 | 97 | ||
98 | gr->comptags_per_cacheline = comptags_per_cacheline; | 98 | gr->comptags_per_cacheline = comptags_per_cacheline; |
99 | gr->slices_per_fbp = slices_per_fbp; | 99 | gr->slices_per_ltc = slices_per_fbp / g->ltc_count; |
100 | gr->cacheline_size = cacheline_size; | 100 | gr->cacheline_size = cacheline_size; |
101 | 101 | ||
102 | return 0; | 102 | return 0; |
diff --git a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c index e3c003a6..683aa2ac 100644 --- a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c | |||
@@ -95,6 +95,10 @@ static int gm20b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr) | |||
95 | max_comptag_lines - 1, /* length*/ | 95 | max_comptag_lines - 1, /* length*/ |
96 | 1); /* align */ | 96 | 1); /* align */ |
97 | 97 | ||
98 | gr->comptags_per_cacheline = comptags_per_cacheline; | ||
99 | gr->slices_per_ltc = slices_per_ltc; | ||
100 | gr->cacheline_size = cacheline_size; | ||
101 | |||
98 | return 0; | 102 | return 0; |
99 | } | 103 | } |
100 | 104 | ||