summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/include
diff options
context:
space:
mode:
authorDebarshi Dutta <ddutta@nvidia.com>2018-11-30 00:27:05 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2019-02-11 11:18:47 -0500
commit18643ac1357a845d204d6dabd98359a0ab0509a7 (patch)
treec04d1f18668eb0fafae7c345780db52d5064d185 /drivers/gpu/nvgpu/include
parenta8f0cb89f423093c334202dcfe43cb5729efca85 (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/include')
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/gk20a.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
index f6aabd82..dfa4aaf2 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/gk20a.h
@@ -645,7 +645,7 @@ struct gpu_ops {
645 unsigned long acquire_timeout, 645 unsigned long acquire_timeout,
646 u32 flags); 646 u32 flags);
647 int (*resetup_ramfc)(struct channel_gk20a *c); 647 int (*resetup_ramfc)(struct channel_gk20a *c);
648 int (*preempt_channel)(struct gk20a *g, u32 chid); 648 int (*preempt_channel)(struct gk20a *g, struct channel_gk20a *ch);
649 int (*preempt_tsg)(struct gk20a *g, struct tsg_gk20a *tsg); 649 int (*preempt_tsg)(struct gk20a *g, struct tsg_gk20a *tsg);
650 int (*enable_tsg)(struct tsg_gk20a *tsg); 650 int (*enable_tsg)(struct tsg_gk20a *tsg);
651 int (*disable_tsg)(struct tsg_gk20a *tsg); 651 int (*disable_tsg)(struct tsg_gk20a *tsg);