From a4eca46b4b2204ef4d39d3c1ea504e319574ac50 Mon Sep 17 00:00:00 2001 From: Sagar Kamble Date: Tue, 21 Feb 2023 21:35:21 +0530 Subject: [PATCH] gpu: nvgpu: Enable compression for k6.1 dmabuf internals that nvgpu relies upon for storing meta-data for compressible buffers changed in k6.2. Enable it for k6.1. Bug 3844023 Change-Id: Ief661b3739e987dc8f2fe13bb0efb02fa78dbacd Signed-off-by: Sagar Kamble Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2861335 Reviewed-by: svcacv Reviewed-by: Jonathan Hunter Reviewed-by: Vaibhav Kachore GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/Makefile.linux.configs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/nvgpu/Makefile.linux.configs b/drivers/gpu/nvgpu/Makefile.linux.configs index 239c03c9a..6c377efff 100644 --- a/drivers/gpu/nvgpu/Makefile.linux.configs +++ b/drivers/gpu/nvgpu/Makefile.linux.configs @@ -36,16 +36,18 @@ CONFIG_NVGPU_HAL_NON_FUSA := y # Support recovery on failure (which may involve engine reset) CONFIG_NVGPU_RECOVERY := y -# Enable support for compression on pre-K6.1 kernels. K6.1+ changes the +# Enable support for compression on pre-K6.2 kernels. K6.2+ changes the # internals of dma-bufs which breaks some hacks we implemented to support -# compression meta-data tracking. For now, on K6.1+ kernels, just disable +# compression meta-data tracking. For now, on K6.2+ kernels, just disable # compression. This is a hack that should be fixed. CONFIG_NVGPU_COMPRESSION := y ifeq ($(VERSION),6) ifneq ($(PATCHLEVEL),0) +ifneq ($(PATCHLEVEL),1) CONFIG_NVGPU_COMPRESSION := n endif endif +endif # Enable MIG Support CONFIG_NVGPU_MIG := y