diff options
Diffstat (limited to 'drivers/gpu/nvgpu/common/linux/cde.c')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/cde.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/cde.c b/drivers/gpu/nvgpu/common/linux/cde.c index 040a4e3d..894e776d 100644 --- a/drivers/gpu/nvgpu/common/linux/cde.c +++ b/drivers/gpu/nvgpu/common/linux/cde.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Color decompression engine support | 2 | * Color decompression engine support |
3 | * | 3 | * |
4 | * Copyright (c) 2014-2017, NVIDIA Corporation. All rights reserved. | 4 | * Copyright (c) 2014-2018, NVIDIA Corporation. All rights reserved. |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or modify it | 6 | * This program is free software; you can redistribute it and/or modify it |
7 | * under the terms and conditions of the GNU General Public License, | 7 | * under the terms and conditions of the GNU General Public License, |
@@ -984,6 +984,7 @@ __releases(&l->cde_app->mutex) | |||
984 | struct gk20a_comptags comptags; | 984 | struct gk20a_comptags comptags; |
985 | struct nvgpu_os_buffer os_buf = { | 985 | struct nvgpu_os_buffer os_buf = { |
986 | compbits_scatter_buf, | 986 | compbits_scatter_buf, |
987 | NULL, | ||
987 | dev_from_gk20a(g) | 988 | dev_from_gk20a(g) |
988 | }; | 989 | }; |
989 | u64 mapped_compbits_offset = 0; | 990 | u64 mapped_compbits_offset = 0; |
@@ -999,6 +1000,7 @@ __releases(&l->cde_app->mutex) | |||
999 | int err, i; | 1000 | int err, i; |
1000 | const s16 compbits_kind = 0; | 1001 | const s16 compbits_kind = 0; |
1001 | u32 submit_op; | 1002 | u32 submit_op; |
1003 | struct dma_buf_attachment *attachment; | ||
1002 | 1004 | ||
1003 | gk20a_dbg(gpu_dbg_cde, "compbits_byte_offset=%llu scatterbuffer_byte_offset=%llu", | 1005 | gk20a_dbg(gpu_dbg_cde, "compbits_byte_offset=%llu scatterbuffer_byte_offset=%llu", |
1004 | compbits_byte_offset, scatterbuffer_byte_offset); | 1006 | compbits_byte_offset, scatterbuffer_byte_offset); |
@@ -1093,7 +1095,8 @@ __releases(&l->cde_app->mutex) | |||
1093 | 1095 | ||
1094 | gk20a_dbg(gpu_dbg_cde, "surface=0x%p scatterBuffer=0x%p", | 1096 | gk20a_dbg(gpu_dbg_cde, "surface=0x%p scatterBuffer=0x%p", |
1095 | surface, scatter_buffer); | 1097 | surface, scatter_buffer); |
1096 | sgt = gk20a_mm_pin(dev_from_gk20a(g), compbits_scatter_buf); | 1098 | sgt = gk20a_mm_pin(dev_from_gk20a(g), compbits_scatter_buf, |
1099 | &attachment); | ||
1097 | if (IS_ERR(sgt)) { | 1100 | if (IS_ERR(sgt)) { |
1098 | nvgpu_warn(g, | 1101 | nvgpu_warn(g, |
1099 | "mm_pin failed"); | 1102 | "mm_pin failed"); |
@@ -1106,7 +1109,7 @@ __releases(&l->cde_app->mutex) | |||
1106 | WARN_ON(err); | 1109 | WARN_ON(err); |
1107 | 1110 | ||
1108 | gk20a_mm_unpin(dev_from_gk20a(g), compbits_scatter_buf, | 1111 | gk20a_mm_unpin(dev_from_gk20a(g), compbits_scatter_buf, |
1109 | sgt); | 1112 | attachment, sgt); |
1110 | if (err) | 1113 | if (err) |
1111 | goto exit_unmap_surface; | 1114 | goto exit_unmap_surface; |
1112 | } | 1115 | } |