gpu: nvgpu: Define GPUIDs without referring to UAPI

Define GPUIDs without referring to constants defined in
<linux/uapi/nvgpu.h>.

JIRA NVGPU-259

Change-Id: I87a677cb0d3377b718dc3aa90175db002df59c9d
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1587280
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 6 insertions, 12 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 65c3b56f..dca27887 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -1412,18 +1412,12 @@ int gk20a_wait_for_idle(struct gk20a *g);
  * arch/impl fields */
 #define GK20A_GPUID(arch, impl) ((u32) ((arch) | (impl)))
 
-#define GK20A_GPUID_GK20A \
-        GK20A_GPUID(NVGPU_GPU_ARCH_GK100, NVGPU_GPU_IMPL_GK20A)
-#define GK20A_GPUID_GM20B \
-        GK20A_GPUID(NVGPU_GPU_ARCH_GM200, NVGPU_GPU_IMPL_GM20B)
-#define NVGPU_GPUID_GP10B \
-        GK20A_GPUID(NVGPU_GPU_ARCH_GP100, NVGPU_GPU_IMPL_GP10B)
-#define GK20A_GPUID_GM20B_B \
-        GK20A_GPUID(NVGPU_GPU_ARCH_GM200, NVGPU_GPU_IMPL_GM20B_B)
-#define NVGPU_GPUID_GP104 \
-        GK20A_GPUID(NVGPU_GPU_ARCH_GP100, NVGPU_GPU_IMPL_GP104)
-#define NVGPU_GPUID_GP106 \
-        GK20A_GPUID(NVGPU_GPU_ARCH_GP100, NVGPU_GPU_IMPL_GP106)
+#define GK20A_GPUID_GK20A   0x000000EA
+#define GK20A_GPUID_GM20B   0x0000012B
+#define GK20A_GPUID_GM20B_B 0x0000012E
+#define NVGPU_GPUID_GP10B   0x0000013B
+#define NVGPU_GPUID_GP104   0x00000134
+#define NVGPU_GPUID_GP106   0x00000136
 
 int gk20a_init_gpu_characteristics(struct gk20a *g);