From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [RFC 5/8] drm/fence: add fence to drm_pending_event Date: Fri, 15 Apr 2016 10:09:48 +0200 Message-ID: <20160415080948.GS2510@phenom.ffwll.local> References: <1460683781-22535-1-git-send-email-gustavo@padovan.org> <1460683781-22535-6-git-send-email-gustavo@padovan.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 80BB66EBB6 for ; Fri, 15 Apr 2016 08:09:53 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id a140so3919889wma.2 for ; Fri, 15 Apr 2016 01:09:53 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1460683781-22535-6-git-send-email-gustavo@padovan.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Gustavo Padovan Cc: marcheu@google.com, Daniel Stone , seanpaul@google.com, Daniel Vetter , Arve =?iso-8859-1?B?SGr4bm5lduVn?= , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Riley Andrews , m.chehab@samsung.com, Gustavo Padovan , John Harrison , laurent.pinchart@ideasonboard.com List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCBBcHIgMTQsIDIwMTYgYXQgMDY6Mjk6MzhQTSAtMDcwMCwgR3VzdGF2byBQYWRvdmFu IHdyb3RlOgo+IEZyb206IEd1c3Rhdm8gUGFkb3ZhbiA8Z3VzdGF2by5wYWRvdmFuQGNvbGxhYm9y YS5jby51az4KPiAKPiBOb3cgYSBkcm1fcGVuZGluZ19ldmVudCBjYW4gZWl0aGVyIHNlbmQgYSBy ZWFsIGRybV9ldmVudCBvciBzaWduYWwgYQo+IGZlbmNlLCBvciBib3RoLiBJdCBhbGxvdyB1cyB0 byBzaWduYWwgdmlhIGZlbmNlcyB3aGVuIHRoZSBidWZmZXIgaXMKPiBkaXNwbGF5ZWQgb24gdGhl IHNjcmVlbi4gV2hpY2ggaW4gdHVybiBtZWFucyB0aGF0IHRoZSBwcmV2aW91cyBidWZmZXIKPiBp cyBub3QgaW4gdXNlIGFueW1vcmUgYW5kIGNhbiBiZSBmcmVlZCBvciBzZW50IGJhY2sgdG8gYW5v dGhlciBkcml2ZXIKPiBmb3IgcHJvY2Vzc2luZy4KPiAKPiBTaWduZWQtb2ZmLWJ5OiBHdXN0YXZv IFBhZG92YW4gPGd1c3Rhdm8ucGFkb3ZhbkBjb2xsYWJvcmEuY28udWs+CgpEbyB5b3UgaGF2ZSBh dG9taWMgaWd0IHRlc3RjYXNlIHRoYXQgZXhlcmNpc2UgYWxsIHRoZSBjb21iaW5hdGlvbnMgb2YK ZHJtX2V2ZW50IGFuZCBpbi9vdXQtZmVuY2VzIGFuZCBtYWtlIHN1cmUgaXQgYWxsIGtlZXBzIHdv cmtpbmc/IFRvbWV1CmFscmVhZHkgY29udmVydGVkIHRoYXQgb3ZlciB0byBiZSBhIGdlbmVyaWMg dGVzdGNhc2UuCgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pYy5jIHwgMTkgKysr KysrKysrKysrKy0tLS0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vZHJtX2ZvcHMuYyAgIHwgIDUgKysr LS0KPiAgZHJpdmVycy9ncHUvZHJtL2RybV9pcnEuYyAgICB8ICA3ICsrKysrKysKPiAgaW5jbHVk ZS9kcm0vZHJtUC5oICAgICAgICAgICB8ICAxICsKPiAgNCBmaWxlcyBjaGFuZ2VkLCAyNCBpbnNl cnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vZHJtX2F0b21pYy5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWMuYwo+IGluZGV4IDY3 MDI1MDIuLjBiOTU1MjYgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWMu Ywo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMKPiBAQCAtMTQzMSw3ICsxNDMx LDggQEAgRVhQT1JUX1NZTUJPTChkcm1fYXRvbWljX2FzeW5jX2NvbW1pdCk7Cj4gICAqLwo+ICAK PiAgc3RhdGljIHN0cnVjdCBkcm1fcGVuZGluZ192YmxhbmtfZXZlbnQgKmNyZWF0ZV92Ymxhbmtf ZXZlbnQoCj4gLQkJc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9maWxlICpmaWxl X3ByaXYsIHVpbnQ2NF90IHVzZXJfZGF0YSkKPiArCQlzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBz dHJ1Y3QgZHJtX2ZpbGUgKmZpbGVfcHJpdiwKPiArCQlzdHJ1Y3QgZmVuY2UgKmZlbmNlLCB1aW50 NjRfdCB1c2VyX2RhdGEpCj4gIHsKPiAgCXN0cnVjdCBkcm1fcGVuZGluZ192YmxhbmtfZXZlbnQg KmUgPSBOVUxMOwo+ICAJaW50IHJldDsKPiBAQCAtMTQ0NCwxMiArMTQ0NSwxNyBAQCBzdGF0aWMg c3RydWN0IGRybV9wZW5kaW5nX3ZibGFua19ldmVudCAqY3JlYXRlX3ZibGFua19ldmVudCgKPiAg CWUtPmV2ZW50LmJhc2UubGVuZ3RoID0gc2l6ZW9mKGUtPmV2ZW50KTsKPiAgCWUtPmV2ZW50LnVz ZXJfZGF0YSA9IHVzZXJfZGF0YTsKPiAgCj4gLQlyZXQgPSBkcm1fZXZlbnRfcmVzZXJ2ZV9pbml0 KGRldiwgZmlsZV9wcml2LCAmZS0+YmFzZSwgJmUtPmV2ZW50LmJhc2UpOwo+IC0JaWYgKHJldCkg ewo+IC0JCWtmcmVlKGUpOwo+IC0JCXJldHVybiBOVUxMOwo+ICsJaWYgKGZpbGVfcHJpdikgewo+ ICsJCXJldCA9IGRybV9ldmVudF9yZXNlcnZlX2luaXQoZGV2LCBmaWxlX3ByaXYsICZlLT5iYXNl LAo+ICsJCQkJCSAgICAgJmUtPmV2ZW50LmJhc2UpOwo+ICsJCWlmIChyZXQpIHsKPiArCQkJa2Zy ZWUoZSk7Cj4gKwkJCXJldHVybiBOVUxMOwo+ICsJCX0KPiAgCX0KPiAgCj4gKwllLT5iYXNlLmZl bmNlID0gZmVuY2U7Cj4gKwo+ICAJcmV0dXJuIGU7Cj4gIH0KPiAgCj4gQEAgLTE2NzYsNyArMTY4 Miw4IEBAIHJldHJ5Ogo+ICAJCWZvcl9lYWNoX2NydGNfaW5fc3RhdGUoc3RhdGUsIGNydGMsIGNy dGNfc3RhdGUsIGkpIHsKPiAgCQkJc3RydWN0IGRybV9wZW5kaW5nX3ZibGFua19ldmVudCAqZTsK PiAgCj4gLQkJCWUgPSBjcmVhdGVfdmJsYW5rX2V2ZW50KGRldiwgZmlsZV9wcml2LCBhcmctPnVz ZXJfZGF0YSk7Cj4gKwkJCWUgPSBjcmVhdGVfdmJsYW5rX2V2ZW50KGRldiwgZmlsZV9wcml2LCBO VUxMLAo+ICsJCQkJCQlhcmctPnVzZXJfZGF0YSk7Cj4gIAkJCWlmICghZSkgewo+ICAJCQkJcmV0 ID0gLUVOT01FTTsKPiAgCQkJCWdvdG8gb3V0Owo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vZHJtX2ZvcHMuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZm9wcy5jCj4gaW5kZXggYWVlZjU4 ZS4uMzhkZWY0OSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2ZvcHMuYwo+ICsr KyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZm9wcy5jCj4gQEAgLTgwMSw4ICs4MDEsOSBAQCB2b2lk IGRybV9zZW5kX2V2ZW50X2xvY2tlZChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCBzdHJ1Y3QgZHJt X3BlbmRpbmdfZXZlbnQgKmUpCj4gIHsKPiAgCWFzc2VydF9zcGluX2xvY2tlZCgmZGV2LT5ldmVu dF9sb2NrKTsKPiAgCj4gLQlpZiAoIWUtPmZpbGVfcHJpdikgewo+IC0JCWUtPmRlc3Ryb3koZSk7 Cj4gKwlpZiAoIWUtPmZpbGVfcHJpdiB8fCAhZS0+ZXZlbnQpIHsKClRoaXMgd291bGQgYmUgYSBi dWc6IGUtPmZpbGVfcHJpdiAhPSBOVUxMIGlmZiBlLT5ldmVudCAhPSBOVUxMLiBIb3cgZGlkCnRo aXMgaGFwcGVuPwoKPiArCQlpZiAoZS0+ZGVzdHJveSkKPiArCQkJZS0+ZGVzdHJveShlKTsKPiAg CQlyZXR1cm47Cj4gIAl9Cj4gIAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2ly cS5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9pcnEuYwo+IGluZGV4IDNjMWE2ZjEuLjBjNWQ3Y2Ig MTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9pcnEuYwo+ICsrKyBiL2RyaXZlcnMv Z3B1L2RybS9kcm1faXJxLmMKPiBAQCAtNDEsNiArNDEsNyBAQAo+ICAKPiAgI2luY2x1ZGUgPGxp bnV4L3ZnYWFyYi5oPgo+ICAjaW5jbHVkZSA8bGludXgvZXhwb3J0Lmg+Cj4gKyNpbmNsdWRlIDxs aW51eC9mZW5jZS5oPgo+ICAKPiAgLyogQWNjZXNzIG1hY3JvIGZvciBzbG90cyBpbiB2Ymxhbmsg dGltZXN0YW1wIHJpbmdidWZmZXIuICovCj4gICNkZWZpbmUgdmJsYW5rdGltZXN0YW1wKGRldiwg cGlwZSwgY291bnQpIFwKPiBAQCAtMTEyNCw2ICsxMTI1LDEyIEBAIHZvaWQgZHJtX3NlbmRfdmJs YW5rX2V2ZW50KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGludCBwaXBlLAo+ICAJ CW5vdyA9IGdldF9kcm1fdGltZXN0YW1wKCk7Cj4gIAl9Cj4gIAllLT5waXBlID0gcGlwZTsKPiAr Cj4gKwlpZiAoZS0+YmFzZS5mZW5jZSkgewo+ICsJCWZlbmNlX3NpZ25hbChlLT5iYXNlLmZlbmNl KTsKPiArCQlmZW5jZV9wdXQoZS0+YmFzZS5mZW5jZSk7Cj4gKwl9CgpJJ2QgcHV0IHRoaXMgaW50 byBkcm1fc2VuZF9ldmVudF9sb2NrZWQgZXZlbi4gSW4gY2FzZSB3ZSBzZW5kIG91dCBmZW5jZXMK Zm9yIG90aGVyIGV2ZW50cyB0b28gKGUuZy4gZXh5bm9zIHVzZXMgZHJtX2V2ZW50IGZvciByZW5k ZXJpbmcgLi4uKS4KLURhbmllbAoKPiArCj4gIAlzZW5kX3ZibGFua19ldmVudChkZXYsIGUsIHNl cSwgJm5vdyk7Cj4gIH0KPiAgRVhQT1JUX1NZTUJPTChkcm1fc2VuZF92YmxhbmtfZXZlbnQpOwo+ IGRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS9kcm1QLmggYi9pbmNsdWRlL2RybS9kcm1QLmgKPiBp bmRleCAzYzg0MjJjLi44ZjgzYzJhIDEwMDY0NAo+IC0tLSBhL2luY2x1ZGUvZHJtL2RybVAuaAo+ ICsrKyBiL2luY2x1ZGUvZHJtL2RybVAuaAo+IEBAIC0yODIsNiArMjgyLDcgQEAgc3RydWN0IGRy bV9pb2N0bF9kZXNjIHsKPiAgLyogRXZlbnQgcXVldWVkIHVwIGZvciB1c2Vyc3BhY2UgdG8gcmVh ZCAqLwo+ICBzdHJ1Y3QgZHJtX3BlbmRpbmdfZXZlbnQgewo+ICAJc3RydWN0IGRybV9ldmVudCAq ZXZlbnQ7Cj4gKwlzdHJ1Y3QgZmVuY2UgKmZlbmNlOwo+ICAJc3RydWN0IGxpc3RfaGVhZCBsaW5r Owo+ICAJc3RydWN0IGxpc3RfaGVhZCBwZW5kaW5nX2xpbms7Cj4gIAlzdHJ1Y3QgZHJtX2ZpbGUg KmZpbGVfcHJpdjsKPiAtLSAKPiAyLjUuNQo+IAoKLS0gCkRhbmllbCBWZXR0ZXIKU29mdHdhcmUg RW5naW5lZXIsIEludGVsIENvcnBvcmF0aW9uCmh0dHA6Ly9ibG9nLmZmd2xsLmNoCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5n IGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753076AbcDOIJ6 (ORCPT ); Fri, 15 Apr 2016 04:09:58 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:33178 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750924AbcDOIJx (ORCPT ); Fri, 15 Apr 2016 04:09:53 -0400 Date: Fri, 15 Apr 2016 10:09:48 +0200 From: Daniel Vetter To: Gustavo Padovan Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Daniel Stone , Arve =?iso-8859-1?B?SGr4bm5lduVn?= , Riley Andrews , Daniel Vetter , Rob Clark , Greg Hackmann , John Harrison , laurent.pinchart@ideasonboard.com, seanpaul@google.com, marcheu@google.com, m.chehab@samsung.com, Maarten Lankhorst , Gustavo Padovan Subject: Re: [RFC 5/8] drm/fence: add fence to drm_pending_event Message-ID: <20160415080948.GS2510@phenom.ffwll.local> Mail-Followup-To: Gustavo Padovan , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Daniel Stone , Arve =?iso-8859-1?B?SGr4bm5lduVn?= , Riley Andrews , Rob Clark , Greg Hackmann , John Harrison , laurent.pinchart@ideasonboard.com, seanpaul@google.com, marcheu@google.com, m.chehab@samsung.com, Maarten Lankhorst , Gustavo Padovan References: <1460683781-22535-1-git-send-email-gustavo@padovan.org> <1460683781-22535-6-git-send-email-gustavo@padovan.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1460683781-22535-6-git-send-email-gustavo@padovan.org> X-Operating-System: Linux phenom 4.4.0-1-amd64 User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Apr 14, 2016 at 06:29:38PM -0700, Gustavo Padovan wrote: > From: Gustavo Padovan > > Now a drm_pending_event can either send a real drm_event or signal a > fence, or both. It allow us to signal via fences when the buffer is > displayed on the screen. Which in turn means that the previous buffer > is not in use anymore and can be freed or sent back to another driver > for processing. > > Signed-off-by: Gustavo Padovan Do you have atomic igt testcase that exercise all the combinations of drm_event and in/out-fences and make sure it all keeps working? Tomeu already converted that over to be a generic testcase. > --- > drivers/gpu/drm/drm_atomic.c | 19 +++++++++++++------ > drivers/gpu/drm/drm_fops.c | 5 +++-- > drivers/gpu/drm/drm_irq.c | 7 +++++++ > include/drm/drmP.h | 1 + > 4 files changed, 24 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c > index 6702502..0b95526 100644 > --- a/drivers/gpu/drm/drm_atomic.c > +++ b/drivers/gpu/drm/drm_atomic.c > @@ -1431,7 +1431,8 @@ EXPORT_SYMBOL(drm_atomic_async_commit); > */ > > static struct drm_pending_vblank_event *create_vblank_event( > - struct drm_device *dev, struct drm_file *file_priv, uint64_t user_data) > + struct drm_device *dev, struct drm_file *file_priv, > + struct fence *fence, uint64_t user_data) > { > struct drm_pending_vblank_event *e = NULL; > int ret; > @@ -1444,12 +1445,17 @@ static struct drm_pending_vblank_event *create_vblank_event( > e->event.base.length = sizeof(e->event); > e->event.user_data = user_data; > > - ret = drm_event_reserve_init(dev, file_priv, &e->base, &e->event.base); > - if (ret) { > - kfree(e); > - return NULL; > + if (file_priv) { > + ret = drm_event_reserve_init(dev, file_priv, &e->base, > + &e->event.base); > + if (ret) { > + kfree(e); > + return NULL; > + } > } > > + e->base.fence = fence; > + > return e; > } > > @@ -1676,7 +1682,8 @@ retry: > for_each_crtc_in_state(state, crtc, crtc_state, i) { > struct drm_pending_vblank_event *e; > > - e = create_vblank_event(dev, file_priv, arg->user_data); > + e = create_vblank_event(dev, file_priv, NULL, > + arg->user_data); > if (!e) { > ret = -ENOMEM; > goto out; > diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c > index aeef58e..38def49 100644 > --- a/drivers/gpu/drm/drm_fops.c > +++ b/drivers/gpu/drm/drm_fops.c > @@ -801,8 +801,9 @@ void drm_send_event_locked(struct drm_device *dev, struct drm_pending_event *e) > { > assert_spin_locked(&dev->event_lock); > > - if (!e->file_priv) { > - e->destroy(e); > + if (!e->file_priv || !e->event) { This would be a bug: e->file_priv != NULL iff e->event != NULL. How did this happen? > + if (e->destroy) > + e->destroy(e); > return; > } > > diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c > index 3c1a6f1..0c5d7cb 100644 > --- a/drivers/gpu/drm/drm_irq.c > +++ b/drivers/gpu/drm/drm_irq.c > @@ -41,6 +41,7 @@ > > #include > #include > +#include > > /* Access macro for slots in vblank timestamp ringbuffer. */ > #define vblanktimestamp(dev, pipe, count) \ > @@ -1124,6 +1125,12 @@ void drm_send_vblank_event(struct drm_device *dev, unsigned int pipe, > now = get_drm_timestamp(); > } > e->pipe = pipe; > + > + if (e->base.fence) { > + fence_signal(e->base.fence); > + fence_put(e->base.fence); > + } I'd put this into drm_send_event_locked even. In case we send out fences for other events too (e.g. exynos uses drm_event for rendering ...). -Daniel > + > send_vblank_event(dev, e, seq, &now); > } > EXPORT_SYMBOL(drm_send_vblank_event); > diff --git a/include/drm/drmP.h b/include/drm/drmP.h > index 3c8422c..8f83c2a 100644 > --- a/include/drm/drmP.h > +++ b/include/drm/drmP.h > @@ -282,6 +282,7 @@ struct drm_ioctl_desc { > /* Event queued up for userspace to read */ > struct drm_pending_event { > struct drm_event *event; > + struct fence *fence; > struct list_head link; > struct list_head pending_link; > struct drm_file *file_priv; > -- > 2.5.5 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch