From 9e3566a35bd241f038a7593f2c6418099232d9f6 Mon Sep 17 00:00:00 2001 From: Debarshi Dutta Date: Fri, 24 Sep 2021 11:46:12 +0530 Subject: [PATCH] gpu: nvgpu: move netlist_defs.h to include/ According to nvgpu coding guidelines, common headers should be put in include/ directory. Updated accordingly Change-Id: I448c562734616cb6b7ff5496094a3abb65e0d7df Signed-off-by: Debarshi Dutta Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2599899 (cherry picked from commit 80f12d84015a433bbca2580f300d77c39d69097a) Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2633417 Tested-by: mobile promotions Reviewed-by: mobile promotions --- arch/nvgpu-common.yaml | 2 +- drivers/gpu/nvgpu/common/netlist/netlist.c | 2 +- drivers/gpu/nvgpu/hal/netlist/netlist_ga100.h | 4 ++-- drivers/gpu/nvgpu/hal/netlist/netlist_ga10b.h | 2 +- drivers/gpu/nvgpu/hal/netlist/netlist_gm20b.h | 4 ++-- drivers/gpu/nvgpu/hal/netlist/netlist_gp10b.h | 4 ++-- drivers/gpu/nvgpu/hal/netlist/netlist_gv100.h | 4 ++-- drivers/gpu/nvgpu/hal/netlist/netlist_gv11b.h | 4 ++-- drivers/gpu/nvgpu/hal/netlist/netlist_tu104.h | 4 ++-- .../nvgpu/{common/netlist => include/nvgpu}/netlist_defs.h | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) rename drivers/gpu/nvgpu/{common/netlist => include/nvgpu}/netlist_defs.h (95%) diff --git a/arch/nvgpu-common.yaml b/arch/nvgpu-common.yaml index 1524c9fff..ef2752a8e 100644 --- a/arch/nvgpu-common.yaml +++ b/arch/nvgpu-common.yaml @@ -153,7 +153,7 @@ netlist: owner: Seshendra G sources: [ common/netlist/netlist.c, common/netlist/netlist_priv.h, - common/netlist/netlist_defs.h, + include/nvgpu/netlist_defs.h, include/nvgpu/netlist.h ] nvlink: diff --git a/drivers/gpu/nvgpu/common/netlist/netlist.c b/drivers/gpu/nvgpu/common/netlist/netlist.c index 697ce0fc5..eaa195b3c 100644 --- a/drivers/gpu/nvgpu/common/netlist/netlist.c +++ b/drivers/gpu/nvgpu/common/netlist/netlist.c @@ -30,10 +30,10 @@ #include #include #include +#include #include #include "netlist_priv.h" -#include "netlist_defs.h" /* * Need to support multiple ARCH in same GPU family diff --git a/drivers/gpu/nvgpu/hal/netlist/netlist_ga100.h b/drivers/gpu/nvgpu/hal/netlist/netlist_ga100.h index d8ad5a464..7b0953578 100644 --- a/drivers/gpu/nvgpu/hal/netlist/netlist_ga100.h +++ b/drivers/gpu/nvgpu/hal/netlist/netlist_ga100.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2020-2021, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -23,7 +23,7 @@ #define NVGPU_NETLIST_GA100_H #include -#include "common/netlist/netlist_defs.h" +#include struct gk20a; diff --git a/drivers/gpu/nvgpu/hal/netlist/netlist_ga10b.h b/drivers/gpu/nvgpu/hal/netlist/netlist_ga10b.h index 5f7dc51c6..dfe5dfc08 100644 --- a/drivers/gpu/nvgpu/hal/netlist/netlist_ga10b.h +++ b/drivers/gpu/nvgpu/hal/netlist/netlist_ga10b.h @@ -23,7 +23,7 @@ #define NVGPU_NETLIST_GA10B_H #include -#include "common/netlist/netlist_defs.h" +#include struct gk20a; diff --git a/drivers/gpu/nvgpu/hal/netlist/netlist_gm20b.h b/drivers/gpu/nvgpu/hal/netlist/netlist_gm20b.h index 275b56f56..80212a707 100644 --- a/drivers/gpu/nvgpu/hal/netlist/netlist_gm20b.h +++ b/drivers/gpu/nvgpu/hal/netlist/netlist_gm20b.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2019, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2014-2021, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -23,7 +23,7 @@ #define NVGPU_NETLIST_GM20B_H #include -#include "common/netlist/netlist_defs.h" +#include struct gk20a; diff --git a/drivers/gpu/nvgpu/hal/netlist/netlist_gp10b.h b/drivers/gpu/nvgpu/hal/netlist/netlist_gp10b.h index c745dd0ee..9ae771d6c 100644 --- a/drivers/gpu/nvgpu/hal/netlist/netlist_gp10b.h +++ b/drivers/gpu/nvgpu/hal/netlist/netlist_gp10b.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2019, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2015-2021, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -23,7 +23,7 @@ #define NVGPU_NETLIST_GP10B_H #include -#include "common/netlist/netlist_defs.h" +#include struct gk20a; diff --git a/drivers/gpu/nvgpu/hal/netlist/netlist_gv100.h b/drivers/gpu/nvgpu/hal/netlist/netlist_gv100.h index 14ce7eb96..e8e37253a 100644 --- a/drivers/gpu/nvgpu/hal/netlist/netlist_gv100.h +++ b/drivers/gpu/nvgpu/hal/netlist/netlist_gv100.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2017-2021, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -23,7 +23,7 @@ #define NVGPU_NETLIST_GV100_H #include -#include "common/netlist/netlist_defs.h" +#include struct gk20a; diff --git a/drivers/gpu/nvgpu/hal/netlist/netlist_gv11b.h b/drivers/gpu/nvgpu/hal/netlist/netlist_gv11b.h index 252386029..2a908d443 100644 --- a/drivers/gpu/nvgpu/hal/netlist/netlist_gv11b.h +++ b/drivers/gpu/nvgpu/hal/netlist/netlist_gv11b.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 - 2019, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2016 - 2021, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -23,7 +23,7 @@ #define NVGPU_NETLIST_GV11B_H #include -#include "common/netlist/netlist_defs.h" +#include struct gk20a; diff --git a/drivers/gpu/nvgpu/hal/netlist/netlist_tu104.h b/drivers/gpu/nvgpu/hal/netlist/netlist_tu104.h index 0b9b10356..069cf1db0 100644 --- a/drivers/gpu/nvgpu/hal/netlist/netlist_tu104.h +++ b/drivers/gpu/nvgpu/hal/netlist/netlist_tu104.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2018-2021, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -23,7 +23,7 @@ #define NVGPU_NETLIST_TU104_H #include -#include "common/netlist/netlist_defs.h" +#include struct gk20a; diff --git a/drivers/gpu/nvgpu/common/netlist/netlist_defs.h b/drivers/gpu/nvgpu/include/nvgpu/netlist_defs.h similarity index 95% rename from drivers/gpu/nvgpu/common/netlist/netlist_defs.h rename to drivers/gpu/nvgpu/include/nvgpu/netlist_defs.h index 219531aa2..ffd4e6300 100644 --- a/drivers/gpu/nvgpu/common/netlist/netlist_defs.h +++ b/drivers/gpu/nvgpu/include/nvgpu/netlist_defs.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2019-2021, NVIDIA CORPORATION. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"),