gpu: nvgpu: Add support for gm204 and gm206

Add support for chips gm204 and gm206. Adds also support for reading
VBIOS and booting devinit and pre-os images on PMU.

Change-Id: I4824b44245611e5379ace62793cc37158048f432
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1120467
GVS: Gerrit_Virtual_Submit
Reviewed-by: Ken Adams <kadams@nvidia.com>

1 files changed, 11 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/hal.c b/drivers/gpu/nvgpu/gk20a/hal.c
index 16ba4a03..52ec108b 100644
--- a/drivers/gpu/nvgpu/gk20a/hal.c
+++ b/drivers/gpu/nvgpu/gk20a/hal.c
@@ -16,6 +16,7 @@
 #include "gk20a.h"
 #include "hal_gk20a.h"
 #include "gm20b/hal_gm20b.h"
+#include "gm206/hal_gm206.h"
 
 #ifdef CONFIG_ARCH_TEGRA_18x_SOC
 #include "nvgpu_gpuid_t18x.h"
@@ -38,11 +39,21 @@ int gpu_init_hal(struct gk20a *g)
                 if (gm20b_init_hal(g))
                         return -ENODEV;
                 break;
+        case GK20A_GPUID_GM204:
+        case GK20A_GPUID_GM206:
+                gk20a_dbg_info("gm20x detected");
+                if (gm206_init_hal(g))
+                        return -ENODEV;
+                break;
 #if defined(CONFIG_ARCH_TEGRA_18x_SOC)
         case TEGRA_18x_GPUID:
                 if (TEGRA_18x_GPUID_HAL(g))
                         return -ENODEV;
                 break;
+        case TEGRA_18x_GPUID2:
+                if (TEGRA_18x_GPUID2_HAL(g))
+                        return -ENODEV;
+                break;
 #endif
 #if defined(CONFIG_ARCH_TEGRA_19x_SOC)
         case TEGRA_19x_GPUID: