From 0b6eff29656a4ee3d3d0bf94fd6a6328ded4ac7a Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Mon, 19 Jun 2017 14:23:16 -0700 Subject: 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 Reviewed-on: http://git-master/r/1505179 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'drivers/gpu/nvgpu/tegra/linux') 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) #define MHZ_TO_HZ(x) ((x) * 1000000) #define HZ_TO_MHZ(x) ((x) / 1000000) -static void gk20a_tegra_secure_page_destroy(struct device *dev, +static void gk20a_tegra_secure_page_destroy(struct gk20a *g, struct secure_page_buffer *secure_buffer) { DEFINE_DMA_ATTRS(attrs); @@ -148,10 +148,11 @@ static void gk20a_tegra_secure_destroy(struct gk20a *g, } } -static int gk20a_tegra_secure_alloc(struct device *dev, +static int gk20a_tegra_secure_alloc(struct gk20a *g, struct gr_ctx_buffer_desc *desc, size_t size) { + struct device *dev = dev_from_gk20a(g); struct gk20a_platform *platform = dev_get_drvdata(dev); DEFINE_DMA_ATTRS(attrs); dma_addr_t iova; @@ -187,7 +188,7 @@ static int gk20a_tegra_secure_alloc(struct device *dev, desc->mem.aperture = APERTURE_SYSMEM; if (platform->secure_buffer.destroy) - platform->secure_buffer.destroy(dev, &platform->secure_buffer); + platform->secure_buffer.destroy(g, &platform->secure_buffer); return err; -- cgit v1.2.2