From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gustavo Padovan Subject: Re: [RFC PATCH v2 7/9] drm: atomic: factor out common out-fence operations Date: Wed, 26 Oct 2016 19:45:14 -0200 Message-ID: <20161026214514.GI12629@joana> References: <1477472108-27222-1-git-send-email-brian.starkey@arm.com> <1477472108-27222-8-git-send-email-brian.starkey@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-ua0-f194.google.com (mail-ua0-f194.google.com [209.85.217.194]) by gabe.freedesktop.org (Postfix) with ESMTPS id 535F66E0F3 for ; Wed, 26 Oct 2016 21:45:19 +0000 (UTC) Received: by mail-ua0-f194.google.com with SMTP id 6so617466uat.1 for ; Wed, 26 Oct 2016 14:45:19 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1477472108-27222-8-git-send-email-brian.starkey@arm.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Brian Starkey Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org MjAxNi0xMC0yNiBCcmlhbiBTdGFya2V5IDxicmlhbi5zdGFya2V5QGFybS5jb20+OgoKPiBTb21l IHBhcnRzIG9mIHNldHRpbmcgdXAgdGhlIENSVEMgb3V0LWZlbmNlIGNhbiBiZSByZS11c2VkIGZv cgo+IHdyaXRlYmFjayBvdXQtZmVuY2VzLiBGYWN0b3IgdGhpcyBvdXQgaW50byBhIHNlcGFyYXRl IGZ1bmN0aW9uLgo+IAo+IFNpZ25lZC1vZmYtYnk6IEJyaWFuIFN0YXJrZXkgPGJyaWFuLnN0YXJr ZXlAYXJtLmNvbT4KPiAtLS0KPiAgZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWMuYyB8ICAgNjQg KysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tCj4gIDEgZmlsZSBjaGFu Z2VkLCA0MiBpbnNlcnRpb25zKCspLCAyMiBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWMuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWlj LmMKPiBpbmRleCBmNDM0ZjM0Li4zZjhmYzk3IDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9kcm1fYXRvbWljLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pYy5jCj4gQEAg LTE2OTMsMzcgKzE2OTMsNDYgQEAgdm9pZCBkcm1fYXRvbWljX2NsZWFuX29sZF9mYihzdHJ1Y3Qg ZHJtX2RldmljZSAqZGV2LAo+ICB9Cj4gIEVYUE9SVF9TWU1CT0woZHJtX2F0b21pY19jbGVhbl9v bGRfZmIpOwo+ICAKPiAtc3RhdGljIGludCBjcnRjX3NldHVwX291dF9mZW5jZShzdHJ1Y3QgZHJt X2NydGMgKmNydGMsCj4gLQkJCQlzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUsCj4g LQkJCQlzdHJ1Y3QgZHJtX291dF9mZW5jZV9zdGF0ZSAqZmVuY2Vfc3RhdGUpCj4gK3N0YXRpYyBz dHJ1Y3QgZmVuY2UgKmdldF9jcnRjX2ZlbmNlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKPiArCQkJ CSAgICBzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUpCj4gIHsKPiAgCXN0cnVjdCBm ZW5jZSAqZmVuY2U7Cj4gIAo+IC0JZmVuY2Vfc3RhdGUtPmZkID0gZ2V0X3VudXNlZF9mZF9mbGFn cyhPX0NMT0VYRUMpOwo+IC0JaWYgKGZlbmNlX3N0YXRlLT5mZCA8IDApIHsKPiAtCQlyZXR1cm4g ZmVuY2Vfc3RhdGUtPmZkOwo+IC0JfQo+IC0KPiAtCWZlbmNlX3N0YXRlLT5vdXRfZmVuY2VfcHRy ID0gY3J0Y19zdGF0ZS0+b3V0X2ZlbmNlX3B0cjsKPiAtCWNydGNfc3RhdGUtPm91dF9mZW5jZV9w dHIgPSBOVUxMOwo+IC0KPiAtCWlmIChwdXRfdXNlcihmZW5jZV9zdGF0ZS0+ZmQsIGZlbmNlX3N0 YXRlLT5vdXRfZmVuY2VfcHRyKSkKPiAtCQlyZXR1cm4gLUVGQVVMVDsKPiAtCj4gIAlmZW5jZSA9 IGt6YWxsb2Moc2l6ZW9mKCpmZW5jZSksIEdGUF9LRVJORUwpOwo+ICAJaWYgKCFmZW5jZSkKPiAt CQlyZXR1cm4gLUVOT01FTTsKPiArCQlyZXR1cm4gTlVMTDsKPiAgCj4gIAlmZW5jZV9pbml0KGZl bmNlLCAmZHJtX2NydGNfZmVuY2Vfb3BzLCAmY3J0Yy0+ZmVuY2VfbG9jaywKPiAgCQkgICBjcnRj LT5mZW5jZV9jb250ZXh0LCArK2NydGMtPmZlbmNlX3NlcW5vKTsKPiAgCj4gKwljcnRjX3N0YXRl LT5ldmVudC0+YmFzZS5mZW5jZSA9IGZlbmNlX2dldChmZW5jZSk7Cj4gKwo+ICsJcmV0dXJuIGZl bmNlOwo+ICt9Cj4gKwo+ICtzdGF0aWMgaW50IHNldHVwX291dF9mZW5jZShzdHJ1Y3QgZHJtX291 dF9mZW5jZV9zdGF0ZSAqZmVuY2Vfc3RhdGUsCj4gKwkJCSAgIHU2NCBfX3VzZXIgKm91dF9mZW5j ZV9wdHIsCj4gKwkJCSAgIHN0cnVjdCBmZW5jZSAqZmVuY2UpCj4gK3sKPiArCWludCByZXQ7Cj4g Kwo+ICsJRFJNX0RFQlVHX0FUT01JQygiUHV0dGluZyBvdXQtZmVuY2UgJXAgaW50byB1c2VyIHB0 cjogJXBcbiIsCj4gKwkJCSBmZW5jZSwgb3V0X2ZlbmNlX3B0cik7CgolcCBzaG91bGQgYmUga2Vw dCBmb3IgeW91ciBpbnRlcm5hbCBkZWJ1ZyBvbmx5LiBNYWtlIHN1cmUgdG8gcmVtb3ZlCmFueXRo aW5nIHRoYXQgZXhwb3NlcyBrZXJuZWwgYWRkcmVzcyB3aGVuIHNlbmRpbmcgcGF0Y2hlcy4KCkd1 c3Rhdm8KCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRy aS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-ua0-f196.google.com ([209.85.217.196]:35986 "EHLO mail-ua0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932684AbcJZVpT (ORCPT ); Wed, 26 Oct 2016 17:45:19 -0400 Date: Wed, 26 Oct 2016 19:45:14 -0200 From: Gustavo Padovan To: Brian Starkey Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: Re: [RFC PATCH v2 7/9] drm: atomic: factor out common out-fence operations Message-ID: <20161026214514.GI12629@joana> References: <1477472108-27222-1-git-send-email-brian.starkey@arm.com> <1477472108-27222-8-git-send-email-brian.starkey@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1477472108-27222-8-git-send-email-brian.starkey@arm.com> Sender: linux-media-owner@vger.kernel.org List-ID: 2016-10-26 Brian Starkey : > Some parts of setting up the CRTC out-fence can be re-used for > writeback out-fences. Factor this out into a separate function. > > Signed-off-by: Brian Starkey > --- > drivers/gpu/drm/drm_atomic.c | 64 +++++++++++++++++++++++++++--------------- > 1 file changed, 42 insertions(+), 22 deletions(-) > > diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c > index f434f34..3f8fc97 100644 > --- a/drivers/gpu/drm/drm_atomic.c > +++ b/drivers/gpu/drm/drm_atomic.c > @@ -1693,37 +1693,46 @@ void drm_atomic_clean_old_fb(struct drm_device *dev, > } > EXPORT_SYMBOL(drm_atomic_clean_old_fb); > > -static int crtc_setup_out_fence(struct drm_crtc *crtc, > - struct drm_crtc_state *crtc_state, > - struct drm_out_fence_state *fence_state) > +static struct fence *get_crtc_fence(struct drm_crtc *crtc, > + struct drm_crtc_state *crtc_state) > { > struct fence *fence; > > - fence_state->fd = get_unused_fd_flags(O_CLOEXEC); > - if (fence_state->fd < 0) { > - return fence_state->fd; > - } > - > - fence_state->out_fence_ptr = crtc_state->out_fence_ptr; > - crtc_state->out_fence_ptr = NULL; > - > - if (put_user(fence_state->fd, fence_state->out_fence_ptr)) > - return -EFAULT; > - > fence = kzalloc(sizeof(*fence), GFP_KERNEL); > if (!fence) > - return -ENOMEM; > + return NULL; > > fence_init(fence, &drm_crtc_fence_ops, &crtc->fence_lock, > crtc->fence_context, ++crtc->fence_seqno); > > + crtc_state->event->base.fence = fence_get(fence); > + > + return fence; > +} > + > +static int setup_out_fence(struct drm_out_fence_state *fence_state, > + u64 __user *out_fence_ptr, > + struct fence *fence) > +{ > + int ret; > + > + DRM_DEBUG_ATOMIC("Putting out-fence %p into user ptr: %p\n", > + fence, out_fence_ptr); %p should be kept for your internal debug only. Make sure to remove anything that exposes kernel address when sending patches. Gustavo