gpu: nvgpu: Fold T19x code back to main code paths

Lots of code paths were split to T19x specific code paths and structs
due to split repository. Now that repositories are merged, fold all of
them back to main code paths and structs and remove the T19x specific
Kconfig flag.

Change-Id: Id0d17a5f0610fc0b49f51ab6664e716dc8b222b6
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1640606
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 13 insertions, 13 deletions

diff --git a/drivers/gpu/nvgpu/gv11b/fb_gv11b.c b/drivers/gpu/nvgpu/gv11b/fb_gv11b.c
index 8ac3cb7b..b7a0a3cf 100644
--- a/drivers/gpu/nvgpu/gv11b/fb_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/fb_gv11b.c
@@ -1,7 +1,7 @@
 /*
  * GV11B FB
  *
- * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -568,9 +568,9 @@ static void gv11b_handle_l2tlb_ecc_isr(struct gk20a *g, u32 ecc_status)
                 uncorrected_delta += (0x1UL << fb_mmu_l2tlb_ecc_uncorrected_err_count_total_s());
 
 
-        g->ecc.eng.t19x.mmu_l2tlb_corrected_err_count.counters[0] +=
+        g->ecc.fb.mmu_l2tlb_corrected_err_count.counters[0] +=
                                                         corrected_delta;
-        g->ecc.eng.t19x.mmu_l2tlb_uncorrected_err_count.counters[0] +=
+        g->ecc.fb.mmu_l2tlb_uncorrected_err_count.counters[0] +=
                                                         uncorrected_delta;
 
         if (ecc_status & fb_mmu_l2tlb_ecc_status_corrected_err_l2tlb_sa_data_m())
@@ -584,8 +584,8 @@ static void gv11b_handle_l2tlb_ecc_isr(struct gk20a *g, u32 ecc_status)
                 "ecc error address: 0x%x", ecc_addr);
         nvgpu_log(g, gpu_dbg_intr,
                 "ecc error count corrected: %d, uncorrected %d",
-                g->ecc.eng.t19x.mmu_l2tlb_corrected_err_count.counters[0],
-                g->ecc.eng.t19x.mmu_l2tlb_uncorrected_err_count.counters[0]);
+                g->ecc.fb.mmu_l2tlb_corrected_err_count.counters[0],
+                g->ecc.fb.mmu_l2tlb_uncorrected_err_count.counters[0]);
 }
 
 static void gv11b_handle_hubtlb_ecc_isr(struct gk20a *g, u32 ecc_status)
@@ -626,9 +626,9 @@ static void gv11b_handle_hubtlb_ecc_isr(struct gk20a *g, u32 ecc_status)
                 uncorrected_delta += (0x1UL << fb_mmu_hubtlb_ecc_uncorrected_err_count_total_s());
 
 
-        g->ecc.eng.t19x.mmu_hubtlb_corrected_err_count.counters[0] +=
+        g->ecc.fb.mmu_hubtlb_corrected_err_count.counters[0] +=
                                                         corrected_delta;
-        g->ecc.eng.t19x.mmu_hubtlb_uncorrected_err_count.counters[0] +=
+        g->ecc.fb.mmu_hubtlb_uncorrected_err_count.counters[0] +=
                                                         uncorrected_delta;
 
         if (ecc_status & fb_mmu_hubtlb_ecc_status_corrected_err_sa_data_m())
@@ -642,8 +642,8 @@ static void gv11b_handle_hubtlb_ecc_isr(struct gk20a *g, u32 ecc_status)
                 "ecc error address: 0x%x", ecc_addr);
         nvgpu_log(g, gpu_dbg_intr,
                 "ecc error count corrected: %d, uncorrected %d",
-                g->ecc.eng.t19x.mmu_hubtlb_corrected_err_count.counters[0],
-                g->ecc.eng.t19x.mmu_hubtlb_uncorrected_err_count.counters[0]);
+                g->ecc.fb.mmu_hubtlb_corrected_err_count.counters[0],
+                g->ecc.fb.mmu_hubtlb_uncorrected_err_count.counters[0]);
 }
 
 static void gv11b_handle_fillunit_ecc_isr(struct gk20a *g, u32 ecc_status)
@@ -684,9 +684,9 @@ static void gv11b_handle_fillunit_ecc_isr(struct gk20a *g, u32 ecc_status)
                 uncorrected_delta += (0x1UL << fb_mmu_fillunit_ecc_uncorrected_err_count_total_s());
 
 
-        g->ecc.eng.t19x.mmu_fillunit_corrected_err_count.counters[0] +=
+        g->ecc.fb.mmu_fillunit_corrected_err_count.counters[0] +=
                                                         corrected_delta;
-        g->ecc.eng.t19x.mmu_fillunit_uncorrected_err_count.counters[0] +=
+        g->ecc.fb.mmu_fillunit_uncorrected_err_count.counters[0] +=
                                                         uncorrected_delta;
 
         if (ecc_status & fb_mmu_fillunit_ecc_status_corrected_err_pte_data_m())
@@ -705,8 +705,8 @@ static void gv11b_handle_fillunit_ecc_isr(struct gk20a *g, u32 ecc_status)
                 "ecc error address: 0x%x", ecc_addr);
         nvgpu_log(g, gpu_dbg_intr,
                 "ecc error count corrected: %d, uncorrected %d",
-                g->ecc.eng.t19x.mmu_fillunit_corrected_err_count.counters[0],
-                g->ecc.eng.t19x.mmu_fillunit_uncorrected_err_count.counters[0]);
+                g->ecc.fb.mmu_fillunit_corrected_err_count.counters[0],
+                g->ecc.fb.mmu_fillunit_uncorrected_err_count.counters[0]);
 }
 
 static void gv11b_fb_parse_mmfault(struct mmu_fault_info *mmfault)