gpu: nvgpu: Remove nvgpu_gpuid_t18x.h

Remove nvgpu_gpuid_t18x.h since this file is now visible. Migrate
the relevant definitions and defines into their expected places and
make the code use the real defines. No longer is hiding t18x specific
stuff necessary.

Bug 1799159

Change-Id: I47fa2392e46fdb7aacc70aeb0cc8c3f5ca0dc22f
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1300976
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

2 files changed, 6 insertions, 10 deletions

diff --git a/include/uapi/linux/nvgpu-t18x.h b/include/uapi/linux/nvgpu-t18x.h
index 777f1553..16cbd81e 100644
--- a/include/uapi/linux/nvgpu-t18x.h
+++ b/include/uapi/linux/nvgpu-t18x.h
@@ -24,11 +24,6 @@
 #ifndef _UAPI__LINUX_NVGPU_T18X_IOCTL_H_
 #define _UAPI__LINUX_NVGPU_T18X_IOCTL_H_
 
-#define NVGPU_GPU_ARCH_GP100 0x00000130
-#define NVGPU_GPU_IMPL_GP104 0x00000004
-#define NVGPU_GPU_IMPL_GP106 0x00000006
-#define NVGPU_GPU_IMPL_GP10B 0x0000000B
-
 /*
  * this flag is used in struct nvgpu_as_map_buffer_ex_args
  * to specify IO coherence
@@ -70,5 +65,3 @@
 #define NVGPU_IOCTL_CHANNEL_EVENT_ID_CILP_PREEMPTION_COMPLETE   4
 
 #endif /* _UAPI__LINUX_NVGPU_T18X_IOCTL_H_ */
-
-
diff --git a/include/uapi/linux/nvgpu.h b/include/uapi/linux/nvgpu.h
index 6101774f..3f358558 100644
--- a/include/uapi/linux/nvgpu.h
+++ b/include/uapi/linux/nvgpu.h
@@ -81,14 +81,17 @@ struct nvgpu_gpu_zbc_query_table_args {
 
 /* This contains the minimal set by which the userspace can
    determine all the properties of the GPU */
-
 #define NVGPU_GPU_ARCH_GK100 0x000000E0
-#define NVGPU_GPU_IMPL_GK20A 0x0000000A
-
 #define NVGPU_GPU_ARCH_GM200 0x00000120
+#define NVGPU_GPU_ARCH_GP100 0x00000130
+
+#define NVGPU_GPU_IMPL_GK20A 0x0000000A
 #define NVGPU_GPU_IMPL_GM204 0x00000004
 #define NVGPU_GPU_IMPL_GM206 0x00000006
 #define NVGPU_GPU_IMPL_GM20B 0x0000000B
+#define NVGPU_GPU_IMPL_GP104 0x00000004
+#define NVGPU_GPU_IMPL_GP106 0x00000006
+#define NVGPU_GPU_IMPL_GP10B 0x0000000B
 
 #ifdef CONFIG_ARCH_TEGRA_18x_SOC
 #include <linux/nvgpu-t18x.h>