All of lore.kernel.org
 help / color / mirror / Atom feed
From: Eric Anholt <eric@anholt.net>
To: dri-devel@lists.freedesktop.org,
	Boris Brezillon <boris.brezillon@free-electrons.com>
Cc: linux-kernel@vger.kernel.org, Eric Anholt <eric@anholt.net>
Subject: [PATCH 2/4] drm/vc4: Wait for fences interruptibly in blocking mode.
Date: Wed, 21 Jun 2017 11:50:00 -0700	[thread overview]
Message-ID: <20170621185002.28563-2-eric@anholt.net> (raw)
In-Reply-To: <20170621185002.28563-1-eric@anholt.net>

We should allow SIGIO and things to interrupt us before we get to the
no-error stage of the commit process.  This code is effectively copied
from drm_atomic_helper_commit().

Signed-off-by: Eric Anholt <eric@anholt.net>
---
 drivers/gpu/drm/vc4/vc4_kms.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
index bc6ecdc6f104..6b1ccea76243 100644
--- a/drivers/gpu/drm/vc4/vc4_kms.c
+++ b/drivers/gpu/drm/vc4/vc4_kms.c
@@ -142,6 +142,16 @@ static int vc4_atomic_commit(struct drm_device *dev,
 		return ret;
 	}
 
+	if (!nonblock) {
+		ret = drm_atomic_helper_wait_for_fences(dev, state, true);
+		if (ret) {
+			drm_atomic_helper_cleanup_planes(dev, state);
+			kfree(c);
+			up(&vc4->async_modeset);
+			return ret;
+		}
+	}
+
 	for_each_plane_in_state(state, plane, new_state, i) {
 		if ((plane->state->fb != new_state->fb) && new_state->fb) {
 			struct drm_gem_cma_object *cma_bo =
-- 
2.11.0

WARNING: multiple messages have this Message-ID (diff)
From: Eric Anholt <eric@anholt.net>
To: dri-devel@lists.freedesktop.org,
	Boris Brezillon <boris.brezillon@free-electrons.com>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 2/4] drm/vc4: Wait for fences interruptibly in blocking mode.
Date: Wed, 21 Jun 2017 11:50:00 -0700	[thread overview]
Message-ID: <20170621185002.28563-2-eric@anholt.net> (raw)
In-Reply-To: <20170621185002.28563-1-eric@anholt.net>

We should allow SIGIO and things to interrupt us before we get to the
no-error stage of the commit process.  This code is effectively copied
from drm_atomic_helper_commit().

Signed-off-by: Eric Anholt <eric@anholt.net>
---
 drivers/gpu/drm/vc4/vc4_kms.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
index bc6ecdc6f104..6b1ccea76243 100644
--- a/drivers/gpu/drm/vc4/vc4_kms.c
+++ b/drivers/gpu/drm/vc4/vc4_kms.c
@@ -142,6 +142,16 @@ static int vc4_atomic_commit(struct drm_device *dev,
 		return ret;
 	}
 
+	if (!nonblock) {
+		ret = drm_atomic_helper_wait_for_fences(dev, state, true);
+		if (ret) {
+			drm_atomic_helper_cleanup_planes(dev, state);
+			kfree(c);
+			up(&vc4->async_modeset);
+			return ret;
+		}
+	}
+
 	for_each_plane_in_state(state, plane, new_state, i) {
 		if ((plane->state->fb != new_state->fb) && new_state->fb) {
 			struct drm_gem_cma_object *cma_bo =
-- 
2.11.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  reply	other threads:[~2017-06-21 18:50 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-21 18:49 [PATCH 1/4] drm/vc4: Hook up plane prepare_fb to lookup dma-buf reservations Eric Anholt
2017-06-21 18:50 ` Eric Anholt [this message]
2017-06-21 18:50   ` [PATCH 2/4] drm/vc4: Wait for fences interruptibly in blocking mode Eric Anholt
2017-06-22  7:22   ` Boris Brezillon
2017-06-22  7:22     ` Boris Brezillon
2017-06-21 18:50 ` [PATCH 3/4] drm/vc4: Use the atomic state's commit workqueue Eric Anholt
2017-06-21 18:50   ` Eric Anholt
2017-06-22  7:16   ` Daniel Vetter
2017-06-22  7:16     ` Daniel Vetter
2017-06-22 18:27     ` Eric Anholt
2017-06-22  8:06   ` Boris Brezillon
2017-06-22  8:06     ` Boris Brezillon
2017-06-21 18:50 ` [PATCH 4/4] drm/vc4: Remove dead vc4_event_pending() Eric Anholt
2017-06-21 18:50   ` Eric Anholt
2017-06-21 19:54   ` Boris Brezillon
2017-06-21 19:54     ` Boris Brezillon
2017-06-22  8:03 ` [PATCH 1/4] drm/vc4: Hook up plane prepare_fb to lookup dma-buf reservations Boris Brezillon
2017-06-22  8:03   ` Boris Brezillon

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=20170621185002.28563-2-eric@anholt.net \
    --to=eric@anholt.net \
    --cc=boris.brezillon@free-electrons.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.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.