diff options
author | Peter Daifuku <pdaifuku@nvidia.com> | 2016-11-17 19:33:31 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2016-11-22 15:58:02 -0500 |
commit | 1b6fe7346f1b62bf525268d0d4123bc21cee0256 (patch) | |
tree | b59e5683c17513b349508bbb9a98ec35681e5bb5 /drivers/gpu/nvgpu/gk20a | |
parent | ef95e43d973fb2200857c9165b24d8260b2e219a (diff) |
gpu: nvgpu: hardcode gk20a/gm20b fbpa values
gk20a/gm20b do not have an fbpa unit, although the
hw header files claim they do. Hardcode all fbpa
values to 0.
Bug 200249125
Change-Id: I4afb29795199552979247de7c76b6b55ea4f368f
Signed-off-by: Peter Daifuku <pdaifuku@nvidia.com>
Reviewed-on: http://git-master/r/1256420
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Konsta Holtta <kholtta@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/hal_gk20a.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/hal_gk20a.c b/drivers/gpu/nvgpu/gk20a/hal_gk20a.c index 5b2b2552..6be62c5e 100644 --- a/drivers/gpu/nvgpu/gk20a/hal_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/hal_gk20a.c | |||
@@ -34,9 +34,6 @@ | |||
34 | #include "dbg_gpu_gk20a.h" | 34 | #include "dbg_gpu_gk20a.h" |
35 | #include "css_gr_gk20a.h" | 35 | #include "css_gr_gk20a.h" |
36 | 36 | ||
37 | #define GK20A_FBPA_BASE 0x00110000 | ||
38 | #define GK20A_FBPA_SHARED_BASE 0x0010F000 | ||
39 | |||
40 | static struct gpu_ops gk20a_ops = { | 37 | static struct gpu_ops gk20a_ops = { |
41 | .clock_gating = { | 38 | .clock_gating = { |
42 | .slcg_gr_load_gating_prod = | 39 | .slcg_gr_load_gating_prod = |
@@ -121,17 +118,15 @@ static int gk20a_get_litter_value(struct gk20a *g, int value) | |||
121 | case GPU_LIT_LTS_STRIDE: | 118 | case GPU_LIT_LTS_STRIDE: |
122 | ret = proj_lts_stride_v(); | 119 | ret = proj_lts_stride_v(); |
123 | break; | 120 | break; |
121 | /* GK20A does not have a FBPA unit, despite what's listed in the | ||
122 | * hw headers or read back through NV_PTOP_SCAL_NUM_FBPAS, | ||
123 | * so hardcode all values to 0. | ||
124 | */ | ||
124 | case GPU_LIT_NUM_FBPAS: | 125 | case GPU_LIT_NUM_FBPAS: |
125 | ret = proj_scal_litter_num_fbpas_v(); | ||
126 | break; | ||
127 | case GPU_LIT_FBPA_STRIDE: | 126 | case GPU_LIT_FBPA_STRIDE: |
128 | ret = proj_fbpa_stride_v(); | ||
129 | break; | ||
130 | case GPU_LIT_FBPA_BASE: | 127 | case GPU_LIT_FBPA_BASE: |
131 | ret = GK20A_FBPA_BASE; | ||
132 | break; | ||
133 | case GPU_LIT_FBPA_SHARED_BASE: | 128 | case GPU_LIT_FBPA_SHARED_BASE: |
134 | ret = GK20A_FBPA_SHARED_BASE; | 129 | ret = 0; |
135 | break; | 130 | break; |
136 | default: | 131 | default: |
137 | gk20a_err(dev_from_gk20a(g), "Missing definition %d", value); | 132 | gk20a_err(dev_from_gk20a(g), "Missing definition %d", value); |