All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mark Yao <mark.yao@rock-chips.com>
To: David Airlie <airlied@linux.ie>, Heiko Stuebner <heiko@sntech.de>,
	dri-devel@lists.freedesktop.org,
	linux-arm-kernel@lists.infradead.org,
	linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org
Cc: Mark Yao <mark.yao@rock-chips.com>
Subject: [RFC PATCH 4/9] drm/rockchip: support atomic asynchronous commit
Date: Tue,  1 Dec 2015 11:26:26 +0800	[thread overview]
Message-ID: <1448940391-23333-5-git-send-email-mark.yao@rock-chips.com> (raw)
In-Reply-To: <1448940391-23333-1-git-send-email-mark.yao@rock-chips.com>

If drm core requests a async commit, rockchip_drm_atomic_commit
will schedule a work task to update later.

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
---
 drivers/gpu/drm/rockchip/rockchip_drm_fb.c |   60 ++++++++++++++++++++++------
 1 file changed, 47 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
index c86d93a..30ddf4a 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
@@ -29,6 +29,12 @@ struct rockchip_drm_fb {
 	struct drm_gem_object *obj[ROCKCHIP_MAX_FB_BUFFER];
 };
 
+struct rockchip_atomic_commit {
+	struct work_struct	work;
+	struct drm_device	*dev;
+	struct drm_atomic_state *state;
+};
+
 struct drm_gem_object *rockchip_fb_get_gem_obj(struct drm_framebuffer *fb,
 					       unsigned int plane)
 {
@@ -195,20 +201,11 @@ static void rockchip_atomic_wait_for_complete(struct drm_atomic_state *state)
 	}
 }
 
