gpu: nvgpu: Use only contig CBCs

Modify the LTC code to only use a contiguous CompBit Cache (CBC). The
original code had two allocation schemes: "physical" and "virtual" -
what they meant was virtually contiguous or physically contiguous. The
CBC must appear contiguous to the GPU be it either from the IOMMU or
from physical pages allocated contiguously.

This change makes the CBC get allocated with the FORCE_CONTIGUOUS flag
if the GPU is not IOMMU'able. If we can get contiguous mem with the
IOMMU then no need to force the underlying pages to be contiguous.
However, not all GPUs may be IOMMU'able so we do need to handle that
case.

Also delete the gk20a/ltc_gk20a.[ch] code. All that remained in these
files was the CBC alloc functions which were completely chip agnostic.
As a result these functions were consolidated and moved to common/ltc.c.

Bug 2015747

Change-Id: I3f41961b4f94378b954e7502a6b27cf0bc627375
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1593666
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 4 insertions, 8 deletions

diff --git a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
index 84759192..6ec9aec5 100644
--- a/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/ltc_gm20b.c
@@ -24,18 +24,18 @@
 
 #include <trace/events/gk20a.h>
 
-#include "gk20a/gk20a.h"
-
 #include <nvgpu/timers.h>
 #include <nvgpu/enabled.h>
 #include <nvgpu/bug.h>
+#include <nvgpu/ltc.h>
 
 #include <nvgpu/hw/gm20b/hw_mc_gm20b.h>
 #include <nvgpu/hw/gm20b/hw_ltc_gm20b.h>
 #include <nvgpu/hw/gm20b/hw_top_gm20b.h>
 #include <nvgpu/hw/gm20b/hw_pri_ringmaster_gm20b.h>
 
-#include "gk20a/ltc_gk20a.h"
+#include "gk20a/gk20a.h"
+
 #include "ltc_gm20b.h"
 
 int gm20b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr)
@@ -92,11 +92,7 @@ int gm20b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr)
         gk20a_dbg_info("max comptag lines : %d",
                 max_comptag_lines);
 
-        if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL))
-                err = gk20a_ltc_alloc_phys_cbc(g, compbit_backing_size);
-        else
-                err = gk20a_ltc_alloc_virt_cbc(g, compbit_backing_size);
-
+        err = nvgpu_ltc_alloc_cbc(g, compbit_backing_size);
         if (err)
                 return err;