gpu: nvgpu: Add gm204/gm206 ACR BL supoort

Update ACR BL desc & support for ACR boot.

JIRA DNVGPU-10

Change-Id: Iced2e10695439b2e1b47835f5c3c8a5d274e4b1e
Signed-off-by: Mahantesh Kumbar <mkumbar@nvidia.com>
Reviewed-on: http://git-master/r/1155027
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/gpu/nvgpu/acr.h b/drivers/gpu/nvgpu/acr.h
index ad859858..2a3ece7b 100644
--- a/drivers/gpu/nvgpu/acr.h
+++ b/drivers/gpu/nvgpu/acr.h
@@ -16,6 +16,7 @@
 
 #include "gm20b/mm_gm20b.h"
 #include "gm20b/acr_gm20b.h"
+#include "gm206/acr_gm206.h"
 
 struct acr_desc {
         struct mem_desc ucode_blob;
@@ -29,7 +30,10 @@ struct acr_desc {
         struct mem_desc acr_ucode;
         const struct firmware *hsbl_fw;
         struct mem_desc hsbl_ucode;
-        struct flcn_bl_dmem_desc bl_dmem_desc;
+        union {
+                struct flcn_bl_dmem_desc bl_dmem_desc;
+                struct flcn_bl_dmem_desc_v1 bl_dmem_desc_v1;
+        };
         const struct firmware *pmu_fw;
         const struct firmware *pmu_desc;
         u32 capabilities;