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 e5441ac9..aefef882 100644
--- a/drivers/gpu/nvgpu/common/linux/cde.c
+++ b/drivers/gpu/nvgpu/common/linux/cde.c
@@ -748,7 +748,7 @@ deinit_image:
 }
 static int gk20a_cde_execute_buffer(struct gk20a_cde_ctx *cde_ctx,
-                                    u32 op, struct nvgpu_fence *fence,
+                                    u32 op, struct nvgpu_channel_fence *fence,
                                    u32 flags, struct gk20a_fence **fence_out)
 {
        struct nvgpu_os_linux *l = cde_ctx->l;
@@ -975,7 +975,7 @@ int gk20a_cde_convert(struct nvgpu_os_linux *l,
                      struct dma_buf *compbits_scatter_buf,
                      u64 compbits_byte_offset,
                      u64 scatterbuffer_byte_offset,
-                      struct nvgpu_fence *fence,
+                      struct nvgpu_channel_fence *fence,
                      u32 __flags, struct gk20a_cde_param *params,
                      int num_params, struct gk20a_fence **fence_out)
 __acquires(&l->cde_app->mutex)
@@ -1482,7 +1482,7 @@ static int gk20a_buffer_convert_gpu_to_cde_v1(
                u64 offset, u64 compbits_hoffset, u64 compbits_voffset,
                u64 scatterbuffer_offset,
                u32 width, u32 height, u32 block_height_log2,
-                u32 submit_flags, struct nvgpu_fence *fence_in,
+                u32 submit_flags, struct nvgpu_channel_fence *fence_in,
                struct gk20a_buffer_state *state)
 {
        struct gk20a *g = &l->g;
@@ -1624,7 +1624,7 @@ static int gk20a_buffer_convert_gpu_to_cde(
                u64 offset, u64 compbits_hoffset, u64 compbits_voffset,
                u64 scatterbuffer_offset,
                u32 width, u32 height, u32 block_height_log2,
-                u32 submit_flags, struct nvgpu_fence *fence_in,
+                u32 submit_flags, struct nvgpu_channel_fence *fence_in,
                struct gk20a_buffer_state *state)
 {
        struct gk20a *g = &l->g;
@@ -1656,7 +1656,7 @@ int gk20a_prepare_compressible_read(
                u64 compbits_hoffset, u64 compbits_voffset,
                u64 scatterbuffer_offset,
                u32 width, u32 height, u32 block_height_log2,
-                u32 submit_flags, struct nvgpu_fence *fence,
+                u32 submit_flags, struct nvgpu_channel_fence *fence,
                u32 *valid_compbits, u32 *zbc_color,
                struct gk20a_fence **fence_out)
 {

diff --git a/drivers/gpu/nvgpu/common/linux/cde.c b/drivers/gpu/nvgpu/common/linux/cde.c index e5441ac9..aefef882 100644 --- a/drivers/gpu/nvgpu/common/linux/cde.c +++ b/drivers/gpu/nvgpu/common/linux/cde.c
@@ -748,7 +748,7 @@ deinit_image:
748	}	748	}
749		749
750	static int gk20a_cde_execute_buffer(struct gk20a_cde_ctx *cde_ctx,	750	static int gk20a_cde_execute_buffer(struct gk20a_cde_ctx *cde_ctx,
751	u32 op, struct nvgpu_fence *fence,	751	u32 op, struct nvgpu_channel_fence *fence,
752	u32 flags, struct gk20a_fence **fence_out)	752	u32 flags, struct gk20a_fence **fence_out)
753	{	753	{
754	struct nvgpu_os_linux *l = cde_ctx->l;	754	struct nvgpu_os_linux *l = cde_ctx->l;
@@ -975,7 +975,7 @@ int gk20a_cde_convert(struct nvgpu_os_linux *l,
975	struct dma_buf *compbits_scatter_buf,	975	struct dma_buf *compbits_scatter_buf,
976	u64 compbits_byte_offset,	976	u64 compbits_byte_offset,
977	u64 scatterbuffer_byte_offset,	977	u64 scatterbuffer_byte_offset,
978	struct nvgpu_fence *fence,	978	struct nvgpu_channel_fence *fence,
979	u32 __flags, struct gk20a_cde_param *params,	979	u32 __flags, struct gk20a_cde_param *params,
980	int num_params, struct gk20a_fence **fence_out)	980	int num_params, struct gk20a_fence **fence_out)
981	__acquires(&l->cde_app->mutex)	981	__acquires(&l->cde_app->mutex)
@@ -1482,7 +1482,7 @@ static int gk20a_buffer_convert_gpu_to_cde_v1(
1482	u64 offset, u64 compbits_hoffset, u64 compbits_voffset,	1482	u64 offset, u64 compbits_hoffset, u64 compbits_voffset,
1483	u64 scatterbuffer_offset,	1483	u64 scatterbuffer_offset,
1484	u32 width, u32 height, u32 block_height_log2,	1484	u32 width, u32 height, u32 block_height_log2,
1485	u32 submit_flags, struct nvgpu_fence *fence_in,	1485	u32 submit_flags, struct nvgpu_channel_fence *fence_in,
1486	struct gk20a_buffer_state *state)	1486	struct gk20a_buffer_state *state)
1487	{	1487	{
1488	struct gk20a *g = &l->g;	1488	struct gk20a *g = &l->g;
@@ -1624,7 +1624,7 @@ static int gk20a_buffer_convert_gpu_to_cde(
1624	u64 offset, u64 compbits_hoffset, u64 compbits_voffset,	1624	u64 offset, u64 compbits_hoffset, u64 compbits_voffset,
1625	u64 scatterbuffer_offset,	1625	u64 scatterbuffer_offset,
1626	u32 width, u32 height, u32 block_height_log2,	1626	u32 width, u32 height, u32 block_height_log2,
1627	u32 submit_flags, struct nvgpu_fence *fence_in,	1627	u32 submit_flags, struct nvgpu_channel_fence *fence_in,
1628	struct gk20a_buffer_state *state)	1628	struct gk20a_buffer_state *state)
1629	{	1629	{
1630	struct gk20a *g = &l->g;	1630	struct gk20a *g = &l->g;
@@ -1656,7 +1656,7 @@ int gk20a_prepare_compressible_read(
1656	u64 compbits_hoffset, u64 compbits_voffset,	1656	u64 compbits_hoffset, u64 compbits_voffset,
1657	u64 scatterbuffer_offset,	1657	u64 scatterbuffer_offset,
1658	u32 width, u32 height, u32 block_height_log2,	1658	u32 width, u32 height, u32 block_height_log2,
1659	u32 submit_flags, struct nvgpu_fence *fence,	1659	u32 submit_flags, struct nvgpu_channel_fence *fence,
1660	u32 valid_compbits, u32 zbc_color,	1660	u32 valid_compbits, u32 zbc_color,
1661	struct gk20a_fence **fence_out)	1661	struct gk20a_fence **fence_out)
1662	{	1662	{