diff options
author | Debarshi Dutta <ddutta@nvidia.com> | 2018-11-30 00:27:05 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2019-02-11 11:18:47 -0500 |
commit | 18643ac1357a845d204d6dabd98359a0ab0509a7 (patch) | |
tree | c04d1f18668eb0fafae7c345780db52d5064d185 /drivers/gpu/nvgpu/vgpu/fifo_vgpu.c | |
parent | a8f0cb89f423093c334202dcfe43cb5729efca85 (diff) |
gpu: nvgpu: replace input param chid with pointer to channel
preempt_channel needs to use the channel to pass it to other
public functions, get access to a tsg etc. This qualifies it to take a
pointer to a channel as an input parameter instead of a chid.
Increment the channel ref counter using the function
gk20a_channel_from_id in functions where we get the chid from the h/w
registers directly. Once the prempt_channel function call is done,
use a gk20a_channel_put on the referenced channel.
Jira NVGPU-1461
Change-Id: I6c87c8104cfcb418d468c8c590087fd4aeabf4bd
Signed-off-by: Debarshi Dutta <ddutta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1963200
(cherry picked from commit 9abe9fe062367902ede7721cff55396859f8e4e8
in dev-kernel)
Reviewed-on: https://git-master.nvidia.com/r/2013728
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Bibek Basu <bbasu@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/vgpu/fifo_vgpu.c')
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/fifo_vgpu.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c index 9e3f7867..234f6fd4 100644 --- a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c | |||
@@ -443,10 +443,8 @@ int vgpu_init_fifo_support(struct gk20a *g) | |||
443 | return err; | 443 | return err; |
444 | } | 444 | } |
445 | 445 | ||
446 | int vgpu_fifo_preempt_channel(struct gk20a *g, u32 chid) | 446 | int vgpu_fifo_preempt_channel(struct gk20a *g, struct channel_gk20a *ch) |
447 | { | 447 | { |
448 | struct fifo_gk20a *f = &g->fifo; | ||
449 | struct channel_gk20a *ch = &f->channel[chid]; | ||
450 | struct tegra_vgpu_cmd_msg msg; | 448 | struct tegra_vgpu_cmd_msg msg; |
451 | struct tegra_vgpu_channel_config_params *p = | 449 | struct tegra_vgpu_channel_config_params *p = |
452 | &msg.params.channel_config; | 450 | &msg.params.channel_config; |
@@ -464,7 +462,7 @@ int vgpu_fifo_preempt_channel(struct gk20a *g, u32 chid) | |||
464 | 462 | ||
465 | if (err || msg.ret) { | 463 | if (err || msg.ret) { |
466 | nvgpu_err(g, | 464 | nvgpu_err(g, |
467 | "preempt channel %d failed", chid); | 465 | "preempt channel %d failed", ch->chid); |
468 | err = -ENOMEM; | 466 | err = -ENOMEM; |
469 | } | 467 | } |
470 | 468 | ||