diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/cde_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/cde_gk20a.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c index 730ffe5c..0413ae6a 100644 --- a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c | |||
@@ -37,6 +37,7 @@ | |||
37 | #include "cde_gk20a.h" | 37 | #include "cde_gk20a.h" |
38 | #include "fence_gk20a.h" | 38 | #include "fence_gk20a.h" |
39 | #include "gr_gk20a.h" | 39 | #include "gr_gk20a.h" |
40 | #include "platform_gk20a.h" | ||
40 | 41 | ||
41 | #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h> | 42 | #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h> |
42 | #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h> | 43 | #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h> |
@@ -915,7 +916,7 @@ static struct gk20a_cde_ctx *gk20a_cde_allocate_context(struct gk20a *g) | |||
915 | return ERR_PTR(-ENOMEM); | 916 | return ERR_PTR(-ENOMEM); |
916 | 917 | ||
917 | cde_ctx->g = g; | 918 | cde_ctx->g = g; |
918 | cde_ctx->dev = g->dev; | 919 | cde_ctx->dev = dev_from_gk20a(g); |
919 | 920 | ||
920 | ret = gk20a_cde_load(cde_ctx); | 921 | ret = gk20a_cde_load(cde_ctx); |
921 | if (ret) { | 922 | if (ret) { |
@@ -982,7 +983,8 @@ __releases(&cde_app->mutex) | |||
982 | /* First, map the buffer to local va */ | 983 | /* First, map the buffer to local va */ |
983 | 984 | ||
984 | /* ensure that the compbits buffer has drvdata */ | 985 | /* ensure that the compbits buffer has drvdata */ |
985 | err = gk20a_dmabuf_alloc_drvdata(compbits_scatter_buf, g->dev); | 986 | err = gk20a_dmabuf_alloc_drvdata(compbits_scatter_buf, |
987 | dev_from_gk20a(g)); | ||
986 | if (err) | 988 | if (err) |
987 | goto exit_idle; | 989 | goto exit_idle; |
988 | 990 | ||
@@ -1048,7 +1050,7 @@ __releases(&cde_app->mutex) | |||
1048 | 1050 | ||
1049 | gk20a_dbg(gpu_dbg_cde, "surface=0x%p scatterBuffer=0x%p", | 1051 | gk20a_dbg(gpu_dbg_cde, "surface=0x%p scatterBuffer=0x%p", |
1050 | surface, scatter_buffer); | 1052 | surface, scatter_buffer); |
1051 | sgt = gk20a_mm_pin(g->dev, compbits_scatter_buf); | 1053 | sgt = gk20a_mm_pin(dev_from_gk20a(g), compbits_scatter_buf); |
1052 | if (IS_ERR(sgt)) { | 1054 | if (IS_ERR(sgt)) { |
1053 | nvgpu_warn(g, | 1055 | nvgpu_warn(g, |
1054 | "mm_pin failed"); | 1056 | "mm_pin failed"); |
@@ -1060,7 +1062,7 @@ __releases(&cde_app->mutex) | |||
1060 | scatterbuffer_size); | 1062 | scatterbuffer_size); |
1061 | WARN_ON(err); | 1063 | WARN_ON(err); |
1062 | 1064 | ||
1063 | gk20a_mm_unpin(g->dev, compbits_scatter_buf, | 1065 | gk20a_mm_unpin(dev_from_gk20a(g), compbits_scatter_buf, |
1064 | sgt); | 1066 | sgt); |
1065 | if (err) | 1067 | if (err) |
1066 | goto exit_unmap_surface; | 1068 | goto exit_unmap_surface; |
@@ -1072,7 +1074,7 @@ __releases(&cde_app->mutex) | |||
1072 | } | 1074 | } |
1073 | 1075 | ||
1074 | /* store source buffer compression tags */ | 1076 | /* store source buffer compression tags */ |
1075 | gk20a_get_comptags(g->dev, compbits_scatter_buf, &comptags); | 1077 | gk20a_get_comptags(dev_from_gk20a(g), compbits_scatter_buf, &comptags); |
1076 | cde_ctx->surf_param_offset = comptags.offset; | 1078 | cde_ctx->surf_param_offset = comptags.offset; |
1077 | cde_ctx->surf_param_lines = comptags.lines; | 1079 | cde_ctx->surf_param_lines = comptags.lines; |
1078 | 1080 | ||