From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sean Paul Subject: [PATCH v2 2/6] drm/msm: Refactor complete_commit() to look more the helpers Date: Wed, 28 Mar 2018 15:06:48 -0400 Message-ID: <20180328190657.218661-3-seanpaul@chromium.org> References: <20180328190657.218661-1-seanpaul@chromium.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180328190657.218661-1-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: freedreno-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Freedreno" To: freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: architt-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, abhinavk-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org, robdclark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, Sean Paul , jsanka-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org, hoegsberg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org List-Id: linux-arm-msm@vger.kernel.org RmFjdG9yIG91dCB0aGUgY29tbWl0X3RhaWwoKSBwb3J0aW9ucyBvZiBjb21wbGV0ZV9jb21taXQo KSBpbnRvIGEKc2VwYXJhdGUgZnVuY3Rpb24gdG8gZmFjaWxpdGF0ZSBtb3ZpbmcgdG8gdGhlIGF0 b21pYyBoZWxwZXJzIGluIGZ1dHVyZQpwYXRjaGVzLgoKQ2hhbmdlcyBpbiB2MjoKLSBOb25lCgpD YzogSmV5a3VtYXIgU2Fua2FyYW4gPGpzYW5rYUBjb2RlYXVyb3JhLm9yZz4KU2lnbmVkLW9mZi1i eTogU2VhbiBQYXVsIDxzZWFucGF1bEBjaHJvbWl1bS5vcmc+Ci0tLQogZHJpdmVycy9ncHUvZHJt L21zbS9tc21fYXRvbWljLmMgfCAyNSArKysrKysrKysrKysrKysrLS0tLS0tLS0tCiAxIGZpbGUg Y2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vbXNtL21zbV9hdG9taWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9tc20vbXNt X2F0b21pYy5jCmluZGV4IGU3OTIxNTg2NzZhYS4uNjcxYTE4ZWU5NzdkIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vbXNtL21zbV9hdG9taWMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbXNt L21zbV9hdG9taWMuYwpAQCAtOTcsMTggKzk3LDEyIEBAIHN0YXRpYyB2b2lkIG1zbV9hdG9taWNf d2FpdF9mb3JfY29tbWl0X2RvbmUoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAl9CiB9CiAKLS8q IFRoZSAocG90ZW50aWFsbHkpIGFzeW5jaHJvbm91cyBwYXJ0IG9mIHRoZSBjb21taXQuICBBdCB0 aGlzIHBvaW50Ci0gKiBub3RoaW5nIGNhbiBmYWlsIHNob3J0IG9mIGFybWFnZWRkb24uCi0gKi8K LXN0YXRpYyB2b2lkIGNvbXBsZXRlX2NvbW1pdChzdHJ1Y3QgbXNtX2NvbW1pdCAqYywgYm9vbCBh c3luYykKK3N0YXRpYyB2b2lkIG1zbV9hdG9taWNfY29tbWl0X3RhaWwoc3RydWN0IGRybV9hdG9t aWNfc3RhdGUgKnN0YXRlKQogewotCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSA9IGMt PnN0YXRlOwogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBzdGF0ZS0+ZGV2OwogCXN0cnVjdCBt c21fZHJtX3ByaXZhdGUgKnByaXYgPSBkZXYtPmRldl9wcml2YXRlOwogCXN0cnVjdCBtc21fa21z ICprbXMgPSBwcml2LT5rbXM7CiAKLQlkcm1fYXRvbWljX2hlbHBlcl93YWl0X2Zvcl9mZW5jZXMo ZGV2LCBzdGF0ZSwgZmFsc2UpOwotCiAJa21zLT5mdW5jcy0+cHJlcGFyZV9jb21taXQoa21zLCBz dGF0ZSk7CiAKIAlkcm1fYXRvbWljX2hlbHBlcl9jb21taXRfbW9kZXNldF9kaXNhYmxlcyhkZXYs IHN0YXRlKTsKQEAgLTEzNSw2ICsxMjksMTkgQEAgc3RhdGljIHZvaWQgY29tcGxldGVfY29tbWl0 KHN0cnVjdCBtc21fY29tbWl0ICpjLCBib29sIGFzeW5jKQogCWRybV9hdG9taWNfaGVscGVyX2Ns ZWFudXBfcGxhbmVzKGRldiwgc3RhdGUpOwogCiAJa21zLT5mdW5jcy0+Y29tcGxldGVfY29tbWl0 KGttcywgc3RhdGUpOworfQorCisvKiBUaGUgKHBvdGVudGlhbGx5KSBhc3luY2hyb25vdXMgcGFy dCBvZiB0aGUgY29tbWl0LiAgQXQgdGhpcyBwb2ludAorICogbm90aGluZyBjYW4gZmFpbCBzaG9y dCBvZiBhcm1hZ2VkZG9uLgorICovCitzdGF0aWMgdm9pZCBjb21wbGV0ZV9jb21taXQoc3RydWN0 IG1zbV9jb21taXQgKmMpCit7CisJc3RydWN0IGRybV9hdG9taWNfc3RhdGUgKnN0YXRlID0gYy0+ c3RhdGU7CisJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHN0YXRlLT5kZXY7CisKKwlkcm1fYXRv bWljX2hlbHBlcl93YWl0X2Zvcl9mZW5jZXMoZGV2LCBzdGF0ZSwgZmFsc2UpOworCisJbXNtX2F0 b21pY19jb21taXRfdGFpbChzdGF0ZSk7CiAKIAlkcm1fYXRvbWljX3N0YXRlX3B1dChzdGF0ZSk7 CiAKQEAgLTE0Myw3ICsxNTAsNyBAQCBzdGF0aWMgdm9pZCBjb21wbGV0ZV9jb21taXQoc3RydWN0 IG1zbV9jb21taXQgKmMsIGJvb2wgYXN5bmMpCiAKIHN0YXRpYyB2b2lkIGNvbW1pdF93b3JrZXIo c3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQogewotCWNvbXBsZXRlX2NvbW1pdChjb250YWluZXJf b2Yod29yaywgc3RydWN0IG1zbV9jb21taXQsIHdvcmspLCB0cnVlKTsKKwljb21wbGV0ZV9jb21t aXQoY29udGFpbmVyX29mKHdvcmssIHN0cnVjdCBtc21fY29tbWl0LCB3b3JrKSk7CiB9CiAKIC8q KgpAQCAtMjQyLDcgKzI0OSw3IEBAIGludCBtc21fYXRvbWljX2NvbW1pdChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LAogCQlyZXR1cm4gMDsKIAl9CiAKLQljb21wbGV0ZV9jb21taXQoYywgZmFsc2Up OworCWNvbXBsZXRlX2NvbW1pdChjKTsKIAogCXJldHVybiAwOwogCi0tIApTZWFuIFBhdWwsIFNv ZnR3YXJlIEVuZ2luZWVyLCBHb29nbGUgLyBDaHJvbWl1bSBPUwoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KRnJlZWRyZW5vIG1haWxpbmcgbGlzdApGcmVl ZHJlbm9AbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vZnJlZWRyZW5vCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753812AbeC1TIW (ORCPT ); Wed, 28 Mar 2018 15:08:22 -0400 Received: from mail-yb0-f194.google.com ([209.85.213.194]:35060 "EHLO mail-yb0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753320AbeC1TIP (ORCPT ); Wed, 28 Mar 2018 15:08:15 -0400 X-Google-Smtp-Source: AIpwx49TcJRV1DpL2dQXTxWGL0y/GOPjz5+/ZlmpSC56tMK7xbqEaR2tJv/6YRnx49GGV9cZPMoVCg== From: Sean Paul To: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: robdclark@gmail.com, hoegsberg@chromium.org, jsanka@codeaurora.org, abhinavk@codeaurora.org, architt@codeaurora.org, Sean Paul , linux-kernel@vger.kernel.org Subject: [PATCH v2 2/6] drm/msm: Refactor complete_commit() to look more the helpers Date: Wed, 28 Mar 2018 15:06:48 -0400 Message-Id: <20180328190657.218661-3-seanpaul@chromium.org> X-Mailer: git-send-email 2.17.0.rc1.321.gba9d0f2565-goog In-Reply-To: <20180328190657.218661-1-seanpaul@chromium.org> References: <20180328190657.218661-1-seanpaul@chromium.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Factor out the commit_tail() portions of complete_commit() into a separate function to facilitate moving to the atomic helpers in future patches. Changes in v2: - None Cc: Jeykumar Sankaran Signed-off-by: Sean Paul --- drivers/gpu/drm/msm/msm_atomic.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_atomic.c b/drivers/gpu/drm/msm/msm_atomic.c index e792158676aa..671a18ee977d 100644 --- a/drivers/gpu/drm/msm/msm_atomic.c +++ b/drivers/gpu/drm/msm/msm_atomic.c @@ -97,18 +97,12 @@ static void msm_atomic_wait_for_commit_done(struct drm_device *dev, } } -/* The (potentially) asynchronous part of the commit. At this point - * nothing can fail short of armageddon. - */ -static void complete_commit(struct msm_commit *c, bool async) +static void msm_atomic_commit_tail(struct drm_atomic_state *state) { - struct drm_atomic_state *state = c->state; struct drm_device *dev = state->dev; struct msm_drm_private *priv = dev->dev_private; struct msm_kms *kms = priv->kms; - drm_atomic_helper_wait_for_fences(dev, state, false); - kms->funcs->prepare_commit(kms, state); drm_atomic_helper_commit_modeset_disables(dev, state); @@ -135,6 +129,19 @@ static void complete_commit(struct msm_commit *c, bool async) drm_atomic_helper_cleanup_planes(dev, state); kms->funcs->complete_commit(kms, state); +} + +/* The (potentially) asynchronous part of the commit. At this point + * nothing can fail short of armageddon. + */ +static void complete_commit(struct msm_commit *c) +{ + struct drm_atomic_state *state = c->state; + struct drm_device *dev = state->dev; + + drm_atomic_helper_wait_for_fences(dev, state, false); + + msm_atomic_commit_tail(state); drm_atomic_state_put(state); @@ -143,7 +150,7 @@ static void complete_commit(struct msm_commit *c, bool async) static void commit_worker(struct work_struct *work) { - complete_commit(container_of(work, struct msm_commit, work), true); + complete_commit(container_of(work, struct msm_commit, work)); } /** @@ -242,7 +249,7 @@ int msm_atomic_commit(struct drm_device *dev, return 0; } - complete_commit(c, false); + complete_commit(c); return 0; -- Sean Paul, Software Engineer, Google / Chromium OS