From 016231c045bfaa9f21feed00b88ac507c4935ebc Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Tue, 7 Nov 2017 10:50:49 -0800 Subject: 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 Reviewed-on: https://git-master.nvidia.com/r/1593666 Reviewed-by: Terje Bergstrom Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gp10b/ltc_gp10b.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'drivers/gpu/nvgpu/gp10b') diff --git a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c index 9d878402..92a899b8 100644 --- a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c @@ -24,16 +24,16 @@ #include -#include "gk20a/gk20a.h" -#include "gm20b/ltc_gm20b.h" - +#include #include #include #include #include -#include "gk20a/ltc_gk20a.h" +#include "gk20a/gk20a.h" +#include "gm20b/ltc_gm20b.h" + #include "ltc_gp10b.h" int gp10b_determine_L2_size_bytes(struct gk20a *g) @@ -112,11 +112,7 @@ int gp10b_ltc_init_comptags(struct gk20a *g, struct gr_gk20a *gr) gk20a_dbg_info("gobs_per_comptagline_per_slice: %d", gobs_per_comptagline_per_slice); - 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; -- cgit v1.2.2