diff options
author | Konsta Holtta <kholtta@nvidia.com> | 2017-11-24 04:42:37 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-11-27 07:19:26 -0500 |
commit | 75ebe51113ab38d0434dda5224baa26dc5329530 (patch) | |
tree | 95bf3c04c4561bca0e0135e10d36ec53a679e46a | |
parent | fda4f49f393d94ff34ccf4e714caf2795229a75a (diff) |
gpu: nvgpu: drop num_pts argument in nvgpu_nvhost_sync_create_fence
For nvhost_sync_create_fence, num_pts corresponds to the number of
syncpoints in the array given to it, and the wrapper
nvgpu_nvhost_sync_create_fence only supports one syncpoint at a time.
Use 1 explicitly and make it impossible for the caller of this wrapper
to use something else by mistake.
Change-Id: I2497c1dd4fed0906e3bb07e8f5ddd3a9346cb381
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1604339
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/nvhost.c | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fence_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/nvhost.h | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/nvhost.c b/drivers/gpu/nvgpu/common/linux/nvhost.c index 611351ae..b8e51aac 100644 --- a/drivers/gpu/nvgpu/common/linux/nvhost.c +++ b/drivers/gpu/nvgpu/common/linux/nvhost.c | |||
@@ -199,14 +199,13 @@ int nvgpu_nvhost_sync_num_pts(struct sync_fence *fence) | |||
199 | 199 | ||
200 | struct sync_fence *nvgpu_nvhost_sync_create_fence( | 200 | struct sync_fence *nvgpu_nvhost_sync_create_fence( |
201 | struct nvgpu_nvhost_dev *nvhost_dev, | 201 | struct nvgpu_nvhost_dev *nvhost_dev, |
202 | u32 id, u32 thresh, | 202 | u32 id, u32 thresh, const char *name) |
203 | u32 num_pts, const char *name) | ||
204 | { | 203 | { |
205 | struct nvhost_ctrl_sync_fence_info pt = { | 204 | struct nvhost_ctrl_sync_fence_info pt = { |
206 | .id = id, | 205 | .id = id, |
207 | .thresh = thresh, | 206 | .thresh = thresh, |
208 | }; | 207 | }; |
209 | 208 | ||
210 | return nvhost_sync_create_fence(nvhost_dev->host1x_pdev, &pt, num_pts, name); | 209 | return nvhost_sync_create_fence(nvhost_dev->host1x_pdev, &pt, 1, name); |
211 | } | 210 | } |
212 | #endif /* CONFIG_SYNC */ | 211 | #endif /* CONFIG_SYNC */ |
diff --git a/drivers/gpu/nvgpu/gk20a/fence_gk20a.c b/drivers/gpu/nvgpu/gk20a/fence_gk20a.c index d0df8857..60858424 100644 --- a/drivers/gpu/nvgpu/gk20a/fence_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fence_gk20a.c | |||
@@ -317,7 +317,7 @@ int gk20a_fence_from_syncpt( | |||
317 | #ifdef CONFIG_SYNC | 317 | #ifdef CONFIG_SYNC |
318 | if (need_sync_fence) { | 318 | if (need_sync_fence) { |
319 | sync_fence = nvgpu_nvhost_sync_create_fence(nvhost_dev, | 319 | sync_fence = nvgpu_nvhost_sync_create_fence(nvhost_dev, |
320 | id, value, 1, "fence"); | 320 | id, value, "fence"); |
321 | if (IS_ERR(sync_fence)) | 321 | if (IS_ERR(sync_fence)) |
322 | return -1; | 322 | return -1; |
323 | } | 323 | } |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/nvhost.h b/drivers/gpu/nvgpu/include/nvgpu/nvhost.h index 536b248a..d852c77c 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/nvhost.h +++ b/drivers/gpu/nvgpu/include/nvgpu/nvhost.h | |||
@@ -75,7 +75,7 @@ int nvgpu_nvhost_sync_num_pts(struct sync_fence *fence); | |||
75 | struct sync_fence *nvgpu_nvhost_sync_fdget(int fd); | 75 | struct sync_fence *nvgpu_nvhost_sync_fdget(int fd); |
76 | struct sync_fence *nvgpu_nvhost_sync_create_fence( | 76 | struct sync_fence *nvgpu_nvhost_sync_create_fence( |
77 | struct nvgpu_nvhost_dev *nvhost_dev, | 77 | struct nvgpu_nvhost_dev *nvhost_dev, |
78 | u32 id, u32 thresh, u32 num_pts, const char *name); | 78 | u32 id, u32 thresh, const char *name); |
79 | #endif /* CONFIG_SYNC */ | 79 | #endif /* CONFIG_SYNC */ |
80 | #endif /* CONFIG_TEGRA_GK20A_NVHOST */ | 80 | #endif /* CONFIG_TEGRA_GK20A_NVHOST */ |
81 | #endif /* __NVGPU_NVHOST_H__ */ | 81 | #endif /* __NVGPU_NVHOST_H__ */ |