gpu: nvgpu: use correct config for t19x

Use TEGRA_19x_GPU config instead of ARCH_TEGRA_19x_SOC for
t19x functionality. This config will defined only when gpu
repository for t19x is available.

Bug 1757988

Change-Id: I53421f31cbed49a2fb24085c150599c78b8158c0
Signed-off-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-on: http://git-master/r/1158183
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile
index 13a35f76..b0bb4176 100644
--- a/drivers/gpu/nvgpu/Makefile
+++ b/drivers/gpu/nvgpu/Makefile
@@ -16,7 +16,7 @@ ccflags-y += -I$(srctree)/../nvgpu-t18x/include
 ccflags-y += -I$(srctree)/../nvgpu-t18x/include/uapi
 endif
 
-ifeq ($(CONFIG_ARCH_TEGRA_19x_SOC),y)
+ifeq ($(CONFIG_TEGRA_19x_GPU),y)
 ccflags-y += -I$(srctree)/../nvgpu-t19x/drivers/gpu/nvgpu
 ccflags-y += -I$(srctree)/../nvgpu-t19x/include
 ccflags-y += -I$(srctree)/../nvgpu-t19x/include/uapi
@@ -117,7 +117,7 @@ include $(srctree)/../nvgpu-t18x/drivers/gpu/nvgpu/Makefile
 endif
 endif
 
-ifeq ($(CONFIG_ARCH_TEGRA_19x_SOC),y)
+ifeq ($(CONFIG_TEGRA_19x_GPU),y)
 ifneq ($(wildcard $(srctree)/../nvgpu-t19x/drivers/gpu/nvgpu/Makefile),)
 include $(srctree)/../nvgpu-t19x/drivers/gpu/nvgpu/Makefile
 endif
diff --git a/include/uapi/linux/nvgpu.h b/include/uapi/linux/nvgpu.h
index 8b4c4549..03173339 100644
--- a/include/uapi/linux/nvgpu.h
+++ b/include/uapi/linux/nvgpu.h
@@ -94,7 +94,7 @@ struct nvgpu_gpu_zbc_query_table_args {
 #include <linux/nvgpu-t18x.h>
 #endif
 
-#ifdef CONFIG_ARCH_TEGRA_19x_SOC
+#ifdef CONFIG_TEGRA_19x_GPU
 #include <linux/nvgpu-t19x.h>
 #endif