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>

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 @@
 
 #define PRIV_SECURITY_DISABLE 0x01
 
-#define GM20B_FBPA_BASE        0x00110000
-#define GM20B_FBPA_SHARED_BASE 0x0010F000
-
 static struct gpu_ops gm20b_ops = {
         .clock_gating = {
                 .slcg_bus_load_gating_prod =
@@ -166,17 +163,15 @@ static int gm20b_get_litter_value(struct gk20a *g, int value)
         case GPU_LIT_LTS_STRIDE:
                 ret = proj_lts_stride_v();
                 break;
+        /* GM20B does not have a FBPA unit, despite what's listed in the
+         * hw headers or read back through NV_PTOP_SCAL_NUM_FBPAS,
+         * so hardcode all values to 0.
+         */
         case GPU_LIT_NUM_FBPAS:
-                ret = proj_scal_litter_num_fbpas_v();
-                break;
         case GPU_LIT_FBPA_STRIDE:
-                ret = proj_fbpa_stride_v();
-                break;
         case GPU_LIT_FBPA_BASE:
-                ret = GM20B_FBPA_BASE;
-                break;
         case GPU_LIT_FBPA_SHARED_BASE:
-                ret = GM20B_FBPA_SHARED_BASE;
+                ret = 0;
                 break;
         default:
                 gk20a_err(dev_from_gk20a(g), "Missing definition %d", value);