From 81660ab58ce695b79c94e145745512516c592afe Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Wed, 7 Sep 2016 14:21:16 -0700 Subject: gpu: nvgpu: Enable CE always All GPUs have a copy engine. So delete the flag has_ce, because it's always true. JIRA NVGPU-16 Change-Id: I89db74c7cf66b24db84301b79832862ef28100b9 Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/1325355 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/mm_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index b9217c2c..7b08387e 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c @@ -807,15 +807,13 @@ static void gk20a_vidmem_destroy(struct gk20a *g) static void gk20a_remove_mm_ce_support(struct mm_gk20a *mm) { struct gk20a *g = gk20a_from_mm(mm); - struct gk20a_platform *platform = gk20a_get_platform(g->dev); if (mm->vidmem.ce_ctx_id != (u32)~0) gk20a_ce_delete_context(g->dev, mm->vidmem.ce_ctx_id); mm->vidmem.ce_ctx_id = (u32)~0; - if (platform->has_ce) - gk20a_vm_remove_support_nofree(&mm->ce.vm); + gk20a_vm_remove_support_nofree(&mm->ce.vm); } @@ -991,7 +989,6 @@ int gk20a_init_mm_setup_sw(struct gk20a *g) { struct mm_gk20a *mm = &g->mm; int err; - struct gk20a_platform *platform = gk20a_get_platform(g->dev); gk20a_dbg_fn(""); @@ -1056,11 +1053,9 @@ int gk20a_init_mm_setup_sw(struct gk20a *g) if (err) return err; - if (platform->has_ce) { - err = gk20a_init_ce_vm(mm); - if (err) - return err; - } + err = gk20a_init_ce_vm(mm); + if (err) + return err; /* set vm_alloc_share op here as gk20a_as_alloc_share needs it */ g->ops.mm.vm_alloc_share = gk20a_vm_alloc_share; -- cgit v1.2.2