diff options
author | Seema Khowala <seemaj@nvidia.com> | 2017-12-21 13:41:47 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-12-26 18:15:39 -0500 |
commit | 57a7064ff46048b4013ec197b0495c9c2fc5b082 (patch) | |
tree | 41a7f287c481fa6a341236099866c4425304983c /drivers/gpu/nvgpu/common | |
parent | 488d02944bbd3bcaaa829ace882e25a02439feb0 (diff) |
gpu: nvgpu: gv11b: remove cde support
Change-Id: I04df795b20413a2d07a252d77b3eba853890fcae
Signed-off-by: Seema Khowala <seemaj@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1624087
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/driver_common.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/platform_gv11b_tegra.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/mm.c | 12 |
3 files changed, 12 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/driver_common.c b/drivers/gpu/nvgpu/common/linux/driver_common.c index 51ae18a3..4de0658b 100644 --- a/drivers/gpu/nvgpu/common/linux/driver_common.c +++ b/drivers/gpu/nvgpu/common/linux/driver_common.c | |||
@@ -145,6 +145,7 @@ static void nvgpu_init_pm_vars(struct gk20a *g) | |||
145 | g->aggressive_sync_destroy = platform->aggressive_sync_destroy; | 145 | g->aggressive_sync_destroy = platform->aggressive_sync_destroy; |
146 | g->aggressive_sync_destroy_thresh = platform->aggressive_sync_destroy_thresh; | 146 | g->aggressive_sync_destroy_thresh = platform->aggressive_sync_destroy_thresh; |
147 | g->has_syncpoints = platform->has_syncpoints; | 147 | g->has_syncpoints = platform->has_syncpoints; |
148 | g->has_cde = platform->has_cde; | ||
148 | g->ptimer_src_freq = platform->ptimer_src_freq; | 149 | g->ptimer_src_freq = platform->ptimer_src_freq; |
149 | g->support_pmu = support_gk20a_pmu(dev_from_gk20a(g)); | 150 | g->support_pmu = support_gk20a_pmu(dev_from_gk20a(g)); |
150 | g->can_railgate = platform->can_railgate_init; | 151 | g->can_railgate = platform->can_railgate_init; |
diff --git a/drivers/gpu/nvgpu/common/linux/platform_gv11b_tegra.c b/drivers/gpu/nvgpu/common/linux/platform_gv11b_tegra.c index 0eb39406..78461b5d 100644 --- a/drivers/gpu/nvgpu/common/linux/platform_gv11b_tegra.c +++ b/drivers/gpu/nvgpu/common/linux/platform_gv11b_tegra.c | |||
@@ -188,6 +188,9 @@ static int gv11b_tegra_suspend(struct device *dev) | |||
188 | struct gk20a_platform t19x_gpu_tegra_platform = { | 188 | struct gk20a_platform t19x_gpu_tegra_platform = { |
189 | .has_syncpoints = true, | 189 | .has_syncpoints = true, |
190 | 190 | ||
191 | /* no cde. use sysmem compression */ | ||
192 | .has_cde = false, | ||
193 | |||
191 | /* power management configuration */ | 194 | /* power management configuration */ |
192 | 195 | ||
193 | /* ptimer src frequency in hz*/ | 196 | /* ptimer src frequency in hz*/ |
diff --git a/drivers/gpu/nvgpu/common/mm/mm.c b/drivers/gpu/nvgpu/common/mm/mm.c index db87c4c4..54bc17dd 100644 --- a/drivers/gpu/nvgpu/common/mm/mm.c +++ b/drivers/gpu/nvgpu/common/mm/mm.c | |||
@@ -163,7 +163,9 @@ static void nvgpu_remove_mm_support(struct mm_gk20a *mm) | |||
163 | nvgpu_free_inst_block(g, &mm->pmu.inst_block); | 163 | nvgpu_free_inst_block(g, &mm->pmu.inst_block); |
164 | nvgpu_free_inst_block(g, &mm->hwpm.inst_block); | 164 | nvgpu_free_inst_block(g, &mm->hwpm.inst_block); |
165 | nvgpu_vm_put(mm->pmu.vm); | 165 | nvgpu_vm_put(mm->pmu.vm); |
166 | nvgpu_vm_put(mm->cde.vm); | 166 | |
167 | if (g->has_cde) | ||
168 | nvgpu_vm_put(mm->cde.vm); | ||
167 | 169 | ||
168 | nvgpu_semaphore_sea_destroy(g); | 170 | nvgpu_semaphore_sea_destroy(g); |
169 | nvgpu_vidmem_destroy(g); | 171 | nvgpu_vidmem_destroy(g); |
@@ -389,9 +391,11 @@ static int nvgpu_init_mm_setup_sw(struct gk20a *g) | |||
389 | if (err) | 391 | if (err) |
390 | return err; | 392 | return err; |
391 | 393 | ||
392 | err = nvgpu_init_cde_vm(mm); | 394 | if (g->has_cde) { |
393 | if (err) | 395 | err = nvgpu_init_cde_vm(mm); |
394 | return err; | 396 | if (err) |
397 | return err; | ||
398 | } | ||
395 | 399 | ||
396 | err = nvgpu_init_ce_vm(mm); | 400 | err = nvgpu_init_ce_vm(mm); |
397 | if (err) | 401 | if (err) |