-int rockchip_drm_atomic_commit(struct drm_device *dev,
-			       struct drm_atomic_state *state,
-			       bool async)
+static void
+rockchip_atomic_commit_complete(struct rockchip_atomic_commit *commit)
 {
-	int ret;
-
-	if (async)
-		return -EBUSY;
-
-	ret = drm_atomic_helper_prepare_planes(dev, state);
-	if (ret)
-		return ret;
-
-	drm_atomic_helper_swap_state(dev, state);
+	struct drm_device *dev = commit->dev;
+	struct drm_atomic_state *state = commit->state;
 
 	/*
 	 * TODO: do fence wait here.
@@ -226,6 +223,43 @@ int rockchip_drm_atomic_commit(struct drm_device *dev,
 
 	drm_atomic_state_free(state);
 
+	kfree(commit);
+}
+
+static void rockchip_drm_atomic_work(struct work_struct *work)
+{
+	struct rockchip_atomic_commit *commit = container_of(work,
+					struct rockchip_atomic_commit, work);
+
+	rockchip_atomic_commit_complete(commit);
+}
+
+int rockchip_drm_atomic_commit(struct drm_device *dev,
+			       struct drm_atomic_state *state,
+			       bool async)
+{
+	int ret;
+	struct rockchip_atomic_commit *commit;
+
+	ret = drm_atomic_helper_prepare_planes(dev, state);
+	if (ret)
+		return ret;
+
+	drm_atomic_helper_swap_state(dev, state);
+
+	commit = kzalloc(sizeof(*commit), GFP_KERNEL);
+	if (!commit)
+		return -ENOMEM;
+
+	INIT_WORK(&commit->work, rockchip_drm_atomic_work);
+	commit->dev = dev;
+	commit->state = state;
+
+	if (async)
+		schedule_work(&commit->work);
+	else
+		rockchip_atomic_commit_complete(commit);
+
 	return 0;
 }
 
-- 
1.7.9.5



WARNING: multiple messages have this Message-ID (diff)
From: Mark Yao <mark.yao@rock-chips.com>
To: David Airlie <airlied@linux.ie>, Heiko Stuebner <heiko@sntech.de>,
	dri-devel@lists.freedesktop.org,
	linux-arm-kernel@lists.infradead.org,
	linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [RFC PATCH 4/9] drm/rockchip: support atomic asynchronous commit
Date: Tue,  1 Dec 2015 11:26:26 +0800	[thread overview]
Message-ID: <1448940391-23333-5-git-send-email-mark.yao@rock-chips.com> (raw)
In-Reply-To: <1448940391-23333-1-git-send-email-mark.yao@rock-chips.com>

If drm core requests a async commit, rockchip_drm_atomic_commit
will schedule a work task to update later.

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
---
 drivers/gpu/drm/rockchip/rockchip_drm_fb.c |   60 ++++++++++++++++++++++------
 1 file changed, 47 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
index c86d93a..30ddf4a 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
@@ -29,6 +29,12 @@ struct rockchip_drm_fb {
 	struct drm_gem_object *obj[ROCKCHIP_MAX_FB_BUFFER];
 };
 
+struct rockchip_atomic_commit {
+	struct work_struct	work;
+	struct drm_device	*dev;
+	struct drm_atomic_state *state;
+};
+
 struct drm_gem_object *rockchip_fb_get_gem_obj(struct drm_framebuffer *fb,
 					       unsigned int plane)
 {
@@ -195,20 +201,11 @@ static void rockchip_atomic_wait_for_complete(struct drm_atomic_state *state)
 	}
 }
 
-int rockchip_drm_atomic_commit(struct drm_device *dev,
-			       struct drm_atomic_state *state,
-			       bool async)
+static void
+rockchip_atomic_commit_complete(struct rockchip_atomic_commit *commit)
 {
-	int ret;
-
-	if (async)
-		return -EBUSY;
-
-	ret = drm_atomic_helper_prepare_planes(dev, state);
-	if (ret)
-		return ret;
-
-	drm_atomic_helper_swap_state(dev, state);
+	struct drm_device *dev = commit->dev;
+	struct drm_atomic_state *state = commit->state;
 
 	/*
 	 * TODO: do fence wait here.
@@ -226,6 +223,43 @@ int rockchip_drm_atomic_commit(struct drm_device *dev,
 
 	drm_atomic_state_free(state);
 
+	kfree(commit);
+}
+
+static void rockchip_drm_atomic_work(struct work_struct *work)
+{
+	struct rockchip_atomic_commit *commit = container_of(work,
+					struct rockchip_atomic_commit, work);
+
+	rockchip_atomic_commit_complete(commit);
+}
+
+int rockchip_drm_atomic_commit(struct drm_device *dev,
+			       struct drm_atomic_state *state,
+			       bool async)
+{
+	int ret;
+	struct rockchip_atomic_commit *commit;
+
+	ret = drm_atomic_helper_prepare_planes(dev, state);
+	if (ret)
+		return ret;
+
+	drm_atomic_helper_swap_state(dev, state);
+
+	commit = kzalloc(sizeof(*commit), GFP_KERNEL);
+	if (!commit)
+		return -ENOMEM;
+
+	INIT_WORK(&commit->work, rockchip_drm_atomic_work);
+	commit->dev = dev;
+	commit->state = state;
+
+	if (async)
+		schedule_work(&commit->work);
+	else
+		rockchip_atomic_commit_complete(commit);
+
 	return 0;
 }
 
-- 
1.7.9.5


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

WARNING: multiple messages have this Message-ID (diff)
From: mark.yao@rock-chips.com (Mark Yao)
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC PATCH 4/9] drm/rockchip: support atomic asynchronous commit
Date: Tue,  1 Dec 2015 11:26:26 +0800	[thread overview]
Message-ID: <1448940391-23333-5-git-send-email-mark.yao@rock-chips.com> (raw)
In-Reply-To: <1448940391-23333-1-git-send-email-mark.yao@rock-chips.com>

If drm core requests a async commit, rockchip_drm_atomic_commit
will schedule a work task to update later.

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
---
 drivers/gpu/drm/rockchip/rockchip_drm_fb.c |   60 ++++++++++++++++++++++------
 1 file changed, 47 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
index c86d93a..30ddf4a 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c
@@ -29,6 +29,12 @@ struct rockchip_drm_fb {
 	struct drm_gem_object *obj[ROCKCHIP_MAX_FB_BUFFER];
 };
 
+struct rockchip_atomic_commit {
+	struct work_struct	work;
+	struct drm_device	*dev;
+	struct drm_atomic_state *state;
+};
+
 struct drm_gem_object *rockchip_fb_get_gem_obj(struct drm_framebuffer *fb,
 					       unsigned int plane)
 {
@@ -195,20 +201,11 @@ static void rockchip_atomic_wait_for_complete(struct drm_atomic_state *state)
 	}
 }
 
-int rockchip_drm_atomic_commit(struct drm_device *dev,
-			       struct drm_atomic_state *state,
-			       bool async)
+static void
+rockchip_atomic_commit_complete(struct rockchip_atomic_commit *commit)
 {
-	int ret;
-
-	if (async)
-		return -EBUSY;
-
-	ret = drm_atomic_helper_prepare_planes(dev, state);
-	if (ret)
-		return ret;
-
-	drm_atomic_helper_swap_state(dev, state);
+	struct drm_device *dev = commit->dev;
+	struct drm_atomic_state *state = commit->state;
 
 	/*
 	 * TODO: do fence wait here.
@@ -226,6 +223,43 @@ int rockchip_drm_atomic_commit(struct drm_device *dev,
 
 	drm_atomic_state_free(state);
 
+	kfree(commit);
+}
+
+static void rockchip_drm_atomic_work(struct work_struct *work)
+{
+	struct rockchip_atomic_commit *commit = container_of(work,
+					struct rockchip_atomic_commit, work);
+
+	rockchip_atomic_commit_complete(commit);
+}
+
+int rockchip_drm_atomic_commit(struct drm_device *dev,
+			       struct drm_atomic_state *state,
+			       bool async)
+{
+	int ret;
+	struct rockchip_atomic_commit *commit;
+
+	ret = drm_atomic_helper_prepare_planes(dev, state);
+	if (ret)
+		return ret;
+
+	drm_atomic_helper_swap_state(dev, state);
+
+	commit = kzalloc(sizeof(*commit), GFP_KERNEL);
+	if (!commit)
+		return -ENOMEM;
+
+	INIT_WORK(&commit->work, rockchip_drm_atomic_work);
+	commit->dev = dev;
+	commit->state = state;
+
+	if (async)
+		schedule_work(&commit->work);
+	else
+		rockchip_atomic_commit_complete(commit);
+
 	return 0;
 }
 
-- 
1.7.9.5

  parent reply	other threads:[~2015-12-01  3:28 UTC|newest]

Thread overview: 76+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-01  3:26 [RFC PATCH 0/9] drm/rockchip: covert to support atomic API Mark Yao
2015-12-01  3:26 ` Mark Yao
2015-12-01  3:26 ` Mark Yao
2015-12-01  3:26 ` [RFC PATCH 1/9] drm/rockchip: vop: replace dpms with enable/disable Mark Yao
2015-12-01  3:26   ` Mark Yao
2015-12-01  3:26   ` Mark Yao
2015-12-01  3:26 ` [RFC PATCH 2/9] drm/rockchip: Use new vblank api drm_crtc_vblank_* Mark Yao
2015-12-01  3:26   ` Mark Yao
2015-12-01  3:26   ` Mark Yao
2015-12-01  7:56   ` Daniel Stone
2015-12-01  7:56     ` Daniel Stone
2015-12-01  7:56     ` Daniel Stone
2015-12-01  8:33     ` Mark yao
2015-12-01  8:33       ` Mark yao
2015-12-01  8:33       ` Mark yao
2015-12-01  9:01       ` Daniel Vetter
2015-12-01  9:01         ` Daniel Vetter
2015-12-01  9:01         ` Daniel Vetter
2015-12-01  9:43         ` Mark yao
2015-12-01  9:43           ` Mark yao
2015-12-01  9:43           ` Mark yao
2015-12-01  3:26 ` [RFC PATCH 3/9] drm/rockchip: Convert to support atomic API Mark Yao
2015-12-01  3:26   ` Mark Yao
2015-12-01  3:26   ` Mark Yao
2015-12-01  8:18   ` Daniel Stone
2015-12-01  8:18     ` Daniel Stone
2015-12-01  8:18     ` Daniel Stone
2015-12-01  9:21     ` Mark yao
2015-12-01  9:21       ` Mark yao
2015-12-01  9:21       ` Mark yao
2015-12-01  9:31     ` Mark yao
2015-12-01  9:31       ` Mark yao
2015-12-01  9:31       ` Mark yao
2015-12-02 14:18       ` Daniel Stone
2015-12-02 14:18         ` Daniel Stone
2015-12-02 14:18         ` Daniel Stone
2015-12-02 14:22         ` Daniel Stone
2015-12-02 14:22           ` Daniel Stone
2015-12-02 14:22           ` Daniel Stone
2015-12-11  6:26         ` Mark yao
2015-12-11  6:26           ` Mark yao
2015-12-11  6:26           ` Mark yao
2015-12-01  3:26 ` Mark Yao [this message]
2015-12-01  3:26   ` [RFC PATCH 4/9] drm/rockchip: support atomic asynchronous commit Mark Yao
2015-12-01  3:26   ` Mark Yao
2015-12-01  3:28 ` [RFC PATCH 5/9] drm/rockchip: Optimization vop mode set Mark Yao
2015-12-01  3:28   ` Mark Yao
2015-12-01  3:28   ` Mark Yao
2015-12-01  3:30 ` [RFC PATCH 6/9] drm/rockchip: direct config connecter gate and out_mode Mark Yao
2015-12-01  3:30   ` Mark Yao
2015-12-01  3:30   ` Mark Yao
2015-12-01  3:32 ` [RFC PATCH 7/9] drm/rockchip: force enable vop when do mode setting Mark Yao
2015-12-01  3:32   ` Mark Yao
2015-12-02 16:55   ` Thierry Reding
2015-12-02 16:55     ` Thierry Reding
2015-12-02 16:55     ` Thierry Reding
2015-12-02 22:17     ` Daniel Vetter
2015-12-02 22:17       ` Daniel Vetter
2015-12-02 22:17       ` Daniel Vetter
2015-12-03  1:54       ` Mark yao
2015-12-03  1:54         ` Mark yao
2015-12-03  1:54         ` Mark yao
2015-12-01  3:35 ` [RFC PATCH 8/9] drm: bridge/dw_hdmi: Covert to support atomic API Mark Yao
2015-12-01  3:35   ` Mark Yao
2015-12-01  3:35   ` Mark Yao
2015-12-01  7:21   ` Daniel Vetter
2015-12-01  7:21     ` Daniel Vetter
2015-12-01  8:07     ` Mark yao
2015-12-01  8:07       ` Mark yao
2015-12-01  8:07       ` Mark yao
2015-12-01  8:17   ` [PATCH] drm: bridge/dw_hdmi: add atomic API support Mark Yao
2015-12-01  8:17     ` Mark Yao
2015-12-01  8:17     ` Mark Yao
2015-12-01  3:37 ` [RFC PATCH 9/9] drm/rockchip: dw_hdmi: use encoder enable function Mark Yao
2015-12-01  3:37   ` Mark Yao
2015-12-01  3:37   ` Mark Yao

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=1448940391-23333-5-git-send-email-mark.yao@rock-chips.com \
    --to=mark.yao@rock-chips.com \
    --cc=airlied@linux.ie \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=heiko@sntech.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.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.