mirror of
git://nv-tegra.nvidia.com/linux-nvgpu.git
synced 2025-12-22 17:36:20 +03:00
a439d3767d
- use release instead of free for the fence destroy identifier - nvhost_dev is a struct name, so use nvhost_device - compare nvgpu_nvhost_syncpt_read_ext_check retval properly Also, if the syncpt read fails when checking for fence expiration, behave as if the wait isn't expired. Possibly getting stuck is safer than possibly continuing too early. Jira NVGPU-5617 Change-Id: Ied529e25f8c43f1c78fd9eac73b9cd6c3550ead5 Signed-off-by: Konsta Hölttä <kholtta@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2398399 Reviewed-by: automaticguardword <automaticguardword@nvidia.com> Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com> Reviewed-by: svc-mobile-cert <svc-mobile-cert@nvidia.com> Reviewed-by: Alex Waterman <alexw@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> GVS: Gerrit_Virtual_Submit Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
90 lines
2.9 KiB
C
90 lines
2.9 KiB
C
/*
|
|
* Copyright (c) 2014-2020, NVIDIA CORPORATION. All rights reserved.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
* DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
|
|
#include <nvgpu/nvhost.h>
|
|
#include <nvgpu/fence.h>
|
|
#include <nvgpu/fence_syncpt.h>
|
|
#include "fence_priv.h"
|
|
|
|
static int nvgpu_fence_syncpt_wait(struct nvgpu_fence_type *f, u32 timeout)
|
|
{
|
|
struct nvgpu_fence_type_priv *pf = &f->priv;
|
|
|
|
return nvgpu_nvhost_syncpt_wait_timeout_ext(
|
|
pf->nvhost_device, pf->syncpt_id, pf->syncpt_value,
|
|
timeout, NVGPU_NVHOST_DEFAULT_WAITER);
|
|
}
|
|
|
|
static bool nvgpu_fence_syncpt_is_expired(struct nvgpu_fence_type *f)
|
|
{
|
|
struct nvgpu_fence_type_priv *pf = &f->priv;
|
|
|
|
/*
|
|
* In cases we don't register a notifier, we can't expect the
|
|
* syncpt value to be updated. For this case, we force a read
|
|
* of the value from HW, and then check for expiration.
|
|
*/
|
|
if (!nvgpu_nvhost_syncpt_is_expired_ext(pf->nvhost_device,
|
|
pf->syncpt_id, pf->syncpt_value)) {
|
|
int err;
|
|
u32 val;
|
|
|
|
err = nvgpu_nvhost_syncpt_read_ext_check(pf->nvhost_device,
|
|
pf->syncpt_id, &val);
|
|
WARN(err != 0, "syncpt read failed??");
|
|
if (err == 0) {
|
|
return nvgpu_nvhost_syncpt_is_expired_ext(
|
|
pf->nvhost_device,
|
|
pf->syncpt_id, pf->syncpt_value);
|
|
} else {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
static void nvgpu_fence_syncpt_release(struct nvgpu_fence_type *f)
|
|
{
|
|
}
|
|
|
|
static const struct nvgpu_fence_ops nvgpu_fence_syncpt_ops = {
|
|
.wait = nvgpu_fence_syncpt_wait,
|
|
.is_expired = nvgpu_fence_syncpt_is_expired,
|
|
.release = nvgpu_fence_syncpt_release,
|
|
};
|
|
|
|
/* This function takes the ownership of the os_fence */
|
|
void nvgpu_fence_from_syncpt(
|
|
struct nvgpu_fence_type *f,
|
|
struct nvgpu_nvhost_dev *nvhost_device,
|
|
u32 id, u32 value, struct nvgpu_os_fence os_fence)
|
|
{
|
|
struct nvgpu_fence_type_priv *pf = &f->priv;
|
|
|
|
nvgpu_fence_init(f, &nvgpu_fence_syncpt_ops, os_fence);
|
|
|
|
pf->nvhost_device = nvhost_device;
|
|
pf->syncpt_id = id;
|
|
pf->syncpt_value = value;
|
|
}
|