diff options
author | Konsta Holtta <kholtta@nvidia.com> | 2018-11-15 08:31:09 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2019-02-05 12:04:33 -0500 |
commit | 7e8ba851a826f398fb722b9ff26d6fd40f3226ce (patch) | |
tree | 89c64cd962853a2d3ede4f7a663d66138d427321 | |
parent | 301a9d2426b1f14d8839307fe5eabe239a973ee1 (diff) |
gpu: nvgpu: delete raw chid lookup
This (dangerous) array lookup with no channel references is now unused.
Jira NVGPU-1460
Change-Id: Ic6bdbcf19fc8996bc6ff02a40afe3224bdd5bc27
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1955402
Signed-off-by: Debarshi Dutta <ddutta@nvidia.com>
(cherry picked from commit 4a53854a92e7c841fa3cb58da062fa756ae7b5c7 in
dev-kernel)
Reviewed-on: https://git-master.nvidia.com/r/2008517
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 10 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fifo_gk20a.h | 3 |
2 files changed, 0 insertions, 13 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c index f4a4591d..5e794a55 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | |||
@@ -3859,16 +3859,6 @@ u32 gk20a_fifo_get_pbdma_signature(struct gk20a *g) | |||
3859 | return pbdma_signature_hw_valid_f() | pbdma_signature_sw_zero_f(); | 3859 | return pbdma_signature_hw_valid_f() | pbdma_signature_sw_zero_f(); |
3860 | } | 3860 | } |
3861 | 3861 | ||
3862 | struct channel_gk20a *gk20a_fifo_channel_from_chid(struct gk20a *g, | ||
3863 | u32 chid) | ||
3864 | { | ||
3865 | if (chid != FIFO_INVAL_CHANNEL_ID) { | ||
3866 | return g->fifo.channel + chid; | ||
3867 | } else { | ||
3868 | return NULL; | ||
3869 | } | ||
3870 | } | ||
3871 | |||
3872 | static const char * const ccsr_chan_status_str[] = { | 3862 | static const char * const ccsr_chan_status_str[] = { |
3873 | "idle", | 3863 | "idle", |
3874 | "pending", | 3864 | "pending", |
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h index 21922426..2b646a7b 100644 --- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.h | |||
@@ -293,9 +293,6 @@ void gk20a_fifo_set_ctx_mmu_error_ch(struct gk20a *g, | |||
293 | bool gk20a_fifo_error_tsg(struct gk20a *g, struct tsg_gk20a *tsg); | 293 | bool gk20a_fifo_error_tsg(struct gk20a *g, struct tsg_gk20a *tsg); |
294 | bool gk20a_fifo_error_ch(struct gk20a *g, struct channel_gk20a *refch); | 294 | bool gk20a_fifo_error_ch(struct gk20a *g, struct channel_gk20a *refch); |
295 | 295 | ||
296 | struct channel_gk20a *gk20a_fifo_channel_from_chid(struct gk20a *g, | ||
297 | u32 chid); | ||
298 | |||
299 | void gk20a_fifo_issue_preempt(struct gk20a *g, u32 id, bool is_tsg); | 296 | void gk20a_fifo_issue_preempt(struct gk20a *g, u32 id, bool is_tsg); |
300 | int gk20a_fifo_set_runlist_interleave(struct gk20a *g, | 297 | int gk20a_fifo_set_runlist_interleave(struct gk20a *g, |
301 | u32 id, | 298 | u32 id, |