From 7189630e7c3c5f31d545d74ef311355c6dae767e Mon Sep 17 00:00:00 2001 From: Konsta Holtta Date: Tue, 12 Feb 2019 13:05:19 +0200 Subject: [PATCH] gpu: nvgpu: drop fifo_ in channel HAL names Now that the moved HAL ops from fifo are in channel, rename the implementations to match. Jira NVGPU-1307 Change-Id: I7b9336f506c9e71bcd0af98886216958bd6695eb Signed-off-by: Konsta Holtta Reviewed-on: https://git-master.nvidia.com/r/2017264 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/fifo/channel_gk20a.c | 6 +++--- drivers/gpu/nvgpu/common/fifo/channel_gk20a.h | 6 +++--- drivers/gpu/nvgpu/common/fifo/channel_gm20b.c | 4 ++-- drivers/gpu/nvgpu/common/fifo/channel_gm20b.h | 4 ++-- drivers/gpu/nvgpu/common/fifo/channel_gv100.c | 2 +- drivers/gpu/nvgpu/common/fifo/channel_gv100.h | 2 +- drivers/gpu/nvgpu/common/fifo/channel_gv11b.c | 4 ++-- drivers/gpu/nvgpu/common/fifo/channel_gv11b.h | 4 ++-- drivers/gpu/nvgpu/gm20b/hal_gm20b.c | 10 +++++----- drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 10 +++++----- drivers/gpu/nvgpu/gv100/hal_gv100.c | 10 +++++----- drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 10 +++++----- drivers/gpu/nvgpu/tu104/hal_tu104.c | 10 +++++----- drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | 2 +- drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c | 2 +- 15 files changed, 43 insertions(+), 43 deletions(-) diff --git a/drivers/gpu/nvgpu/common/fifo/channel_gk20a.c b/drivers/gpu/nvgpu/common/fifo/channel_gk20a.c index c28cec3c3..c108c8f04 100644 --- a/drivers/gpu/nvgpu/common/fifo/channel_gk20a.c +++ b/drivers/gpu/nvgpu/common/fifo/channel_gk20a.c @@ -31,14 +31,14 @@ #include -void gk20a_fifo_channel_enable(struct channel_gk20a *ch) +void gk20a_channel_enable(struct channel_gk20a *ch) { gk20a_writel(ch->g, ccsr_channel_r(ch->chid), gk20a_readl(ch->g, ccsr_channel_r(ch->chid)) | ccsr_channel_enable_set_true_f()); } -void gk20a_fifo_channel_disable(struct channel_gk20a *ch) +void gk20a_channel_disable(struct channel_gk20a *ch) { gk20a_writel(ch->g, ccsr_channel_r(ch->chid), gk20a_readl(ch->g, @@ -46,7 +46,7 @@ void gk20a_fifo_channel_disable(struct channel_gk20a *ch) ccsr_channel_enable_clr_true_f()); } -void gk20a_fifo_channel_unbind(struct channel_gk20a *ch) +void gk20a_channel_unbind(struct channel_gk20a *ch) { struct gk20a *g = ch->g; diff --git a/drivers/gpu/nvgpu/common/fifo/channel_gk20a.h b/drivers/gpu/nvgpu/common/fifo/channel_gk20a.h index 4cb17900b..02348b8e2 100644 --- a/drivers/gpu/nvgpu/common/fifo/channel_gk20a.h +++ b/drivers/gpu/nvgpu/common/fifo/channel_gk20a.h @@ -26,8 +26,8 @@ struct channel_gk20a; struct gk20a; -void gk20a_fifo_channel_enable(struct channel_gk20a *ch); -void gk20a_fifo_channel_disable(struct channel_gk20a *ch); -void gk20a_fifo_channel_unbind(struct channel_gk20a *ch); +void gk20a_channel_enable(struct channel_gk20a *ch); +void gk20a_channel_disable(struct channel_gk20a *ch); +void gk20a_channel_unbind(struct channel_gk20a *ch); #endif /* FIFO_CHANNEL_GK20A_H */ diff --git a/drivers/gpu/nvgpu/common/fifo/channel_gm20b.c b/drivers/gpu/nvgpu/common/fifo/channel_gm20b.c index af9e1a385..a4b693fda 100644 --- a/drivers/gpu/nvgpu/common/fifo/channel_gm20b.c +++ b/drivers/gpu/nvgpu/common/fifo/channel_gm20b.c @@ -32,7 +32,7 @@ #include #include -void gm20b_fifo_channel_bind(struct channel_gk20a *c) +void gm20b_channel_bind(struct channel_gk20a *c) { struct gk20a *g = c->g; @@ -59,7 +59,7 @@ void gm20b_fifo_channel_bind(struct channel_gk20a *c) nvgpu_atomic_set(&c->bound, true); } -u32 gm20b_fifo_channel_count(struct gk20a *g) +u32 gm20b_channel_count(struct gk20a *g) { return ccsr_channel__size_1_v(); } diff --git a/drivers/gpu/nvgpu/common/fifo/channel_gm20b.h b/drivers/gpu/nvgpu/common/fifo/channel_gm20b.h index e6cbcffa9..c7bb0ba7a 100644 --- a/drivers/gpu/nvgpu/common/fifo/channel_gm20b.h +++ b/drivers/gpu/nvgpu/common/fifo/channel_gm20b.h @@ -28,7 +28,7 @@ struct channel_gk20a; struct gk20a; -void gm20b_fifo_channel_bind(struct channel_gk20a *c); -u32 gm20b_fifo_channel_count(struct gk20a *g); +void gm20b_channel_bind(struct channel_gk20a *c); +u32 gm20b_channel_count(struct gk20a *g); #endif /* FIFO_CHANNEL_GM20B_H */ diff --git a/drivers/gpu/nvgpu/common/fifo/channel_gv100.c b/drivers/gpu/nvgpu/common/fifo/channel_gv100.c index 2d5d0ec7a..0b2b74483 100644 --- a/drivers/gpu/nvgpu/common/fifo/channel_gv100.c +++ b/drivers/gpu/nvgpu/common/fifo/channel_gv100.c @@ -24,7 +24,7 @@ #include -u32 gv100_fifo_channel_count(struct gk20a *g) +u32 gv100_channel_count(struct gk20a *g) { return ccsr_channel__size_1_v(); } diff --git a/drivers/gpu/nvgpu/common/fifo/channel_gv100.h b/drivers/gpu/nvgpu/common/fifo/channel_gv100.h index 27c3d17a2..9e0b2a65a 100644 --- a/drivers/gpu/nvgpu/common/fifo/channel_gv100.h +++ b/drivers/gpu/nvgpu/common/fifo/channel_gv100.h @@ -27,6 +27,6 @@ struct gk20a; -u32 gv100_fifo_channel_count(struct gk20a *g); +u32 gv100_channel_count(struct gk20a *g); #endif /* FIFO_CHANNEL_GV100_H */ diff --git a/drivers/gpu/nvgpu/common/fifo/channel_gv11b.c b/drivers/gpu/nvgpu/common/fifo/channel_gv11b.c index 9fdcc74af..1df9ca9a2 100644 --- a/drivers/gpu/nvgpu/common/fifo/channel_gv11b.c +++ b/drivers/gpu/nvgpu/common/fifo/channel_gv11b.c @@ -31,7 +31,7 @@ #include -void gv11b_fifo_channel_unbind(struct channel_gk20a *ch) +void gv11b_channel_unbind(struct channel_gk20a *ch) { struct gk20a *g = ch->g; @@ -49,7 +49,7 @@ void gv11b_fifo_channel_unbind(struct channel_gk20a *ch) } } -u32 gv11b_fifo_channel_count(struct gk20a *g) +u32 gv11b_channel_count(struct gk20a *g) { return ccsr_channel__size_1_v(); } diff --git a/drivers/gpu/nvgpu/common/fifo/channel_gv11b.h b/drivers/gpu/nvgpu/common/fifo/channel_gv11b.h index bf5947a51..16655fabc 100644 --- a/drivers/gpu/nvgpu/common/fifo/channel_gv11b.h +++ b/drivers/gpu/nvgpu/common/fifo/channel_gv11b.h @@ -28,7 +28,7 @@ struct channel_gk20a; struct gk20a; -void gv11b_fifo_channel_unbind(struct channel_gk20a *ch); -u32 gv11b_fifo_channel_count(struct gk20a *g); +void gv11b_channel_unbind(struct channel_gk20a *ch); +u32 gv11b_channel_count(struct gk20a *g); #endif /* FIFO_CHANNEL_GV11B_H */ diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index 4ae69c9b3..f5fe6a3b7 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c @@ -572,11 +572,11 @@ static const struct gpu_ops gm20b_ops = { .runlist_write_state = gk20a_fifo_runlist_write_state, }, .channel = { - .bind = gm20b_fifo_channel_bind, - .unbind = gk20a_fifo_channel_unbind, - .enable = gk20a_fifo_channel_enable, - .disable = gk20a_fifo_channel_disable, - .count = gm20b_fifo_channel_count, + .bind = gm20b_channel_bind, + .unbind = gk20a_channel_unbind, + .enable = gk20a_channel_enable, + .disable = gk20a_channel_disable, + .count = gm20b_channel_count, }, .netlist = { .get_netlist_name = gm20b_netlist_get_name, diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index 1d365778b..659f8c0a7 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c @@ -625,11 +625,11 @@ static const struct gpu_ops gp10b_ops = { .runlist_write_state = gk20a_fifo_runlist_write_state, }, .channel = { - .bind = gm20b_fifo_channel_bind, - .unbind = gk20a_fifo_channel_unbind, - .enable = gk20a_fifo_channel_enable, - .disable = gk20a_fifo_channel_disable, - .count = gm20b_fifo_channel_count, + .bind = gm20b_channel_bind, + .unbind = gk20a_channel_unbind, + .enable = gk20a_channel_enable, + .disable = gk20a_channel_disable, + .count = gm20b_channel_count, }, .netlist = { .get_netlist_name = gp10b_netlist_get_name, diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index 23c00405e..2ae925be4 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c @@ -794,11 +794,11 @@ static const struct gpu_ops gv100_ops = { .runlist_write_state = gk20a_fifo_runlist_write_state, }, .channel = { - .bind = gm20b_fifo_channel_bind, - .unbind = gv11b_fifo_channel_unbind, - .enable = gk20a_fifo_channel_enable, - .disable = gk20a_fifo_channel_disable, - .count = gv100_fifo_channel_count, + .bind = gm20b_channel_bind, + .unbind = gv11b_channel_unbind, + .enable = gk20a_channel_enable, + .disable = gk20a_channel_disable, + .count = gv100_channel_count, }, .netlist = { .get_netlist_name = gv100_netlist_get_name, diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index 5bdc3a9a7..241e78d2a 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c @@ -753,11 +753,11 @@ static const struct gpu_ops gv11b_ops = { .runlist_write_state = gk20a_fifo_runlist_write_state, }, .channel = { - .bind = gm20b_fifo_channel_bind, - .unbind = gv11b_fifo_channel_unbind, - .enable = gk20a_fifo_channel_enable, - .disable = gk20a_fifo_channel_disable, - .count = gv11b_fifo_channel_count, + .bind = gm20b_channel_bind, + .unbind = gv11b_channel_unbind, + .enable = gk20a_channel_enable, + .disable = gk20a_channel_disable, + .count = gv11b_channel_count, }, .netlist = { .get_netlist_name = gv11b_netlist_get_name, diff --git a/drivers/gpu/nvgpu/tu104/hal_tu104.c b/drivers/gpu/nvgpu/tu104/hal_tu104.c index 0d757fddd..c12303591 100644 --- a/drivers/gpu/nvgpu/tu104/hal_tu104.c +++ b/drivers/gpu/nvgpu/tu104/hal_tu104.c @@ -825,11 +825,11 @@ static const struct gpu_ops tu104_ops = { .runlist_write_state = gk20a_fifo_runlist_write_state, }, .channel = { - .bind = gm20b_fifo_channel_bind, - .unbind = gv11b_fifo_channel_unbind, - .enable = gk20a_fifo_channel_enable, - .disable = gk20a_fifo_channel_disable, - .count = gv100_fifo_channel_count, + .bind = gm20b_channel_bind, + .unbind = gv11b_channel_unbind, + .enable = gk20a_channel_enable, + .disable = gk20a_channel_disable, + .count = gv100_channel_count, }, .netlist = { .get_netlist_name = tu104_netlist_get_name, diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c index 4a3491638..c34dec0f1 100644 --- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c @@ -438,7 +438,7 @@ static const struct gpu_ops vgpu_gp10b_ops = { .unbind = vgpu_channel_unbind, .enable = vgpu_channel_enable, .disable = vgpu_channel_disable, - .count = gm20b_fifo_channel_count, + .count = gm20b_channel_count, }, .netlist = { .get_netlist_name = gp10b_netlist_get_name, diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c index bf674f0e2..6a0cfab08 100644 --- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c @@ -513,7 +513,7 @@ static const struct gpu_ops vgpu_gv11b_ops = { .unbind = vgpu_channel_unbind, .enable = vgpu_channel_enable, .disable = vgpu_channel_disable, - .count = gv11b_fifo_channel_count, + .count = gv11b_channel_count, }, .netlist = { .get_netlist_name = gv11b_netlist_get_name,