From 5a35a95654d561fce09a3b9abf6b82bb7a29d74b Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Wed, 28 Feb 2018 09:19:19 -0800 Subject: Revert "gpu: nvgpu: Get coherency on gv100 + NVLINK working" Also revert other changes related to IO coherence. This may be the culprit in a recent dev-kernel lockdown. Bug 2070609 Change-Id: Ida178aef161fadbc6db9512521ea51c702c1564b Signed-off-by: Alex Waterman Reviewed-on: https://git-master.nvidia.com/r/1665914 Reviewed-by: svc-mobile-coverity GVS: Gerrit_Virtual_Submit Reviewed-by: Srikar Srimath Tirumala --- drivers/gpu/nvgpu/include/nvgpu/enabled.h | 4 ++-- drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h | 23 ++++++----------------- 2 files changed, 8 insertions(+), 19 deletions(-) (limited to 'drivers/gpu/nvgpu/include') diff --git a/drivers/gpu/nvgpu/include/nvgpu/enabled.h b/drivers/gpu/nvgpu/include/nvgpu/enabled.h index 24748a19..a3d9df24 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/enabled.h +++ b/drivers/gpu/nvgpu/include/nvgpu/enabled.h @@ -75,8 +75,8 @@ struct gk20a; #define NVGPU_SUPPORT_MAP_DIRECT_KIND_CTRL 24 /* Support batch mapping */ #define NVGPU_SUPPORT_MAP_BUFFER_BATCH 25 -/* Use coherent aperture for sysmem. */ -#define NVGPU_USE_COHERENT_SYSMEM 26 +/* Support DMA coherence */ +#define NVGPU_DMA_COHERENT 26 /* Use physical scatter tables instead of IOMMU */ #define NVGPU_MM_USE_PHYSICAL_SG 27 diff --git a/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h index f1ab8a6e..2b8b7015 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h +++ b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_mem.h @@ -25,7 +25,6 @@ #include #include -#include #ifdef __KERNEL__ #include @@ -52,10 +51,6 @@ struct nvgpu_page_alloc; enum nvgpu_aperture { APERTURE_INVALID = 0, /* unallocated or N/A */ APERTURE_SYSMEM, - - /* Don't use directly. Use APERTURE_SYSMEM, this is used internally. */ - __APERTURE_SYSMEM_COH, - APERTURE_VIDMEM }; @@ -192,18 +187,12 @@ nvgpu_mem_from_clear_list_entry(struct nvgpu_list_node *node) clear_list_entry)); }; -static inline const char *nvgpu_aperture_str(struct gk20a *g, - enum nvgpu_aperture aperture) +static inline const char *nvgpu_aperture_str(enum nvgpu_aperture aperture) { switch (aperture) { - case APERTURE_INVALID: - return "INVAL"; - case APERTURE_SYSMEM: - return "SYSMEM"; - case __APERTURE_SYSMEM_COH: - return "SYSCOH"; - case APERTURE_VIDMEM: - return "VIDMEM"; + case APERTURE_INVALID: return "INVAL"; + case APERTURE_SYSMEM: return "SYSMEM"; + case APERTURE_VIDMEM: return "VIDMEM"; }; return "UNKNOWN"; } @@ -333,9 +322,9 @@ u64 nvgpu_mem_get_addr(struct gk20a *g, struct nvgpu_mem *mem); u64 nvgpu_mem_get_phys_addr(struct gk20a *g, struct nvgpu_mem *mem); u32 __nvgpu_aperture_mask(struct gk20a *g, enum nvgpu_aperture aperture, - u32 sysmem_mask, u32 sysmem_coh_mask, u32 vidmem_mask); + u32 sysmem_mask, u32 vidmem_mask); u32 nvgpu_aperture_mask(struct gk20a *g, struct nvgpu_mem *mem, - u32 sysmem_mask, u32 sysmem_coh_mask, u32 vidmem_mask); + u32 sysmem_mask, u32 vidmem_mask); u64 nvgpu_mem_iommu_translate(struct gk20a *g, u64 phys); -- cgit v1.2.2