diff options
author | skadamati <skadamati@nvidia.com> | 2017-05-23 06:25:29 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-05-26 06:34:42 -0400 |
commit | e21e6e947b334cd16cc92c41953bf3c0153b1508 (patch) | |
tree | a9222039f465548e0f69730c8c3bf24ad6223116 /drivers/gpu/nvgpu/gk20a/ce2_gk20a.h | |
parent | 2e338c77eac4edffb94c8c9480dbd72712c7696f (diff) |
gpu: nvgpu: Fix build failure by missing headers
Move the platform_gk20a.h include out of the ifdef CONFIG_DEBUG_FS
in the CDE code since dev_from_gk20a() is used regardless of
whether debugfs is enabled.
Also modify some of the CE ops to take a struct gk20a instead of a
struct device. This avoids any requirement for including
linux/device.h or platform_gk20a.h.
Bug 200310575
Change-Id: Ifef963cd0f66d05094a698200386cc6140920eac
Signed-off-by: skadamati <skadamati@nvidia.com>
Reviewed-on: http://git-master/r/1487830
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/ce2_gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/ce2_gk20a.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.h b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.h index ac0bae32..dfd19019 100644 --- a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.h | |||
@@ -134,13 +134,13 @@ void gk20a_ce_suspend(struct gk20a *g); | |||
134 | void gk20a_ce_destroy(struct gk20a *g); | 134 | void gk20a_ce_destroy(struct gk20a *g); |
135 | 135 | ||
136 | /* CE app utility functions */ | 136 | /* CE app utility functions */ |
137 | u32 gk20a_ce_create_context_with_cb(struct device *dev, | 137 | u32 gk20a_ce_create_context_with_cb(struct gk20a *g, |
138 | int runlist_id, | 138 | int runlist_id, |
139 | int priority, | 139 | int priority, |
140 | int timeslice, | 140 | int timeslice, |
141 | int runlist_level, | 141 | int runlist_level, |
142 | ce_event_callback user_event_callback); | 142 | ce_event_callback user_event_callback); |
143 | int gk20a_ce_execute_ops(struct device *dev, | 143 | int gk20a_ce_execute_ops(struct gk20a *g, |
144 | u32 ce_ctx_id, | 144 | u32 ce_ctx_id, |
145 | u64 src_buf, | 145 | u64 src_buf, |
146 | u64 dst_buf, | 146 | u64 dst_buf, |
@@ -153,7 +153,7 @@ int gk20a_ce_execute_ops(struct device *dev, | |||
153 | struct gk20a_fence **gk20a_fence_out); | 153 | struct gk20a_fence **gk20a_fence_out); |
154 | void gk20a_ce_delete_context_priv(struct gk20a *g, | 154 | void gk20a_ce_delete_context_priv(struct gk20a *g, |
155 | u32 ce_ctx_id); | 155 | u32 ce_ctx_id); |
156 | void gk20a_ce_delete_context(struct device *dev, | 156 | void gk20a_ce_delete_context(struct gk20a *g, |
157 | u32 ce_ctx_id); | 157 | u32 ce_ctx_id); |
158 | 158 | ||
159 | 159 | ||