diff --git a/drivers/video/tegra/host/pva/Makefile b/drivers/video/tegra/host/pva/Makefile index cb1ea5ec..ee79823d 100644 --- a/drivers/video/tegra/host/pva/Makefile +++ b/drivers/video/tegra/host/pva/Makefile @@ -1,25 +1,14 @@ -ifeq ($(CONFIG_TEGRA_OOT_MODULE),m) -NVPVA_OOT = y -NVPVA_OBJ = m -else -NVPVA_OBJ = $(CONFIG_TEGRA_GRHOST_PVA) -endif +# SPDX-License-Identifier: GPL-2.0-only +# Copyright (c) 2023, NVIDIA CORPORATION. All rights reserved. GCOV_PROFILE := y -ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host/pva -ccflags-y += -I$(srctree.nvidia)/drivers/video/tegra/host/pva/fw_include -ccflags-y += -I$(srctree.nvidia)/include -ccflags-y += -I$(srctree.nvidia)/include/linux +ccflags-y += -I$(srctree.nvidia-oot)/drivers/video/tegra/host/pva +ccflags-y += -I$(srctree.nvidia-oot)/drivers/video/tegra/host/pva/fw_include ccflags-y += -Werror -# When using the upstream host1x driver, the Makefile must define the -# srctree.host1x path in order to find the necessary header files for -# the upstream host1x driver. -ccflags-$(NVPVA_OOT) += -I$(srctree.host1x)/include -ccflags-$(NVPVA_OOT) += -DCONFIG_TEGRA_HOST1X -ccflags-$(NVPVA_OOT) += -DCONFIG_TEGRA_FUSE_UPSTREAM -ccflags-$(NVPVA_OOT) += -DTEGRA_OOT_MODULE - +ccflags-y += -DCONFIG_TEGRA_HOST1X +ccflags-y += -DCONFIG_TEGRA_FUSE_UPSTREAM +ccflags-y += -DTEGRA_OOT_MODULE nvhost-pva-objs = \ pva.o \ @@ -54,5 +43,5 @@ nvhost-pva-objs = \ pva_ccq_t23x.o \ pva_sec_ec.o -obj-$(NVPVA_OBJ) += nvhost-pva.o +obj-m += nvhost-pva.o diff --git a/include/trace/events/nvhost_pva.h b/include/trace/events/nvhost_pva.h index 3a243dd5..b889b88c 100644 --- a/include/trace/events/nvhost_pva.h +++ b/include/trace/events/nvhost_pva.h @@ -244,11 +244,5 @@ TRACE_EVENT(nvhost_pva_task_timestamp, #endif /* _TRACE_NVHOST_PVA_H */ -/* This part must be outside protection */ -#undef TRACE_INCLUDE_PATH -#undef TRACE_INCLUDE_FILE -#define TRACE_INCLUDE_PATH ../../include/trace/events - -#define TRACE_INCLUDE_FILE nvhost_pva /* This part must be outside protection */ #include