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/gm20b | |
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/gm20b')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/hal_gm20b.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index 71ffe288..db1efaea 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c | |||
@@ -45,9 +45,6 @@ | |||
45 | 45 | ||
46 | #define PRIV_SECURITY_DISABLE 0x01 | 46 | #define PRIV_SECURITY_DISABLE 0x01 |
47 | 47 | ||
48 | #define GM20B_FBPA_BASE 0x00110000 | ||
49 | #define GM20B_FBPA_SHARED_BASE 0x0010F000 | ||
50 | |||
51 | static struct gpu_ops gm20b_ops = { | 48 | static struct gpu_ops gm20b_ops = { |
52 | .clock_gating = { | 49 | .clock_gating = { |
53 | .slcg_bus_load_gating_prod = | 50 | .slcg_bus_load_gating_prod = |
@@ -166,17 +163,15 @@ static int gm20b_get_litter_value(struct gk20a *g, int value) | |||
166 | case GPU_LIT_LTS_STRIDE: | 163 | case GPU_LIT_LTS_STRIDE: |
167 | ret = proj_lts_stride_v(); | 164 | ret = proj_lts_stride_v(); |
168 | break; | 165 | break; |
166 | /* GM20B does not have a FBPA unit, despite what's listed in the | ||
167 | * hw headers or read back through NV_PTOP_SCAL_NUM_FBPAS, | ||
168 | * so hardcode all values to 0. | ||
169 | */ | ||
169 | case GPU_LIT_NUM_FBPAS: | 170 | case GPU_LIT_NUM_FBPAS: |
170 | ret = proj_scal_litter_num_fbpas_v(); | ||
171 | break; | ||
172 | case GPU_LIT_FBPA_STRIDE: | 171 | case GPU_LIT_FBPA_STRIDE: |
173 | ret = proj_fbpa_stride_v(); | ||
174 | break; | ||
175 | case GPU_LIT_FBPA_BASE: | 172 | case GPU_LIT_FBPA_BASE: |
176 | ret = GM20B_FBPA_BASE; | ||
177 | break; | ||
178 | case GPU_LIT_FBPA_SHARED_BASE: | 173 | case GPU_LIT_FBPA_SHARED_BASE: |
179 | ret = GM20B_FBPA_SHARED_BASE; | 174 | ret = 0; |
180 | break; | 175 | break; |
181 | default: | 176 | default: |
182 | gk20a_err(dev_from_gk20a(g), "Missing definition %d", value); | 177 | gk20a_err(dev_from_gk20a(g), "Missing definition %d", value); |