From 44827be1e4968610e30c8830213410157cdd1e8e Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Sun, 2 Jul 2023 14:28:40 +0000 Subject: [PATCH] gpu: nvgpu: Remove dependency of gpu next Remove dependency of GPU next repo as this is not used from release perspective of the nvgpu. Bug 4170369 Change-Id: I4959948e8f6e966eccc4bd369d5b7348bfb1b739 Signed-off-by: Laxman Dewangan Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2929688 Reviewed-by: svcacv Reviewed-by: Sagar Kamble Reviewed-by: Jonathan Hunter --- drivers/gpu/nvgpu/Makefile.sources | 4 ---- libs/Makefile.common.tmk | 12 +----------- userspace/units/Makefile.units.common.tmk | 4 +--- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index c143e1be7..2f99125e7 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources @@ -917,7 +917,3 @@ srcs += \ hal/grmgr/grmgr_ga100.c endif endif - -srctree.nvgpu-next := $(NV_SOURCE)/kernel/nvgpu-next -include $(srctree.nvgpu-next)/drivers/gpu/nvgpu/Makefile.sources -srcs += $(addprefix ../../../../nvgpu-next/drivers/gpu/nvgpu/,$(srcs_next)) diff --git a/libs/Makefile.common.tmk b/libs/Makefile.common.tmk index 6650783e3..0e31f48a3 100644 --- a/libs/Makefile.common.tmk +++ b/libs/Makefile.common.tmk @@ -44,12 +44,9 @@ ARCH_PY := $(NV_SOURCE)/core-private/tools/arch/arch.py # # NVGPU_NEXT_SOURCE needs to be set for the Makefile.sources file to # properly handle include paths. -NVGPU_NEXT_SOURCE := $(NV_SOURCE)/kernel/nvgpu-next/drivers/gpu/nvgpu NVGPU_POSIX := 1 NVGPU_ARCH := $(NVGPU_SOURCE)/../../../arch -NVGPU_NEXT_ARCH := $(NVGPU_NEXT_SOURCE)/../../../arch -NVGPU_ARCH_YAML := $(NVGPU_ARCH)/*.yaml $(NVGPU_NEXT_ARCH)/*.yaml NV_COMPONENT_OWN_INTERFACE_DIR := . NV_COMPONENT_INCLUDES := \ @@ -59,10 +56,7 @@ NV_COMPONENT_INCLUDES := \ $(NV_SOURCE)/kernel/nvgpu/nvsched \ $(NV_SOURCE)/kernel/nvgpu/nvsched/include \ $(NV_SOURCE)/kernel/nvgpu/nvsched/include/nvs \ - $(NVGPU_SOURCE)/../../../include \ - $(NVGPU_NEXT_SOURCE) \ - $(NVGPU_NEXT_SOURCE)/include \ - $(NVGPU_NEXT_SOURCE)/../../../include + $(NVGPU_SOURCE)/../../../include ifneq ($(NV_BUILD_CONFIGURATION_OS_IS_QNX),1) NV_COMPONENT_SYSTEM_SHARED_LIBRARIES += pthread rt NVGPU_FORCE_SAFETY_PROFILE := 1 @@ -92,11 +86,9 @@ endif -include $(NVGPU_SOURCE)/Makefile.sources -include $(NV_SOURCE)/kernel/nvgpu/nvsched/Makefile.sources --include $(NVGPU_NEXT_SOURCE)/Makefile.sources NV_COMPONENT_SOURCES := \ $(addprefix $(NVGPU_SOURCE)/,$(srcs)) \ - $(addprefix $(NVGPU_NEXT_SOURCE)/,$(srcs_next)) \ $(addprefix $(NV_SOURCE)/kernel/nvgpu/nvsched/,$(NVS_SOURCES)) # $(srcs_next) already has the NV_COMPONENT_DIR prefix so we already have the @@ -123,8 +115,6 @@ nvgpu-arch: $(ARCH_PY) $(PYTHON2) $(ARCH_PY) \ --arch-file $(NVGPU_ARCH)/nvgpu.yaml \ --source $(NVGPU_SOURCE) \ - --source $(NVGPU_NEXT_SOURCE) \ - --include-path $(NVGPU_NEXT_ARCH) \ sources --check .PHONY: nvgpu-arch diff --git a/userspace/units/Makefile.units.common.tmk b/userspace/units/Makefile.units.common.tmk index 64a16fe86..a9c6a852c 100644 --- a/userspace/units/Makefile.units.common.tmk +++ b/userspace/units/Makefile.units.common.tmk @@ -52,9 +52,7 @@ NV_COMPONENT_INCLUDES += \ $(NV_SOURCE)/kernel/nvgpu/drivers/gpu/nvgpu/include \ $(NV_SOURCE)/kernel/nvgpu/nvsched/include \ $(NV_SOURCE)/kernel/nvgpu/drivers/gpu/nvgpu/include/external-nvs \ - $(NV_SOURCE)/kernel/nvgpu/drivers/gpu/nvgpu \ - $(NV_SOURCE)/kernel/nvgpu-next/drivers/gpu/nvgpu/include \ - $(NV_SOURCE)/kernel/nvgpu-next/drivers/gpu/nvgpu + $(NV_SOURCE)/kernel/nvgpu/drivers/gpu/nvgpu ifdef NVGPU_CFLAGS NV_COMPONENT_CFLAGS := \