gpu: nvgpu: Fold T19x code back to main code paths

Lots of code paths were split to T19x specific code paths and structs
due to split repository. Now that repositories are merged, fold all of
them back to main code paths and structs and remove the T19x specific
Kconfig flag.

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

1 files changed, 3 insertions, 7 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/os_linux.h b/drivers/gpu/nvgpu/common/linux/os_linux.h
index 9b95ed84..a2181c05 100644
--- a/drivers/gpu/nvgpu/common/linux/os_linux.h
+++ b/drivers/gpu/nvgpu/common/linux/os_linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -20,9 +20,6 @@
 #include <linux/cdev.h>
 #include <linux/iommu.h>
 
-#ifdef CONFIG_TEGRA_19x_GPU
-#include <nvgpu/linux/os_linux_t19x.h>
-#endif
 #include "gk20a/gk20a.h"
 #include "cde.h"
 #include "sched.h"
@@ -114,9 +111,8 @@ struct nvgpu_os_linux {
         void __iomem *bar1;
         void __iomem *bar1_saved;
 
-#ifdef CONFIG_TEGRA_19x_GPU
-        struct nvgpu_os_linux_t19x t19x;
-#endif
+        void __iomem *usermode_regs;
+        void __iomem *usermode_regs_saved;
 
         struct nvgpu_os_linux_ops ops;