From 6bef424e1e5f7c29be2ea01844440cee9342a668 Mon Sep 17 00:00:00 2001 From: Jon Hunter Date: Fri, 30 Sep 2022 15:04:51 +0100 Subject: [PATCH] gpu: nvgpu: Update include paths for OOT module When building NVGPU as an OOT module for upstream Linux kernels, the NVGPU driver source is now copied into a common location with all the other OOT modules. Therefore, we can now use the 'srctree.nvidia' path for finding the necessary header files for Host1x and NVMAP. Update the include search paths to use 'srctree.nvidia' when building NVGPU as an OOT module. Bug 3817518 Change-Id: I63066e4331c66a0f47ada83fde3e63402faaf38a Signed-off-by: Jon Hunter Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2785910 Tested-by: mobile promotions Reviewed-by: mobile promotions --- drivers/gpu/nvgpu/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index b77db1c75..caa6c3f8d 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile @@ -39,7 +39,7 @@ endif # srctree.host1x path in order to find the necessary header files for # the upstream host1x driver. ifeq ($(CONFIG_TEGRA_GK20A_NVHOST_HOST1X),y) -ccflags-y += -I$(srctree.host1x)/include +ccflags-y += -I$(srctree.nvidia)/drivers/gpu/host1x/include endif # When using the upstream nvmap driver, the Makefile must define the @@ -47,7 +47,7 @@ endif # the upstream nvmap driver. ifeq ($(CONFIG_NVGPU_NVMAP_NEXT),y) ifeq ($(origin srctree.nvmap), undefined) -srctree.nvmap := $(abspath $(shell dirname $(lastword $(MAKEFILE_LIST)))/../../../../nvidia/drivers/video/tegra/nvmap) +srctree.nvmap := $(srctree.nvidia)/drivers/video/tegra/nvmap endif ccflags-y += -I$(srctree.nvmap)/include endif