diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-09-28 13:34:27 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-10-17 13:43:39 -0400 |
commit | b252653ac5f2b12a9a84476f9dde6a844a77a602 (patch) | |
tree | d2ca5a3f56c652db2e30e21409f3f1ab1994d0a3 /drivers/gpu/nvgpu/common/linux/cde.c | |
parent | 5c5b52dce54fa09d16ae38a232a0e17b4729b472 (diff) |
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 <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1570403
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common/linux/cde.c')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/cde.c | 10 |
1 files changed, 5 insertions, 5 deletions
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) | |||
1068 | } | 1068 | } |
1069 | 1069 | ||
1070 | if (scatterbuffer_byte_offset && | 1070 | if (scatterbuffer_byte_offset && |
1071 | g->ops.cde.need_scatter_buffer && | 1071 | l->ops.cde.need_scatter_buffer && |
1072 | g->ops.cde.need_scatter_buffer(g)) { | 1072 | l->ops.cde.need_scatter_buffer(g)) { |
1073 | struct sg_table *sgt; | 1073 | struct sg_table *sgt; |
1074 | void *scatter_buffer; | 1074 | void *scatter_buffer; |
1075 | 1075 | ||
@@ -1092,7 +1092,7 @@ __releases(&l->cde_app->mutex) | |||
1092 | err = -EINVAL; | 1092 | err = -EINVAL; |
1093 | goto exit_unmap_surface; | 1093 | goto exit_unmap_surface; |
1094 | } else { | 1094 | } else { |
1095 | err = g->ops.cde.populate_scatter_buffer(g, sgt, | 1095 | err = l->ops.cde.populate_scatter_buffer(g, sgt, |
1096 | compbits_byte_offset, scatter_buffer, | 1096 | compbits_byte_offset, scatter_buffer, |
1097 | scatterbuffer_size); | 1097 | scatterbuffer_size); |
1098 | WARN_ON(err); | 1098 | WARN_ON(err); |
@@ -1463,8 +1463,8 @@ static int gk20a_buffer_convert_gpu_to_cde_v1( | |||
1463 | int hprog = -1; | 1463 | int hprog = -1; |
1464 | int vprog = -1; | 1464 | int vprog = -1; |
1465 | 1465 | ||
1466 | if (g->ops.cde.get_program_numbers) | 1466 | if (l->ops.cde.get_program_numbers) |
1467 | g->ops.cde.get_program_numbers(g, block_height_log2, | 1467 | l->ops.cde.get_program_numbers(g, block_height_log2, |
1468 | l->cde_app.shader_parameter, | 1468 | l->cde_app.shader_parameter, |
1469 | &hprog, &vprog); | 1469 | &hprog, &vprog); |
1470 | else { | 1470 | else { |