3 files changed, 46 insertions, 13 deletions

diff --git a/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c
index 99c7e8b3..996fd251 100644
--- a/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c
+++ b/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c
@@ -110,6 +110,8 @@ static void gk20a_tegra_secure_page_destroy(struct device *dev,
         dma_free_attrs(&tegra_vpr_dev, secure_buffer->size,
                         (void *)(uintptr_t)secure_buffer->iova,
                         secure_buffer->iova, __DMA_ATTR(attrs));
+
+        secure_buffer->destroy = NULL;
 }
 
 int gk20a_tegra_secure_page_alloc(struct device *dev)
@@ -153,7 +155,7 @@ static void gk20a_tegra_secure_destroy(struct gk20a *g,
         }
 }
 
-int gk20a_tegra_secure_alloc(struct device *dev,
+static int gk20a_tegra_secure_alloc(struct device *dev,
                              struct gr_ctx_buffer_desc *desc,
                              size_t size)
 {
@@ -164,9 +166,6 @@ int gk20a_tegra_secure_alloc(struct device *dev,
         struct page *page;
         int err = 0;
 
-        if (!platform->secure_alloc_ready)
-                return -EINVAL;
-
         dma_set_attr(DMA_ATTR_NO_KERNEL_MAPPING, __DMA_ATTR(attrs));
         (void)dma_alloc_attrs(&tegra_vpr_dev, size, &iova,
                                       GFP_KERNEL, __DMA_ATTR(attrs));
@@ -194,6 +193,9 @@ int gk20a_tegra_secure_alloc(struct device *dev,
         desc->mem.size = size;
         desc->mem.aperture = APERTURE_SYSMEM;
 
+        if (platform->secure_buffer.destroy)
+                platform->secure_buffer.destroy(dev, &platform->secure_buffer);
+
         return err;
 
 fail_sgt:
@@ -896,6 +898,11 @@ void gk20a_tegra_idle(struct device *dev)
 #endif
 }
 
+void gk20a_tegra_init_secure_alloc(struct gk20a *g)
+{
+        g->ops.mm.secure_alloc = gk20a_tegra_secure_alloc;
+}
+
 static int gk20a_tegra_probe(struct device *dev)
 {
         struct gk20a_platform *platform = dev_get_drvdata(dev);
@@ -974,6 +981,7 @@ static int gk20a_tegra_probe(struct device *dev)
 
         gk20a_tegra_get_clocks(dev);
         nvgpu_linux_init_clk_support(platform->g);
+        gk20a_tegra_init_secure_alloc(platform->g);
 
         if (platform->clk_register) {
                 ret = platform->clk_register(platform->g);
@@ -988,8 +996,11 @@ static int gk20a_tegra_probe(struct device *dev)
         return 0;
 }
 
-static int gk20a_tegra_late_probe(struct device *dev)
+int gk20a_tegra_late_probe(struct device *dev)
 {
+        /* Cause early VPR resize */
+        gk20a_tegra_secure_page_alloc(dev);
+
         /* Initialise tegra specific scaling quirks */
         gk20a_tegra_scale_init(dev);
 
@@ -1085,8 +1096,6 @@ struct gk20a_platform gk20a_tegra_platform = {
         .devfreq_governor = "nvhost_podgov",
         .qos_notify = gk20a_scale_qos_notify,
 
-        .secure_alloc = gk20a_tegra_secure_alloc,
-        .secure_page_alloc = gk20a_tegra_secure_page_alloc,
         .dump_platform_dependencies = gk20a_tegra_debug_dump,
 
         .soc_name = "tegra12x",
@@ -1157,8 +1166,6 @@ struct gk20a_platform gm20b_tegra_platform = {
         .devfreq_governor = "nvhost_podgov",
         .qos_notify = gk20a_scale_qos_notify,
 
-        .secure_alloc = gk20a_tegra_secure_alloc,
-        .secure_page_alloc = gk20a_tegra_secure_page_alloc,
         .dump_platform_dependencies = gk20a_tegra_debug_dump,
 
         .has_cde = true,
diff --git a/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.h b/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.h
new file mode 100644
index 00000000..1aa7c1e3
--- /dev/null
+++ b/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.h
@@ -0,0 +1,25 @@
+/*
+ * GK20A Platform (SoC) Interface
+ *
+ * Copyright (c) 2014-2017, 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,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ */
+
+#ifndef _NVGPU_PLATFORM_GK20A_TEGRA_H_
+#define _NVGPU_PLATFORM_GK20A_TEGRA_H_
+
+struct device;
+struct gk20a;
+
+void gk20a_tegra_init_secure_alloc(struct gk20a *g);
+int gk20a_tegra_secure_page_alloc(struct device *dev);
+
+#endif
diff --git a/drivers/gpu/nvgpu/tegra/linux/platform_gp10b_tegra.c b/drivers/gpu/nvgpu/tegra/linux/platform_gp10b_tegra.c
index 77b4b536..138b8fda 100644
--- a/drivers/gpu/nvgpu/tegra/linux/platform_gp10b_tegra.c
+++ b/drivers/gpu/nvgpu/tegra/linux/platform_gp10b_tegra.c
@@ -36,7 +36,7 @@
 #include "gk20a/gk20a.h"
 #include "gk20a/gk20a_scale.h"
 
-#include "platform_tegra.h"
+#include "platform_gk20a_tegra.h"
 #include "gp10b/gp10b_sysfs.h"
 #include "gp10b/platform_gp10b.h"
 
@@ -163,12 +163,16 @@ static int gp10b_tegra_probe(struct device *dev)
 
         gp10b_tegra_get_clocks(dev);
         nvgpu_linux_init_clk_support(platform->g);
+        gk20a_tegra_init_secure_alloc(platform->g);
 
         return 0;
 }
 
 static int gp10b_tegra_late_probe(struct device *dev)
 {
+        /* Cause early VPR resize */
+        gk20a_tegra_secure_page_alloc(dev);
+
         /*Create GP10B specific sysfs*/
         gp10b_create_sysfs(dev);
 
@@ -423,9 +427,6 @@ struct gk20a_platform gp10b_tegra_platform = {
 
         .qos_notify = gk20a_scale_qos_notify,
 
-        .secure_alloc = gk20a_tegra_secure_alloc,
-        .secure_page_alloc = gk20a_tegra_secure_page_alloc,
-
         .reset_assert = gp10b_tegra_reset_assert,
         .reset_deassert = gp10b_tegra_reset_deassert,