diff options
| author | Mikko Perttunen <mperttunen@nvidia.com> | 2022-02-07 14:19:31 +0100 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2022-02-16 17:20:53 +0100 |
| commit | 184b58fa816fb5ee1854daf0d430766422bf2a77 (patch) | |
| tree | f9b9ebdf3f8c8ac0642429b5bfd14018217ab6e5 /drivers/gpu | |
| parent | gpu: host1x: Fix hang on Tegra186+ (diff) | |
| download | linux-184b58fa816fb5ee1854daf0d430766422bf2a77.tar.xz linux-184b58fa816fb5ee1854daf0d430766422bf2a77.zip | |
gpu: host1x: Always return syncpoint value when waiting
The new TegraDRM UAPI uses syncpoint waiting with timeout set to
zero to indicate reading the syncpoint value. To support that we
need to return the syncpoint value always when waiting.
Fixes: 44e961381354 ("drm/tegra: Implement syncpoint wait UAPI")
Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/host1x/syncpt.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/drivers/gpu/host1x/syncpt.c b/drivers/gpu/host1x/syncpt.c index 83a16e46146b..f87a8705f518 100644 --- a/drivers/gpu/host1x/syncpt.c +++ b/drivers/gpu/host1x/syncpt.c @@ -234,27 +234,12 @@ int host1x_syncpt_wait(struct host1x_syncpt *sp, u32 thresh, long timeout, void *ref; struct host1x_waitlist *waiter; int err = 0, check_count = 0; - u32 val; if (value) - *value = 0; - - /* first check cache */ - if (host1x_syncpt_is_expired(sp, thresh)) { - if (value) - *value = host1x_syncpt_load(sp); + *value = host1x_syncpt_load(sp); + if (host1x_syncpt_is_expired(sp, thresh)) return 0; - } - - /* try to read from register */ - val = host1x_hw_syncpt_load(sp->host, sp); - if (host1x_syncpt_is_expired(sp, thresh)) { - if (value) - *value = val; - - goto done; - } if (!timeout) { err = -EAGAIN; |