From e32f62fadfcde413bcd9b5af61ad884e27ba2bf1 Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Thu, 6 Apr 2017 15:30:01 -0700 Subject: gpu: nvgpu: Move Linux nvgpu_mem fields Hide the Linux specific nvgpu_mem fields so that in subsequent patches core code can instead of using struct sg_table it can use mem_desc. Routines for accessing system specific fields will be added as needed. This is the first step in a fairly major overhaul of the GMMU mapping routines. There are numerous issues with the current design (or lack there of): massively coupled code, system dependencies, disorganization, etc. JIRA NVGPU-12 JIRA NVGPU-30 Change-Id: I2e7d3ae3a07468cfc17c1c642d28ed1b0952474d Signed-off-by: Alex Waterman Reviewed-on: http://git-master/r/1464076 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c') diff --git a/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c index 7ce66707..852dcdf2 100644 --- a/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c +++ b/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c @@ -138,13 +138,13 @@ static void gk20a_tegra_secure_destroy(struct gk20a *g, { DEFINE_DMA_ATTRS(attrs); - if (desc->mem.sgt) { - phys_addr_t pa = sg_phys(desc->mem.sgt->sgl); + if (desc->mem.priv.sgt) { + phys_addr_t pa = sg_phys(desc->mem.priv.sgt->sgl); dma_free_attrs(&tegra_vpr_dev, desc->mem.size, (void *)(uintptr_t)pa, pa, __DMA_ATTR(attrs)); - gk20a_free_sgtable(g, &desc->mem.sgt); - desc->mem.sgt = NULL; + gk20a_free_sgtable(g, &desc->mem.priv.sgt); + desc->mem.priv.sgt = NULL; } } @@ -184,7 +184,7 @@ int gk20a_tegra_secure_alloc(struct device *dev, desc->destroy = gk20a_tegra_secure_destroy; - desc->mem.sgt = sgt; + desc->mem.priv.sgt = sgt; desc->mem.size = size; desc->mem.aperture = APERTURE_SYSMEM; -- cgit v1.2.2