nvdla: Clean-up local header include paths

The local DLA header files are located in the same directory as the
source files and so it is not necessary to append the 'nvdla' directory
to the header file path.

It is important to remove the 'nvdla' directory from the header path
because then when building NVDLA as an external module, we can disable
the Makefile search path "$(srctree.nvidia)/drivers/video/tegra/host"
and ensure that headers that are outside of NVDLA directory are not
being included.

Bug 3530486

Change-Id: I44ee3e515bd604f91d40ee4479a56ead022ba05f
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2665591
Reviewed-by: svcacv <svcacv@nvidia.com>
Reviewed-by: Arvind M <am@nvidia.com>
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-mobile-cert <svc-mobile-cert@nvidia.com>
Reviewed-by: svc_kernel_abi <svc_kernel_abi@nvidia.com>
Reviewed-by: Amit Sharma (SW-TEGRA) <amisharma@nvidia.com>
Reviewed-by: Praveen K <kpraveen@nvidia.com>
GVS: Gerrit_Virtual_Submit
This commit is contained in:
Jon Hunter
2022-02-03 14:49:14 +00:00
committed by Laxman Dewangan
parent 13b677a0b5
commit 1c9a3507d5
7 changed files with 24 additions and 24 deletions

View File

@@ -29,15 +29,15 @@
#include <linux/version.h> #include <linux/version.h>
#include <linux/nvmem-consumer.h> #include <linux/nvmem-consumer.h>
#include <soc/tegra/fuse-helper.h> #include <soc/tegra/fuse-helper.h>
#include "nvdla/nvdla.h"
#include "nvdla/nvdla_hw_flcn.h"
#include "nvdla/nvdla_t194.h"
#include "nvdla/nvdla_t234.h"
#include "nvdla/dla_queue.h"
#include "nvdla/nvdla_buffer.h"
#include "nvdla/nvdla_debug.h"
#include <uapi/linux/nvhost_nvdla_ioctl.h> #include <uapi/linux/nvhost_nvdla_ioctl.h>
#include "nvdla.h"
#include "nvdla_hw_flcn.h"
#include "nvdla_t194.h"
#include "nvdla_t234.h"
#include "dla_queue.h"
#include "nvdla_buffer.h"
#include "nvdla_debug.h"
#include "dla_os_interface.h" #include "dla_os_interface.h"
/* /*

View File

@@ -24,7 +24,7 @@
#include <linux/version.h> #include <linux/version.h>
#include "dla_os_interface.h" #include "dla_os_interface.h"
#include "nvdla/nvdla.h" #include "nvdla.h"
#include "nvdla_debug.h" #include "nvdla_debug.h"
/* /*

View File

@@ -1,7 +1,7 @@
/* /*
* NVDLA debug utils header * NVDLA debug utils header
* *
* Copyright (c) 2016 - 2018, NVIDIA Corporation. All rights reserved. * Copyright (c) 2016-2022, NVIDIA Corporation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License, * under the terms and conditions of the GNU General Public License,
@@ -24,7 +24,7 @@
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/nvhost.h> #include <linux/nvhost.h>
#include "nvdla/nvdla.h" #include "nvdla.h"
enum nvdla_dbg_categories { enum nvdla_dbg_categories {
debug_err = BIT(0), /* error logs */ debug_err = BIT(0), /* error logs */

View File

@@ -23,10 +23,10 @@
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include "nvdla/nvdla.h" #include "nvdla.h"
#include "nvdla/dla_queue.h" #include "dla_queue.h"
#include "nvdla/nvdla_buffer.h" #include "nvdla_buffer.h"
#include "nvdla/nvdla_debug.h" #include "nvdla_debug.h"
#include <uapi/linux/nvdev_fence.h> #include <uapi/linux/nvdev_fence.h>
#include <uapi/linux/nvhost_ioctl.h> #include <uapi/linux/nvhost_ioctl.h>

View File

@@ -31,9 +31,9 @@
#include "t194/hardware_t194.h" #include "t194/hardware_t194.h"
#endif #endif
#include "nvdla/nvdla.h" #include "nvdla.h"
#include "nvdla/dla_queue.h" #include "dla_queue.h"
#include "nvdla/nvdla_debug.h" #include "nvdla_debug.h"
#include "dla_os_interface.h" #include "dla_os_interface.h"
#define NVDLA_QUEUE_ABORT_TIMEOUT 10000 /* 10 sec */ #define NVDLA_QUEUE_ABORT_TIMEOUT 10000 /* 10 sec */

View File

@@ -9,9 +9,9 @@
#include <linux/nvhost.h> #include <linux/nvhost.h>
#include <linux/platform/tegra/emc_bwmgr.h> #include <linux/platform/tegra/emc_bwmgr.h>
#include "nvdla/nvdla.h" #include "nvdla.h"
#include "nvdla/nvdla_cg_regs.h" #include "nvdla_cg_regs.h"
#include "nvdla/dla_t19x_fw_version.h" #include "dla_t19x_fw_version.h"
struct nvhost_device_data t19_nvdla0_info = { struct nvhost_device_data t19_nvdla0_info = {
.devfs_name_family = "nvdla", .devfs_name_family = "nvdla",

View File

@@ -9,9 +9,9 @@
#include <linux/nvhost.h> #include <linux/nvhost.h>
#include <dt-bindings/interconnect/tegra_icc_id.h> #include <dt-bindings/interconnect/tegra_icc_id.h>
#include "nvdla/nvdla.h" #include "nvdla.h"
#include "nvdla/nvdla_cg_regs.h" #include "nvdla_cg_regs.h"
#include "nvdla/dla_t23x_fw_version.h" #include "dla_t23x_fw_version.h"
struct nvhost_device_data t23x_nvdla0_info = { struct nvhost_device_data t23x_nvdla0_info = {
.devfs_name_family = "nvdla", .devfs_name_family = "nvdla",