diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-11-02 18:41:37 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-11-06 13:06:40 -0500 |
commit | 1e7ba4c76d5a6a1b89f3af3bc418391596adc3f3 (patch) | |
tree | 49281effa663007dfb090233e088864d3520e975 /drivers/gpu/nvgpu/vgpu/vgpu.c | |
parent | 9f5f029ae291ebbfef9f1e08b39875fa47c44982 (diff) |
gpu: nvgpu: Use a callback to free struct gk20a
struct gk20a is now part of nvgpu_os_linux in Linux builds. gk20a.c
still frees struct gk20a by kfree(struct gk20a *), which is wrong.
Create a new function pointer in struct gk20a for freeing the
structure and call kfree(struct nvgpu_os_linux *) instead.
JIRA NVGPU-259
Change-Id: I412ee993002cb2a42f0db015fc676de43418ec2f
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1591012
GVS: Gerrit_Virtual_Submit
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/vgpu/vgpu.c')
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/vgpu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c index 93f9eaf4..2cd99e8c 100644 --- a/drivers/gpu/nvgpu/vgpu/vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/vgpu.c | |||
@@ -47,6 +47,7 @@ | |||
47 | #include "common/linux/os_linux.h" | 47 | #include "common/linux/os_linux.h" |
48 | #include "common/linux/ioctl.h" | 48 | #include "common/linux/ioctl.h" |
49 | #include "common/linux/scale.h" | 49 | #include "common/linux/scale.h" |
50 | #include "common/linux/driver_common.h" | ||
50 | 51 | ||
51 | #ifdef CONFIG_TEGRA_19x_GPU | 52 | #ifdef CONFIG_TEGRA_19x_GPU |
52 | #include <vgpu/vgpu_t19x.h> | 53 | #include <vgpu/vgpu_t19x.h> |
@@ -657,6 +658,7 @@ int vgpu_probe(struct platform_device *pdev) | |||
657 | return -ENOMEM; | 658 | return -ENOMEM; |
658 | } | 659 | } |
659 | gk20a = &l->g; | 660 | gk20a = &l->g; |
661 | nvgpu_init_gk20a(gk20a); | ||
660 | 662 | ||
661 | nvgpu_kmem_init(gk20a); | 663 | nvgpu_kmem_init(gk20a); |
662 | 664 | ||