nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 02:22:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: Disable compression for k6.1+

Browse Source 
dmabuf internals that nvgpu relies upon for storing meta-data for
compressible buffers changed in k6.1. For now, disable compression
on all k6.1+ kernels.

Additionally, fix numerous compilation issues due to the bit rotted
compression config. All normal Tegra products support compression
and thus have this config enabled. Over the last several years
compression dependent code crept in that wasn't protected under the
compression config.

Bug 3844023

Change-Id: Ie5b9b5a2bcf1a763806c087af99203d62d0cb6e0
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2820846
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-mobile-cert <svc-mobile-cert@nvidia.com>
Reviewed-by: svc-mobile-misra <svc-mobile-misra@nvidia.com>
Reviewed-by: Sagar Kamble <skamble@nvidia.com>
Reviewed-by: Ankur Kishore <ankkishore@nvidia.com>
Tested-by: Sagar Kamble <skamble@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Alex Waterman
2022-12-02 21:06:51 +00:00
committed by mobile promotions
parent b754a2f0cf
commit 03533066aa
12 changed files with 81 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/gpu/nvgpu/os/linux/vm.c
View File

@@ -468,9 +468,11 @@ int nvgpu_vm_mapping_modify(struct vm_gk20a *vm,
struct nvgpu_sgt *nvgpu_sgt = NULL;
u32 pgsz_idx;
u32 page_size;
u64 ctag_offset;
s16 kind = NV_KIND_INVALID;
u64 ctag_offset = 0UL;
#ifdef CONFIG_NVGPU_COMPRESSION
u64 compression_page_size;
#endif
nvgpu_mutex_acquire(&vm->update_gmmu_lock);
@@ -510,18 +512,31 @@ int nvgpu_vm_mapping_modify(struct vm_gk20a *vm,
goto out;
}
/*
* Fall back is the incompressible kind.
*/
kind = incompr_kind;
/*
* If we support compression and there's a compressible kind, use it.
*/
#ifdef CONFIG_NVGPU_COMPRESSION
if (mapped_buffer->ctag_offset != 0) {
if (compr_kind == NV_KIND_INVALID) {
kind = incompr_kind;
} else {
kind = compr_kind;
}
} else {
if (incompr_kind == NV_KIND_INVALID) {
nvgpu_err(g, "invalid incompr_kind specified");
goto out;
}
kind = incompr_kind;
}
#endif
/*
* If we don't support compression you still need to have a valid kind
* specified.
*/
if (kind == NV_KIND_INVALID) {
nvgpu_err(g, "invalid incompr_kind specified");
goto out;
}
nvgpu_sgt = nvgpu_linux_sgt_create(g, mapped_buffer->os_priv.sgt);
@@ -530,6 +545,7 @@ int nvgpu_vm_mapping_modify(struct vm_gk20a *vm,
goto out;
}
#ifdef CONFIG_NVGPU_COMPRESSION
ctag_offset = mapped_buffer->ctag_offset;
compression_page_size = g->ops.fb.compression_page_size(g);
@@ -537,6 +553,7 @@ int nvgpu_vm_mapping_modify(struct vm_gk20a *vm,
ctag_offset += (u32)(buffer_offset >>
nvgpu_ilog2(compression_page_size));
#endif
if (g->ops.mm.gmmu.map(vm,
map_address + buffer_offset,