From b252653ac5f2b12a9a84476f9dde6a844a77a602 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 28 Sep 2017 10:34:27 -0700 Subject: gpu: nvgpu: Move rest of CDE structures to Linux Move rest of CDE structures to common/linux. This includes moving the per-chip firmware file interpretation functions, and removing CDE ops from HAL and adding it to nvgpu_os_linux. JIRA NVGPU-259 Change-Id: I59d8f44bddadecef81ad3c455b363a14034c5e13 Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1570403 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/linux/cde.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'drivers/gpu/nvgpu/common/linux/cde.c') diff --git a/drivers/gpu/nvgpu/common/linux/cde.c b/drivers/gpu/nvgpu/common/linux/cde.c index 2832408d..c3a9b770 100644 --- a/drivers/gpu/nvgpu/common/linux/cde.c +++ b/drivers/gpu/nvgpu/common/linux/cde.c @@ -1068,8 +1068,8 @@ __releases(&l->cde_app->mutex) } if (scatterbuffer_byte_offset && - g->ops.cde.need_scatter_buffer && - g->ops.cde.need_scatter_buffer(g)) { + l->ops.cde.need_scatter_buffer && + l->ops.cde.need_scatter_buffer(g)) { struct sg_table *sgt; void *scatter_buffer; @@ -1092,7 +1092,7 @@ __releases(&l->cde_app->mutex) err = -EINVAL; goto exit_unmap_surface; } else { - err = g->ops.cde.populate_scatter_buffer(g, sgt, + err = l->ops.cde.populate_scatter_buffer(g, sgt, compbits_byte_offset, scatter_buffer, scatterbuffer_size); WARN_ON(err); @@ -1463,8 +1463,8 @@ static int gk20a_buffer_convert_gpu_to_cde_v1( int hprog = -1; int vprog = -1; - if (g->ops.cde.get_program_numbers) - g->ops.cde.get_program_numbers(g, block_height_log2, + if (l->ops.cde.get_program_numbers) + l->ops.cde.get_program_numbers(g, block_height_log2, l->cde_app.shader_parameter, &hprog, &vprog); else { -- cgit v1.2.2