All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [CI 09/13] drm/i915: add wait flags to i915_active_request_retire
Date: Mon,  9 Sep 2019 10:18:05 +0300	[thread overview]
Message-ID: <20190909071809.23310-9-lionel.g.landwerlin@intel.com> (raw)
In-Reply-To: <20190909071809.23310-1-lionel.g.landwerlin@intel.com>

An upcoming change needs not to be interrupted.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---
 drivers/gpu/drm/i915/i915_active.c | 4 +++-
 drivers/gpu/drm/i915/i915_active.h | 5 ++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_active.c b/drivers/gpu/drm/i915/i915_active.c
index 6a447f1d0110..c808c28c9464 100644
--- a/drivers/gpu/drm/i915/i915_active.c
+++ b/drivers/gpu/drm/i915/i915_active.c
@@ -425,7 +425,9 @@ int i915_active_wait(struct i915_active *ref)
 			break;
 		}
 
-		err = i915_active_request_retire(&it->base, BKL(ref));
+		err = i915_active_request_retire(&it->base,
+						 I915_WAIT_INTERRUPTIBLE,
+						 BKL(ref));
 		if (err)
 			break;
 	}
diff --git a/drivers/gpu/drm/i915/i915_active.h b/drivers/gpu/drm/i915/i915_active.h
index f95058f99057..35a6089b44fd 100644
--- a/drivers/gpu/drm/i915/i915_active.h
+++ b/drivers/gpu/drm/i915/i915_active.h
@@ -309,6 +309,7 @@ i915_active_request_isset(const struct i915_active_request *active)
  */
 static inline int __must_check
 i915_active_request_retire(struct i915_active_request *active,
+			   unsigned int flags,
 			   struct mutex *mutex)
 {
 	struct i915_request *request;
@@ -318,9 +319,7 @@ i915_active_request_retire(struct i915_active_request *active,
 	if (!request)
 		return 0;
 
-	ret = i915_request_wait(request,
-				I915_WAIT_INTERRUPTIBLE,
-				MAX_SCHEDULE_TIMEOUT);
+	ret = i915_request_wait(request, flags, MAX_SCHEDULE_TIMEOUT);
 	if (ret < 0)
 		return ret;
 
-- 
2.23.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2019-09-09  7:18 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-09  7:17 [CI 01/13] drm/i915: introduce a mechanism to extend execbuf2 Lionel Landwerlin
2019-09-09  7:17 ` [CI 02/13] drm/i915: add syncobj timeline support Lionel Landwerlin
2019-09-09  7:17 ` [CI 03/13] drm/i915/perf: drop list of streams Lionel Landwerlin
2019-09-09  7:18 ` [CI 04/13] drm/i915/perf: store the associated engine of a stream Lionel Landwerlin
2019-09-09  7:18 ` [CI 05/13] drm/i915/perf: introduce a versioning of the i915-perf uapi Lionel Landwerlin
2019-09-09  7:18 ` [CI 06/13] drm/i915/perf: move perf types to their own header Lionel Landwerlin
2019-09-09  7:18 ` [CI 07/13] drm/i915/perf: allow for CS OA configs to be created lazily Lionel Landwerlin
2019-09-09  7:18 ` [CI 08/13] drm/i915/perf: implement active wait for noa configurations Lionel Landwerlin
2019-09-09  7:18 ` Lionel Landwerlin [this message]
2019-09-09  7:18 ` [CI 10/13] drm/i915/perf: execute OA configuration from command stream Lionel Landwerlin
2019-09-09  7:18 ` [CI 11/13] drm/i915: add a new perf configuration execbuf parameter Lionel Landwerlin
2019-09-09  7:18 ` [CI 12/13] drm/i915/perf: allow holding preemption on filtered ctx Lionel Landwerlin
2019-09-09  7:18 ` [CI 13/13] drm/i915: add support for perf configuration queries Lionel Landwerlin
2019-09-09  7:44 ` ✗ Fi.CI.BUILD: failure for series starting with [CI,01/13] drm/i915: introduce a mechanism to extend execbuf2 Patchwork
2019-09-09  8:22 [CI 01/13] " Lionel Landwerlin
2019-09-09  8:22 ` [CI 09/13] drm/i915: add wait flags to i915_active_request_retire Lionel Landwerlin

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=20190909071809.23310-9-lionel.g.landwerlin@intel.com \
    --to=lionel.g.landwerlin@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.