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/gk20a/ltc_gk20a.h | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 drivers/gpu/nvgpu/gk20a/ltc_gk20a.h (limited to 'drivers/gpu/nvgpu/gk20a/ltc_gk20a.h') diff --git a/drivers/gpu/nvgpu/gk20a/ltc_gk20a.h b/drivers/gpu/nvgpu/gk20a/ltc_gk20a.h deleted file mode 100644 index 8153ef0b..00000000 --- a/drivers/gpu/nvgpu/gk20a/ltc_gk20a.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * GK20A L2 - * - * Copyright (c) 2014-2017, 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"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#ifndef LTC_GK20A_H -#define LTC_GK20A_H -struct gk20a; - -int gk20a_ltc_alloc_phys_cbc(struct gk20a *g, size_t compbit_backing_size); -int gk20a_ltc_alloc_virt_cbc(struct gk20a *g, size_t compbit_backing_size); -#endif -- cgit v1.2.2