linux-tegra.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mikko Perttunen <mperttunen@nvidia.com>
To: thierry.reding@gmail.com, jonathanh@nvidia.com, digetx@gmail.com,
	airlied@linux.ie, daniel@ffwll.ch
Cc: linux-tegra@vger.kernel.org, dri-devel@lists.freedesktop.org,
	talho@nvidia.com, bhuntsman@nvidia.com,
	Mikko Perttunen <mperttunen@nvidia.com>
Subject: [PATCH v4 04/21] gpu: host1x: Remove cancelled waiters immediately
Date: Fri, 20 Nov 2020 13:25:43 +0200	[thread overview]
Message-ID: <20201120112600.935082-5-mperttunen@nvidia.com> (raw)
In-Reply-To: <20201120112600.935082-1-mperttunen@nvidia.com>

Before this patch, cancelled waiters would only be cleaned up
once their threshold value was reached. Make host1x_intr_put_ref
process the cancellation immediately to fix this.

Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com>
---
 drivers/gpu/host1x/intr.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/host1x/intr.c b/drivers/gpu/host1x/intr.c
index 9245add23b5d..5d328d20ce6d 100644
--- a/drivers/gpu/host1x/intr.c
+++ b/drivers/gpu/host1x/intr.c
@@ -247,13 +247,17 @@ void host1x_intr_put_ref(struct host1x *host, unsigned int id, void *ref)
 	struct host1x_waitlist *waiter = ref;
 	struct host1x_syncpt *syncpt;
 
-	while (atomic_cmpxchg(&waiter->state, WLS_PENDING, WLS_CANCELLED) ==
-	       WLS_REMOVED)
-		schedule();
+	atomic_cmpxchg(&waiter->state, WLS_PENDING, WLS_CANCELLED);
 
 	syncpt = host->syncpt + id;
-	(void)process_wait_list(host, syncpt,
-				host1x_syncpt_load(host->syncpt + id));
+
+	spin_lock(&syncpt->intr.lock);
+	if (atomic_cmpxchg(&waiter->state, WLS_CANCELLED, WLS_HANDLED) ==
+	    WLS_CANCELLED) {
+		list_del(&waiter->list);
+		kref_put(&waiter->refcount, waiter_release);
+	}
+	spin_unlock(&syncpt->intr.lock);
 
 	kref_put(&waiter->refcount, waiter_release);
 }
-- 
2.29.2


  parent reply	other threads:[~2020-11-20 11:26 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-20 11:25 [PATCH v4 00/21] Host1x/TegraDRM UAPI Mikko Perttunen
2020-11-20 11:25 ` [PATCH v4 01/21] gpu: host1x: Use different lock classes for each client Mikko Perttunen
2020-11-20 11:25 ` [PATCH v4 02/21] gpu: host1x: Allow syncpoints without associated client Mikko Perttunen
2020-11-20 11:25 ` [PATCH v4 03/21] gpu: host1x: Show number of pending waiters in debugfs Mikko Perttunen
2020-11-20 11:25 ` Mikko Perttunen [this message]
2020-11-20 11:25 ` [PATCH v4 05/21] gpu: host1x: Use HW-equivalent syncpoint expiration check Mikko Perttunen
2020-11-20 11:25 ` [PATCH v4 06/21] gpu: host1x: Cleanup and refcounting for syncpoints Mikko Perttunen
2020-11-20 11:25 ` [PATCH v4 07/21] gpu: host1x: Introduce UAPI header Mikko Perttunen
2020-11-20 11:25 ` [PATCH v4 08/21] gpu: host1x: Implement /dev/host1x device node Mikko Perttunen
2020-11-20 11:25 ` [PATCH v4 09/21] gpu: host1x: DMA fences and userspace fence creation Mikko Perttunen
2020-11-20 11:25 ` [PATCH v4 10/21] gpu: host1x: Add no-recovery mode Mikko Perttunen
2020-11-20 11:25 ` [PATCH v4 11/21] gpu: host1x: Add job release callback Mikko Perttunen
2020-11-20 11:25 ` [PATCH v4 12/21] gpu: host1x: Add support for syncpoint waits in CDMA pushbuffer Mikko Perttunen
2020-11-20 11:25 ` [PATCH v4 13/21] gpu: host1x: Reset max value when freeing a syncpoint Mikko Perttunen
2020-11-20 11:25 ` [PATCH v4 14/21] gpu: host1x: Reserve VBLANK syncpoints at initialization Mikko Perttunen
2020-11-20 11:25 ` [PATCH v4 15/21] drm/tegra: Add new UAPI to header Mikko Perttunen
2020-11-20 11:25 ` [PATCH v4 16/21] drm/tegra: Boot VIC during runtime PM resume Mikko Perttunen
2020-11-20 11:25 ` [PATCH v4 17/21] drm/tegra: Set resv fields when importing/exporting GEMs Mikko Perttunen
2020-11-20 11:25 ` [PATCH v4 18/21] drm/tegra: Allocate per-engine channel in core code Mikko Perttunen
2020-11-20 11:25 ` [PATCH v4 19/21] drm/tegra: Implement new UAPI Mikko Perttunen
2020-11-20 13:23   ` kernel test robot
2020-11-20 13:23   ` kernel test robot
2020-11-20 11:25 ` [PATCH v4 20/21] drm/tegra: Implement job submission part of " Mikko Perttunen
2020-11-25  0:05   ` kernel test robot
2020-11-20 11:26 ` [PATCH v4 21/21] drm/tegra: Add job firewall Mikko Perttunen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201120112600.935082-5-mperttunen@nvidia.com \
    --to=mperttunen@nvidia.com \
    --cc=airlied@linux.ie \
    --cc=bhuntsman@nvidia.com \
    --cc=daniel@ffwll.ch \
    --cc=digetx@gmail.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=jonathanh@nvidia.com \
    --cc=linux-tegra@vger.kernel.org \
    --cc=talho@nvidia.com \
    --cc=thierry.reding@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).