diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 7 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/platform_gk20a.h | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index f91e86df..19012bf5 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -695,7 +695,7 @@ struct gpu_ops { | |||
695 | * context buffer descriptor (especially fields destroy, sgt, | 695 | * context buffer descriptor (especially fields destroy, sgt, |
696 | * size). | 696 | * size). |
697 | */ | 697 | */ |
698 | int (*secure_alloc)(struct device *dev, | 698 | int (*secure_alloc)(struct gk20a *g, |
699 | struct gr_ctx_buffer_desc *desc, | 699 | struct gr_ctx_buffer_desc *desc, |
700 | size_t size); | 700 | size_t size); |
701 | } mm; | 701 | } mm; |
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index 7631decf..f101d3ba 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -2728,7 +2728,6 @@ static int gr_gk20a_alloc_global_ctx_buffers(struct gk20a *g) | |||
2728 | { | 2728 | { |
2729 | struct gr_gk20a *gr = &g->gr; | 2729 | struct gr_gk20a *gr = &g->gr; |
2730 | int attr_buffer_size, err; | 2730 | int attr_buffer_size, err; |
2731 | struct device *dev = g->dev; | ||
2732 | 2731 | ||
2733 | u32 cb_buffer_size = gr->bundle_cb_default_size * | 2732 | u32 cb_buffer_size = gr->bundle_cb_default_size * |
2734 | gr_scc_bundle_cb_size_div_256b_byte_granularity_v(); | 2733 | gr_scc_bundle_cb_size_div_256b_byte_granularity_v(); |
@@ -2748,7 +2747,7 @@ static int gr_gk20a_alloc_global_ctx_buffers(struct gk20a *g) | |||
2748 | goto clean_up; | 2747 | goto clean_up; |
2749 | 2748 | ||
2750 | if (g->ops.mm.secure_alloc) | 2749 | if (g->ops.mm.secure_alloc) |
2751 | g->ops.mm.secure_alloc(dev, | 2750 | g->ops.mm.secure_alloc(g, |
2752 | &gr->global_ctx_buffer[CIRCULAR_VPR], | 2751 | &gr->global_ctx_buffer[CIRCULAR_VPR], |
2753 | cb_buffer_size); | 2752 | cb_buffer_size); |
2754 | 2753 | ||
@@ -2760,7 +2759,7 @@ static int gr_gk20a_alloc_global_ctx_buffers(struct gk20a *g) | |||
2760 | goto clean_up; | 2759 | goto clean_up; |
2761 | 2760 | ||
2762 | if (g->ops.mm.secure_alloc) | 2761 | if (g->ops.mm.secure_alloc) |
2763 | g->ops.mm.secure_alloc(dev, | 2762 | g->ops.mm.secure_alloc(g, |
2764 | &gr->global_ctx_buffer[PAGEPOOL_VPR], | 2763 | &gr->global_ctx_buffer[PAGEPOOL_VPR], |
2765 | pagepool_buffer_size); | 2764 | pagepool_buffer_size); |
2766 | 2765 | ||
@@ -2772,7 +2771,7 @@ static int gr_gk20a_alloc_global_ctx_buffers(struct gk20a *g) | |||
2772 | goto clean_up; | 2771 | goto clean_up; |
2773 | 2772 | ||
2774 | if (g->ops.mm.secure_alloc) | 2773 | if (g->ops.mm.secure_alloc) |
2775 | g->ops.mm.secure_alloc(dev, | 2774 | g->ops.mm.secure_alloc(g, |
2776 | &gr->global_ctx_buffer[ATTRIBUTE_VPR], | 2775 | &gr->global_ctx_buffer[ATTRIBUTE_VPR], |
2777 | attr_buffer_size); | 2776 | attr_buffer_size); |
2778 | 2777 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h index 9499f91a..72322e54 100644 --- a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h | |||
@@ -31,7 +31,7 @@ struct gr_ctx_buffer_desc; | |||
31 | struct gk20a_scale_profile; | 31 | struct gk20a_scale_profile; |
32 | 32 | ||
33 | struct secure_page_buffer { | 33 | struct secure_page_buffer { |
34 | void (*destroy)(struct device *, struct secure_page_buffer *); | 34 | void (*destroy)(struct gk20a *, struct secure_page_buffer *); |
35 | size_t size; | 35 | size_t size; |
36 | u64 iova; | 36 | u64 iova; |
37 | }; | 37 | }; |