summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2015-03-20 15:59:09 -0400
committerDan Willemsen <dwillemsen@nvidia.com>2015-04-04 22:17:24 -0400
commit1b7b271980094637cf34a9d8ad14cb36f2c36363 (patch)
treea897b5d9a013c14866f938673da6a8d8fe80ef51 /drivers/gpu/nvgpu/gk20a/mm_gk20a.c
parent21f1396d1c80010470e0f071fabe84279b3aebae (diff)
gpu: nvgpu: Use common allocator for context
Reduce amount of duplicate code around memory allocation by using common helpers, and common data structure for storing results of allocations. Bug 1605769 Change-Id: I10c226e2377aa867a5cf11be61d08a9d67206b1d Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/720507
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/mm_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/mm_gk20a.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
index e2e5fdd7..c86fee45 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
@@ -1581,7 +1581,7 @@ void gk20a_gmmu_free_attr(struct gk20a *g, enum dma_attr attr,
1581{ 1581{
1582 struct device *d = dev_from_gk20a(g); 1582 struct device *d = dev_from_gk20a(g);
1583 1583
1584 if (mem->cpu_va) { 1584 if (mem->cpu_va || mem->pages) {
1585 if (attr) { 1585 if (attr) {
1586 DEFINE_DMA_ATTRS(attrs); 1586 DEFINE_DMA_ATTRS(attrs);
1587 dma_set_attr(attr, &attrs); 1587 dma_set_attr(attr, &attrs);