From mboxrd@z Thu Jan 1 00:00:00 1970 From: Archit Taneja Subject: Re: [PATCH v2 2/6] drm/msm: Refactor complete_commit() to look more the helpers Date: Mon, 2 Apr 2018 10:52:02 +0530 Message-ID: References: <20180328190657.218661-1-seanpaul@chromium.org> <20180328190657.218661-3-seanpaul@chromium.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180328190657.218661-3-seanpaul-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: freedreno-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Freedreno" To: Sean Paul , freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: jsanka-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org, robdclark-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, hoegsberg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org, abhinavk-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: linux-arm-msm@vger.kernel.org CgpPbiBUaHVyc2RheSAyOSBNYXJjaCAyMDE4IDEyOjM2IEFNLCBTZWFuIFBhdWwgd3JvdGU6Cj4g RmFjdG9yIG91dCB0aGUgY29tbWl0X3RhaWwoKSBwb3J0aW9ucyBvZiBjb21wbGV0ZV9jb21taXQo KSBpbnRvIGEKPiBzZXBhcmF0ZSBmdW5jdGlvbiB0byBmYWNpbGl0YXRlIG1vdmluZyB0byB0aGUg YXRvbWljIGhlbHBlcnMgaW4gZnV0dXJlCj4gcGF0Y2hlcy4KPiAKClJldmlld2VkLWJ5OiBBcmNo aXQgVGFuZWphIDxhcmNoaXR0QGNvZGVhdXJvcmEub3JnPgoKPiBDaGFuZ2VzIGluIHYyOgo+IC0g Tm9uZQo+IAo+IENjOiBKZXlrdW1hciBTYW5rYXJhbiA8anNhbmthQGNvZGVhdXJvcmEub3JnPgo+ IFNpZ25lZC1vZmYtYnk6IFNlYW4gUGF1bCA8c2VhbnBhdWxAY2hyb21pdW0ub3JnPgo+IC0tLQo+ ICAgZHJpdmVycy9ncHUvZHJtL21zbS9tc21fYXRvbWljLmMgfCAyNSArKysrKysrKysrKysrKysr LS0tLS0tLS0tCj4gICAxIGZpbGUgY2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlv bnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL21zbS9tc21fYXRvbWljLmMg Yi9kcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9hdG9taWMuYwo+IGluZGV4IGU3OTIxNTg2NzZhYS4u NjcxYTE4ZWU5NzdkIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9tc20vbXNtX2F0b21p Yy5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL21zbS9tc21fYXRvbWljLmMKPiBAQCAtOTcsMTgg Kzk3LDEyIEBAIHN0YXRpYyB2b2lkIG1zbV9hdG9taWNfd2FpdF9mb3JfY29tbWl0X2RvbmUoc3Ry dWN0IGRybV9kZXZpY2UgKmRldiwKPiAgIAl9Cj4gICB9Cj4gICAKPiAtLyogVGhlIChwb3RlbnRp YWxseSkgYXN5bmNocm9ub3VzIHBhcnQgb2YgdGhlIGNvbW1pdC4gIEF0IHRoaXMgcG9pbnQKPiAt ICogbm90aGluZyBjYW4gZmFpbCBzaG9ydCBvZiBhcm1hZ2VkZG9uLgo+IC0gKi8KPiAtc3RhdGlj IHZvaWQgY29tcGxldGVfY29tbWl0KHN0cnVjdCBtc21fY29tbWl0ICpjLCBib29sIGFzeW5jKQo+ ICtzdGF0aWMgdm9pZCBtc21fYXRvbWljX2NvbW1pdF90YWlsKHN0cnVjdCBkcm1fYXRvbWljX3N0 YXRlICpzdGF0ZSkKPiAgIHsKPiAtCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSA9IGMt PnN0YXRlOwo+ICAgCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBzdGF0ZS0+ZGV2Owo+ICAgCXN0 cnVjdCBtc21fZHJtX3ByaXZhdGUgKnByaXYgPSBkZXYtPmRldl9wcml2YXRlOwo+ICAgCXN0cnVj dCBtc21fa21zICprbXMgPSBwcml2LT5rbXM7Cj4gICAKPiAtCWRybV9hdG9taWNfaGVscGVyX3dh aXRfZm9yX2ZlbmNlcyhkZXYsIHN0YXRlLCBmYWxzZSk7Cj4gLQo+ICAgCWttcy0+ZnVuY3MtPnBy ZXBhcmVfY29tbWl0KGttcywgc3RhdGUpOwo+ICAgCj4gICAJZHJtX2F0b21pY19oZWxwZXJfY29t bWl0X21vZGVzZXRfZGlzYWJsZXMoZGV2LCBzdGF0ZSk7Cj4gQEAgLTEzNSw2ICsxMjksMTkgQEAg c3RhdGljIHZvaWQgY29tcGxldGVfY29tbWl0KHN0cnVjdCBtc21fY29tbWl0ICpjLCBib29sIGFz eW5jKQo+ICAgCWRybV9hdG9taWNfaGVscGVyX2NsZWFudXBfcGxhbmVzKGRldiwgc3RhdGUpOwo+ ICAgCj4gICAJa21zLT5mdW5jcy0+Y29tcGxldGVfY29tbWl0KGttcywgc3RhdGUpOwo+ICt9Cj4g Kwo+ICsvKiBUaGUgKHBvdGVudGlhbGx5KSBhc3luY2hyb25vdXMgcGFydCBvZiB0aGUgY29tbWl0 LiAgQXQgdGhpcyBwb2ludAo+ICsgKiBub3RoaW5nIGNhbiBmYWlsIHNob3J0IG9mIGFybWFnZWRk b24uCj4gKyAqLwo+ICtzdGF0aWMgdm9pZCBjb21wbGV0ZV9jb21taXQoc3RydWN0IG1zbV9jb21t aXQgKmMpCj4gK3sKPiArCXN0cnVjdCBkcm1fYXRvbWljX3N0YXRlICpzdGF0ZSA9IGMtPnN0YXRl Owo+ICsJc3RydWN0IGRybV9kZXZpY2UgKmRldiA9IHN0YXRlLT5kZXY7Cj4gKwo+ICsJZHJtX2F0 b21pY19oZWxwZXJfd2FpdF9mb3JfZmVuY2VzKGRldiwgc3RhdGUsIGZhbHNlKTsKPiArCj4gKwlt c21fYXRvbWljX2NvbW1pdF90YWlsKHN0YXRlKTsKPiAgIAo+ICAgCWRybV9hdG9taWNfc3RhdGVf cHV0KHN0YXRlKTsKPiAgIAo+IEBAIC0xNDMsNyArMTUwLDcgQEAgc3RhdGljIHZvaWQgY29tcGxl dGVfY29tbWl0KHN0cnVjdCBtc21fY29tbWl0ICpjLCBib29sIGFzeW5jKQo+ICAgCj4gICBzdGF0 aWMgdm9pZCBjb21taXRfd29ya2VyKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKPiAgIHsKPiAt CWNvbXBsZXRlX2NvbW1pdChjb250YWluZXJfb2Yod29yaywgc3RydWN0IG1zbV9jb21taXQsIHdv cmspLCB0cnVlKTsKPiArCWNvbXBsZXRlX2NvbW1pdChjb250YWluZXJfb2Yod29yaywgc3RydWN0 IG1zbV9jb21taXQsIHdvcmspKTsKPiAgIH0KPiAgIAo+ICAgLyoqCj4gQEAgLTI0Miw3ICsyNDks NyBAQCBpbnQgbXNtX2F0b21pY19jb21taXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKPiAgIAkJ cmV0dXJuIDA7Cj4gICAJfQo+ICAgCj4gLQljb21wbGV0ZV9jb21taXQoYywgZmFsc2UpOwo+ICsJ Y29tcGxldGVfY29tbWl0KGMpOwo+ICAgCj4gICAJcmV0dXJuIDA7Cj4gICAKPiAKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KRnJlZWRyZW5vIG1haWxpbmcg bGlzdApGcmVlZHJlbm9AbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZnJlZWRyZW5vCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751612AbeDBFWL (ORCPT ); Mon, 2 Apr 2018 01:22:11 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:54970 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751095AbeDBFWK (ORCPT ); Mon, 2 Apr 2018 01:22:10 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org C4C426022C Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=architt@codeaurora.org Subject: Re: [PATCH v2 2/6] drm/msm: Refactor complete_commit() to look more the helpers To: Sean Paul , 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, linux-kernel@vger.kernel.org References: <20180328190657.218661-1-seanpaul@chromium.org> <20180328190657.218661-3-seanpaul@chromium.org> From: Archit Taneja Message-ID: Date: Mon, 2 Apr 2018 10:52:02 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <20180328190657.218661-3-seanpaul@chromium.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thursday 29 March 2018 12:36 AM, Sean Paul wrote: > Factor out the commit_tail() portions of complete_commit() into a > separate function to facilitate moving to the atomic helpers in future > patches. > Reviewed-by: Archit Taneja > 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; > >