nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-23 01:50:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: remove fence param from channel_sync

Browse Source 
The fence parameter that gets output from gk20a_channel_sync's wait()
and wait_fd() APIs is no longer used for anything. Delete it.

Jira NVGPU-527
Jira NVGPU-528
Bug 200390539

Change-Id: I659504062dc6aee83a0a0d9f5625372b4ae8c0e2
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1676734
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Konsta Holtta
2018-03-15 15:34:14 +02:00
committed by mobile promotions
parent 0378bc32e4
commit 9f9035d10b
3 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/nvgpu/common/linux/channel.c
View File

@@ -488,11 +488,11 @@ static int gk20a_submit_prepare_syncs(struct channel_gk20a *c,
if (flags & NVGPU_SUBMIT_GPFIFO_FLAGS_SYNC_FENCE) { if (flags & NVGPU_SUBMIT_GPFIFO_FLAGS_SYNC_FENCE) {
wait_fence_fd = fence->id; wait_fence_fd = fence->id;
err = c->sync->wait_fd(c->sync, wait_fence_fd, err = c->sync->wait_fd(c->sync, wait_fence_fd,
job->wait_cmd, job->pre_fence); job->wait_cmd);
} else { } else {
err = c->sync->wait_syncpt(c->sync, fence->id, err = c->sync->wait_syncpt(c->sync, fence->id,
fence->value, job->wait_cmd, fence->value,
job->pre_fence); job->wait_cmd);
} }
if (!err) { if (!err) {

12
drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.c
View File

@@ -51,8 +51,7 @@ struct gk20a_channel_syncpt {
}; };
static int gk20a_channel_syncpt_wait_syncpt(struct gk20a_channel_sync *s, static int gk20a_channel_syncpt_wait_syncpt(struct gk20a_channel_sync *s,
u32 id, u32 thresh, struct priv_cmd_entry *wait_cmd, u32 id, u32 thresh, struct priv_cmd_entry *wait_cmd)
struct gk20a_fence *fence)
{ {
struct gk20a_channel_syncpt *sp = struct gk20a_channel_syncpt *sp =
container_of(s, struct gk20a_channel_syncpt, ops); container_of(s, struct gk20a_channel_syncpt, ops);
@@ -84,8 +83,7 @@ static int gk20a_channel_syncpt_wait_syncpt(struct gk20a_channel_sync *s,
} }
static int gk20a_channel_syncpt_wait_fd(struct gk20a_channel_sync *s, int fd, static int gk20a_channel_syncpt_wait_fd(struct gk20a_channel_sync *s, int fd,
struct priv_cmd_entry *wait_cmd, struct priv_cmd_entry *wait_cmd)
struct gk20a_fence *fence)
{ {
#ifdef CONFIG_SYNC #ifdef CONFIG_SYNC
int i; int i;
@@ -456,8 +454,7 @@ static void add_sema_cmd(struct gk20a *g, struct channel_gk20a *c,
static int gk20a_channel_semaphore_wait_syncpt( static int gk20a_channel_semaphore_wait_syncpt(
struct gk20a_channel_sync *s, u32 id, struct gk20a_channel_sync *s, u32 id,
u32 thresh, struct priv_cmd_entry *entry, u32 thresh, struct priv_cmd_entry *entry)
struct gk20a_fence *fence)
{ {
struct gk20a_channel_semaphore *sema = struct gk20a_channel_semaphore *sema =
container_of(s, struct gk20a_channel_semaphore, ops); container_of(s, struct gk20a_channel_semaphore, ops);
@@ -521,8 +518,7 @@ put_fence:
static int gk20a_channel_semaphore_wait_fd( static int gk20a_channel_semaphore_wait_fd(
struct gk20a_channel_sync *s, int fd, struct gk20a_channel_sync *s, int fd,
struct priv_cmd_entry *entry, struct priv_cmd_entry *entry)
struct gk20a_fence *fence)
{ {
struct gk20a_channel_semaphore *sema = struct gk20a_channel_semaphore *sema =
container_of(s, struct gk20a_channel_semaphore, ops); container_of(s, struct gk20a_channel_semaphore, ops);

16
drivers/gpu/nvgpu/gk20a/channel_sync_gk20a.h
View File

@@ -37,24 +37,16 @@ struct gk20a_channel_sync {
nvgpu_atomic_t refcount; nvgpu_atomic_t refcount;
/* Generate a gpu wait cmdbuf from syncpoint. /* Generate a gpu wait cmdbuf from syncpoint.
* Returns * Returns a gpu cmdbuf that performs the wait when executed
* - a gpu cmdbuf that performs the wait when executed,
* - possibly a helper fence that the caller must hold until the
* cmdbuf is executed.
*/ */
int (*wait_syncpt)(struct gk20a_channel_sync *s, u32 id, u32 thresh, int (*wait_syncpt)(struct gk20a_channel_sync *s, u32 id, u32 thresh,
struct priv_cmd_entry *entry, struct priv_cmd_entry *entry);
struct gk20a_fence *fence);
/* Generate a gpu wait cmdbuf from sync fd. /* Generate a gpu wait cmdbuf from sync fd.
* Returns * Returns a gpu cmdbuf that performs the wait when executed
* - a gpu cmdbuf that performs the wait when executed,
* - possibly a helper fence that the caller must hold until the
* cmdbuf is executed.
*/ */
int (*wait_fd)(struct gk20a_channel_sync *s, int fd, int (*wait_fd)(struct gk20a_channel_sync *s, int fd,
struct priv_cmd_entry *entry, struct priv_cmd_entry *entry);
struct gk20a_fence *fence);
/* Increment syncpoint/semaphore. /* Increment syncpoint/semaphore.
* Returns * Returns