[PATCH] drm/rockchip: Return -EBUSY if there's already a pending flip event v2

From	Tomeu Vizoso <tomeu.vizoso@collabora.com>
Newsgroups	linux.kernel
Subject	[PATCH] drm/rockchip: Return -EBUSY if there's already a pending flip event v2
Date	2016-03-31 10:10 +0200
Message-ID	<riFPY-20X-11@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

As per the docs, atomic_commit should return -EBUSY "if an asycnhronous
updated is requested and there is an earlier updated pending".

v2: Use the status of the workqueue instead of vop->event, and don't add
a superfluous wait on the workqueue.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
---
 drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
index 3b8f652698f8..285f8cd5afe1 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
@@ -282,6 +282,9 @@ int rockchip_drm_atomic_commit(struct drm_device *dev,
 	struct rockchip_atomic_commit *commit = &private->commit;
 	int ret;
 
+	if (async && work_busy(&commit->work))
+		return -EBUSY;
+
 	ret = drm_atomic_helper_prepare_planes(dev, state);
 	if (ret)
 		return ret;
-- 
2.5.5

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

Thread

[PATCH] drm/rockchip: Return -EBUSY if there's already a pending flip event v2 Tomeu Vizoso <tomeu.vizoso@collabora.com> - 2016-03-31 10:10 +0200
  Re: [PATCH] drm/rockchip: Return -EBUSY if there's already a pending  flip event v2 Tomeu Vizoso <tomeu.vizoso@collabora.com> - 2016-04-01 13:50 +0200
    Re: [PATCH] drm/rockchip: Return -EBUSY if there's already a pending  flip event v2 Mark yao <mark.yao@rock-chips.com> - 2016-04-01 14:00 +0200

csiph-web