summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c')
-rw-r--r--drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c
index d051c0e3..5b2958ec 100644
--- a/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c
+++ b/drivers/gpu/nvgpu/tegra/linux/platform_gk20a_tegra.c
@@ -47,6 +47,8 @@
47 47
48#include <linux/platform/tegra/tegra_emc.h> 48#include <linux/platform/tegra/tegra_emc.h>
49 49
50#include <nvgpu/kmem.h>
51
50#include "gk20a/gk20a.h" 52#include "gk20a/gk20a.h"
51#include "gk20a/hal_gk20a.h" 53#include "gk20a/hal_gk20a.h"
52#include "gk20a/platform_gk20a.h" 54#include "gk20a/platform_gk20a.h"
@@ -162,7 +164,7 @@ int gk20a_tegra_secure_alloc(struct device *dev,
162 if (dma_mapping_error(&tegra_vpr_dev, iova)) 164 if (dma_mapping_error(&tegra_vpr_dev, iova))
163 return -ENOMEM; 165 return -ENOMEM;
164 166
165 sgt = kzalloc(sizeof(*sgt), GFP_KERNEL); 167 sgt = nvgpu_kzalloc(platform->g, sizeof(*sgt));
166 if (!sgt) { 168 if (!sgt) {
167 gk20a_err(dev, "failed to allocate memory\n"); 169 gk20a_err(dev, "failed to allocate memory\n");
168 goto fail; 170 goto fail;
@@ -186,7 +188,7 @@ int gk20a_tegra_secure_alloc(struct device *dev,
186 return err; 188 return err;
187 189
188fail_sgt: 190fail_sgt:
189 kfree(sgt); 191 nvgpu_kfree(platform->g, sgt);
190fail: 192fail:
191 dma_free_attrs(&tegra_vpr_dev, desc->mem.size, 193 dma_free_attrs(&tegra_vpr_dev, desc->mem.size,
192 (void *)(uintptr_t)iova, iova, __DMA_ATTR(attrs)); 194 (void *)(uintptr_t)iova, iova, __DMA_ATTR(attrs));
@@ -809,7 +811,7 @@ static void gk20a_tegra_scale_init(struct device *dev)
809 if (!profile) 811 if (!profile)
810 return; 812 return;
811 813
812 emc_params = kzalloc(sizeof(*emc_params), GFP_KERNEL); 814 emc_params = nvgpu_kzalloc(platform->g, sizeof(*emc_params));
813 if (!emc_params) 815 if (!emc_params)
814 return; 816 return;
815 817
@@ -841,7 +843,7 @@ static void gk20a_tegra_scale_exit(struct device *dev)
841 tegra_bwmgr_unregister(emc_params->bwmgr_cl); 843 tegra_bwmgr_unregister(emc_params->bwmgr_cl);
842#endif 844#endif
843 845
844 kfree(profile->private_data); 846 nvgpu_kfree(platform->g, profile->private_data);
845} 847}
846 848
847void gk20a_tegra_debug_dump(struct device *dev) 849void gk20a_tegra_debug_dump(struct device *dev)