Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1671951

[PATCH 2/4] drm/vc4: Wait for fences interruptibly in blocking mode.

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/4] drm/vc4: Hook up plane prepare_fb to lookup dma-buf reservations. Eric Anholt <eric@anholt.net> - 2017-06-21 21:00 +0200
  [PATCH 3/4] drm/vc4: Use the atomic state's commit workqueue. Eric Anholt <eric@anholt.net> - 2017-06-21 21:00 +0200
    Re: [PATCH 3/4] drm/vc4: Use the atomic state's commit workqueue. Daniel Vetter <daniel@ffwll.ch> - 2017-06-22 09:20 +0200
      Re: [PATCH 3/4] drm/vc4: Use the atomic state's commit workqueue. Eric Anholt <eric@anholt.net> - 2017-06-22 20:30 +0200
    Re: [PATCH 3/4] drm/vc4: Use the atomic state's commit workqueue. Boris Brezillon <boris.brezillon@free-electrons.com> - 2017-06-22 10:10 +0200
  [PATCH 2/4] drm/vc4: Wait for fences interruptibly in blocking mode. Eric Anholt <eric@anholt.net> - 2017-06-21 21:00 +0200
    Re: [PATCH 2/4] drm/vc4: Wait for fences interruptibly in blocking  mode. Boris Brezillon <boris.brezillon@free-electrons.com> - 2017-06-22 09:30 +0200
  [PATCH 4/4] drm/vc4: Remove dead vc4_event_pending(). Eric Anholt <eric@anholt.net> - 2017-06-21 21:00 +0200
    Re: [PATCH 4/4] drm/vc4: Remove dead vc4_event_pending(). Boris Brezillon <boris.brezillon@free-electrons.com> - 2017-06-21 22:00 +0200
  Re: [PATCH 1/4] drm/vc4: Hook up plane prepare_fb to lookup dma-buf  reservations. Boris Brezillon <boris.brezillon@free-electrons.com> - 2017-06-22 10:10 +0200

csiph-web