diff options
author | Alex Waterman <alexw@nvidia.com> | 2016-06-09 17:24:06 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-06-14 17:01:03 -0400 |
commit | 4e21f4a148c94982bbbd7be18c272b06738918e9 (patch) | |
tree | 85551cfff0f876430829b4c2fe2359140ca72f0e | |
parent | 1409d216e536f742700f1ef23a17481509024799 (diff) |
gpu: nvgpu: export gk20a_free_priv_cmdbuf
Export gk20a_free_priv_cmdbuf() so that the channel_sync_gk20a.c code
can call this function. This is necessary for error paths in the
semaphore wait/incr functions.
Bug 1732449
JIRA DNVGPU-12
Change-Id: Id2ea13e5553d50475ee1bbf94781e18590321fdf
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1162686
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.h | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c index b7081d06..45cf087a 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c | |||
@@ -1767,8 +1767,7 @@ fail_unlock: | |||
1767 | gk20a_channel_put(ch); | 1767 | gk20a_channel_put(ch); |
1768 | } | 1768 | } |
1769 | 1769 | ||
1770 | static int gk20a_free_priv_cmdbuf(struct channel_gk20a *c, | 1770 | int gk20a_free_priv_cmdbuf(struct channel_gk20a *c, struct priv_cmd_entry *e) |
1771 | struct priv_cmd_entry *e) | ||
1772 | { | 1771 | { |
1773 | struct priv_cmd_queue *q = &c->priv_cmd_q; | 1772 | struct priv_cmd_queue *q = &c->priv_cmd_q; |
1774 | struct device *d = dev_from_gk20a(c->g); | 1773 | struct device *d = dev_from_gk20a(c->g); |
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h index d8528984..f60bbda4 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h | |||
@@ -222,6 +222,7 @@ void gk20a_set_error_notifier(struct channel_gk20a *ch, __u32 error); | |||
222 | void gk20a_channel_semaphore_wakeup(struct gk20a *g, bool post_events); | 222 | void gk20a_channel_semaphore_wakeup(struct gk20a *g, bool post_events); |
223 | int gk20a_channel_alloc_priv_cmdbuf(struct channel_gk20a *c, u32 size, | 223 | int gk20a_channel_alloc_priv_cmdbuf(struct channel_gk20a *c, u32 size, |
224 | struct priv_cmd_entry **entry); | 224 | struct priv_cmd_entry **entry); |
225 | int gk20a_free_priv_cmdbuf(struct channel_gk20a *c, struct priv_cmd_entry *e); | ||
225 | 226 | ||
226 | int gk20a_enable_channel_tsg(struct gk20a *g, struct channel_gk20a *ch); | 227 | int gk20a_enable_channel_tsg(struct gk20a *g, struct channel_gk20a *ch); |
227 | int gk20a_disable_channel_tsg(struct gk20a *g, struct channel_gk20a *ch); | 228 | int gk20a_disable_channel_tsg(struct gk20a *g, struct channel_gk20a *ch); |