diff options
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/hal_gk20a.c | 15 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/hal_gm20b.c | 15 |
2 files changed, 10 insertions, 20 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); |
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); |