From 6e2e4d06581f96da381471301daed688a1c22129 Mon Sep 17 00:00:00 2001 From: Konsta Holtta Date: Wed, 7 Aug 2019 16:12:31 +0300 Subject: [PATCH] gpu: nvgpu: delete value tracking in syncpt wait API QNX nvhost_syncpt_wait_timeout_ext() no longer supports reporting the current syncpoint value (which nvgpu does not use either). Jira HOSTX-1347 Change-Id: I5108f19a53802df63df014dd0ec3a103e0c6531f Signed-off-by: Konsta Holtta Reviewed-on: https://git-master.nvidia.com/r/2170180 Reviewed-by: svc-mobile-coverity Reviewed-by: svc-mobile-misra GVS: Gerrit_Virtual_Submit Reviewed-by: Alex Waterman Reviewed-by: Mikko Perttunen Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/fence/fence.c | 2 +- drivers/gpu/nvgpu/include/nvgpu/nvhost.h | 2 +- drivers/gpu/nvgpu/os/linux/nvhost.c | 4 ++-- drivers/gpu/nvgpu/os/posix/posix-nvhost.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/nvgpu/common/fence/fence.c b/drivers/gpu/nvgpu/common/fence/fence.c index 589a2d789..27aefcd88 100644 --- a/drivers/gpu/nvgpu/common/fence/fence.c +++ b/drivers/gpu/nvgpu/common/fence/fence.c @@ -261,7 +261,7 @@ static int nvgpu_fence_syncpt_wait(struct nvgpu_fence_type *f, u32 timeout) { return nvgpu_nvhost_syncpt_wait_timeout_ext( f->nvhost_dev, f->syncpt_id, f->syncpt_value, - timeout, NULL); + timeout); } static bool nvgpu_fence_syncpt_is_expired(struct nvgpu_fence_type *f) diff --git a/drivers/gpu/nvgpu/include/nvgpu/nvhost.h b/drivers/gpu/nvgpu/include/nvgpu/nvhost.h index 2c5c6c1d9..c6891e9b7 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/nvhost.h +++ b/drivers/gpu/nvgpu/include/nvgpu/nvhost.h @@ -44,7 +44,7 @@ void nvgpu_nvhost_debug_dump_device(struct nvgpu_nvhost_dev *nvhost_dev); bool nvgpu_nvhost_syncpt_is_expired_ext(struct nvgpu_nvhost_dev *nvhost_dev, u32 id, u32 thresh); int nvgpu_nvhost_syncpt_wait_timeout_ext(struct nvgpu_nvhost_dev *nvhost_dev, - u32 id, u32 thresh, u32 timeout, u32 *value); + u32 id, u32 thresh, u32 timeout); u32 nvgpu_nvhost_syncpt_incr_max_ext(struct nvgpu_nvhost_dev *nvhost_dev, u32 id, u32 incrs); diff --git a/drivers/gpu/nvgpu/os/linux/nvhost.c b/drivers/gpu/nvgpu/os/linux/nvhost.c index ea4ed72a8..0c93e6a1c 100644 --- a/drivers/gpu/nvgpu/os/linux/nvhost.c +++ b/drivers/gpu/nvgpu/os/linux/nvhost.c @@ -149,10 +149,10 @@ u32 nvgpu_nvhost_get_syncpt_client_managed( int nvgpu_nvhost_syncpt_wait_timeout_ext( struct nvgpu_nvhost_dev *nvhost_dev, u32 id, - u32 thresh, u32 timeout, u32 *value) + u32 thresh, u32 timeout) { return nvhost_syncpt_wait_timeout_ext(nvhost_dev->host1x_pdev, - id, thresh, timeout, value, NULL); + id, thresh, timeout, NULL, NULL); } int nvgpu_nvhost_syncpt_read_ext_check( diff --git a/drivers/gpu/nvgpu/os/posix/posix-nvhost.c b/drivers/gpu/nvgpu/os/posix/posix-nvhost.c index 456fe7efe..7917d4ffc 100644 --- a/drivers/gpu/nvgpu/os/posix/posix-nvhost.c +++ b/drivers/gpu/nvgpu/os/posix/posix-nvhost.c @@ -120,7 +120,7 @@ u32 nvgpu_nvhost_get_syncpt_client_managed( int nvgpu_nvhost_syncpt_wait_timeout_ext( struct nvgpu_nvhost_dev *nvhost_dev, u32 id, - u32 thresh, u32 timeout, u32 *value) + u32 thresh, u32 timeout) { BUG(); return 0;