summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/tegra
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2017-06-19 17:23:16 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-06-20 14:35:34 -0400
commit0b6eff29656a4ee3d3d0bf94fd6a6328ded4ac7a (patch)
treecb1616dcada7646deef27e1bfec789be73ae927b /drivers/gpu/nvgpu/tegra
parent9f65627d0edaa45d914d2d180caf1b687e3c0d09 (diff)
gpu: nvgpu: Pass struct gk20a to secure alloc
Pass struct gk20a to secure alloc API instead of Linux specific struct device. JIRA NVGPU-38 Change-Id: I6d9afaeeff9b957351072caa29690f2caf58f858 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/1505179 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/tegra')
-rw-r--r--drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c
index c4216ffc..b0f6ee7d 100644
--- a/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c
+++ b/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c
@@ -95,7 +95,7 @@ static inline void __maybe_unused pmc_write(u32 val, unsigned long reg)
95#define MHZ_TO_HZ(x) ((x) * 1000000) 95#define MHZ_TO_HZ(x) ((x) * 1000000)
96#define HZ_TO_MHZ(x) ((x) / 1000000) 96#define HZ_TO_MHZ(x) ((x) / 1000000)
97 97
98static void gk20a_tegra_secure_page_destroy(struct device *dev, 98static void gk20a_tegra_secure_page_destroy(struct gk20a *g,
99 struct secure_page_buffer *secure_buffer) 99 struct secure_page_buffer *secure_buffer)
100{ 100{
101 DEFINE_DMA_ATTRS(attrs); 101 DEFINE_DMA_ATTRS(attrs);
@@ -148,10 +148,11 @@ static void gk20a_tegra_secure_destroy(struct gk20a *g,
148 } 148 }
149} 149}
150 150
151static int gk20a_tegra_secure_alloc(struct device *dev, 151static int gk20a_tegra_secure_alloc(struct gk20a *g,
152 struct gr_ctx_buffer_desc *desc, 152 struct gr_ctx_buffer_desc *desc,
153 size_t size) 153 size_t size)
154{ 154{
155 struct device *dev = dev_from_gk20a(g);
155 struct gk20a_platform *platform = dev_get_drvdata(dev); 156 struct gk20a_platform *platform = dev_get_drvdata(dev);
156 DEFINE_DMA_ATTRS(attrs); 157 DEFINE_DMA_ATTRS(attrs);
157 dma_addr_t iova; 158 dma_addr_t iova;
@@ -187,7 +188,7 @@ static int gk20a_tegra_secure_alloc(struct device *dev,
187 desc->mem.aperture = APERTURE_SYSMEM; 188 desc->mem.aperture = APERTURE_SYSMEM;
188 189
189 if (platform->secure_buffer.destroy) 190 if (platform->secure_buffer.destroy)
190 platform->secure_buffer.destroy(dev, &platform->secure_buffer); 191 platform->secure_buffer.destroy(g, &platform->secure_buffer);
191 192
192 return err; 193 return err;
193 194