From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gustavo Padovan Subject: Re: [RFC 4/8] drm/fence: add in-fences support Date: Fri, 15 Apr 2016 11:40:20 -0700 Message-ID: <20160415184020.GC23954@joana> References: <1460683781-22535-1-git-send-email-gustavo@padovan.org> <1460683781-22535-5-git-send-email-gustavo@padovan.org> <20160415080538.GR2510@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pa0-f53.google.com (mail-pa0-f53.google.com [209.85.220.53]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1D7FB6ECF2 for ; Fri, 15 Apr 2016 18:40:22 +0000 (UTC) Received: by mail-pa0-f53.google.com with SMTP id fs9so38891896pac.2 for ; Fri, 15 Apr 2016 11:40:22 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20160415080538.GR2510@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: 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 List-Id: dri-devel@lists.freedesktop.org MjAxNi0wNC0xNSBEYW5pZWwgVmV0dGVyIDxkYW5pZWxAZmZ3bGwuY2g+OgoKPiBPbiBUaHUsIEFw ciAxNCwgMjAxNiBhdCAwNjoyOTozN1BNIC0wNzAwLCBHdXN0YXZvIFBhZG92YW4gd3JvdGU6Cj4g PiBGcm9tOiBHdXN0YXZvIFBhZG92YW4gPGd1c3Rhdm8ucGFkb3ZhbkBjb2xsYWJvcmEuY28udWs+ Cj4gPiAKPiA+IFRoZXJlIGlzIG5vdyBhIG5ldyBwcm9wZXJ0eSBjYWxsZWQgRkVOQ0VfRkQgYXR0 YWNoZWQgdG8gZXZlcnkgcGxhbmUKPiA+IHN0YXRlIHRoYXQgcmVjZWl2ZXMgdGhlIHN5bmNfZmls ZSBmZCBmcm9tIHVzZXJzcGFjZSB2aWEgdGhlIGF0b21pYyBjb21taXQKPiA+IElPQ1RMLgo+ID4g Cj4gPiBUaGUgZmQgaXMgdGhlbiB0cmFuc2xhdGVkIHRvIGEgZmVuY2UgKHRoYXQgbWF5IGJlIGEg ZmVuY2VfY29sbGVjdGlvbgo+ID4gc3ViY2xhc3Mgb3IganVzdCBhIG5vcm1hbCBmZW5jZSkgYW5k IHRoZW4gdXNlZCBieSBEUk0gdG8gZmVuY2Vfd2FpdCgpIGZvcgo+ID4gYWxsIGZlbmNlcyBpbiB0 aGUgc3luY19maWxlIHRvIHNpZ25hbC4gU28gaXQgb25seSBjb21taXRzIHdoZW4gYWxsCj4gPiBm cmFtZWJ1ZmZlcnMgYXJlIHJlYWR5IHRvIHNjYW5vdXQuCj4gPiAKPiA+IFNpZ25lZC1vZmYtYnk6 IEd1c3Rhdm8gUGFkb3ZhbiA8Z3VzdGF2by5wYWRvdmFuQGNvbGxhYm9yYS5jby51az4KPiA+IC0t LQo+ID4gIGRyaXZlcnMvZ3B1L2RybS9LY29uZmlnICAgICAgICAgICAgIHwgMSArCj4gPiAgZHJp dmVycy9ncHUvZHJtL2RybV9hdG9taWMuYyAgICAgICAgfCA4ICsrKysrKysrCj4gPiAgZHJpdmVy cy9ncHUvZHJtL2RybV9hdG9taWNfaGVscGVyLmMgfCA1ICsrKysrCj4gPiAgZHJpdmVycy9ncHUv ZHJtL2RybV9jcnRjLmMgICAgICAgICAgfCA3ICsrKysrKysKPiA+ICBpbmNsdWRlL2RybS9kcm1f Y3J0Yy5oICAgICAgICAgICAgICB8IDEgKwo+ID4gIDUgZmlsZXMgY2hhbmdlZCwgMjIgaW5zZXJ0 aW9ucygrKQo+ID4gCj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL0tjb25maWcgYi9k cml2ZXJzL2dwdS9kcm0vS2NvbmZpZwo+ID4gaW5kZXggZjJhNzRkMC4uM2M5ODdlMyAxMDA2NDQK PiA+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9LY29uZmlnCj4gPiArKysgYi9kcml2ZXJzL2dwdS9k cm0vS2NvbmZpZwo+ID4gQEAgLTEyLDYgKzEyLDcgQEAgbWVudWNvbmZpZyBEUk0KPiA+ICAJc2Vs ZWN0IEkyQwo+ID4gIAlzZWxlY3QgSTJDX0FMR09CSVQKPiA+ICAJc2VsZWN0IERNQV9TSEFSRURf QlVGRkVSCj4gPiArCXNlbGVjdCBTWU5DX0ZJTEUKPiA+ICAJaGVscAo+ID4gIAkgIEtlcm5lbC1s ZXZlbCBzdXBwb3J0IGZvciB0aGUgRGlyZWN0IFJlbmRlcmluZyBJbmZyYXN0cnVjdHVyZSAoRFJJ KQo+ID4gIAkgIGludHJvZHVjZWQgaW4gWEZyZWU4NiA0LjAuIElmIHlvdSBzYXkgWSBoZXJlLCB5 b3UgbmVlZCB0byBzZWxlY3QKPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0 b21pYy5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWMuYwo+ID4gaW5kZXggOGVlMWRiOC4u NjcwMjUwMiAxMDA2NDQKPiA+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMKPiA+ ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljLmMKPiA+IEBAIC0zMCw2ICszMCw3IEBA Cj4gPiAgI2luY2x1ZGUgPGRybS9kcm1fYXRvbWljLmg+Cj4gPiAgI2luY2x1ZGUgPGRybS9kcm1f bW9kZS5oPgo+ID4gICNpbmNsdWRlIDxkcm0vZHJtX3BsYW5lX2hlbHBlci5oPgo+ID4gKyNpbmNs dWRlIDxsaW51eC9zeW5jX2ZpbGUuaD4KPiA+ICAKPiA+ICAvKioKPiA+ICAgKiBkcm1fYXRvbWlj X3N0YXRlX2RlZmF1bHRfcmVsZWFzZSAtCj4gPiBAQCAtNjgwLDYgKzY4MSwxMSBAQCBpbnQgZHJt X2F0b21pY19wbGFuZV9zZXRfcHJvcGVydHkoc3RydWN0IGRybV9wbGFuZSAqcGxhbmUsCj4gPiAg CQlkcm1fYXRvbWljX3NldF9mYl9mb3JfcGxhbmUoc3RhdGUsIGZiKTsKPiA+ICAJCWlmIChmYikK PiA+ICAJCQlkcm1fZnJhbWVidWZmZXJfdW5yZWZlcmVuY2UoZmIpOwo+ID4gKwl9IGVsc2UgaWYg KHByb3BlcnR5ID09IGNvbmZpZy0+cHJvcF9mZW5jZV9mZCkgewo+ID4gKwkJc3RhdGUtPmZlbmNl ID0gc3luY19maWxlX2ZlbmNlc19nZXQodmFsKTsKPiA+ICsJCWlmICghc3RhdGUtPmZlbmNlKQo+ ID4gKwkJCXJldHVybiAtRUlOVkFMOwo+ID4gKwkJZmVuY2VfZ2V0KHN0YXRlLT5mZW5jZSk7Cj4g Cj4gWWVhaCwgdGhpcyBmZW5jZV9nZXQgbXVzdCBiZSBwYXJ0IG9mIHN5bmNfZmlsZV9mZW5jZXNf Z2V0LCB0aGlzIGNvZGUgaGVyZQo+IGhhcyBhIHJhY2UgKGV4ZXJjaXNlIGZvciB0aGUgcmVhZGVy IHRvIGRlc2NyaWJlIHdoZXJlIHRoaW5ncyBnbyB3cm9uZwo+IGhlcmUpLiBBbHNvLCB5b3UgbmVl ZCB0byBleHBsaWNpdGx5IGZpbHRlciBvdXQgLTEgaGVyZSBmaXJzdCBJIHRoaW5rLgoKUmlnaHQs IEkgbWlzc2VkIHRoaXMgcmFjZS4gTW92ZSBpdCBzeW5jX2ZpbGVfZmVuY2VzX2dldCgpIGp1c3Qg Zml4ZXMgaXQuCkknbGwgYWRkIHRoZSBmaWx0ZXIgZm9yIC0xIHRvbyBhbmQgYSB0ZXN0Y2FzZS4K Cj4gCj4gTmVlZHMgYW4gYXRvbWljIHRlc3RjYXNlIHRvIG1ha2Ugc3VyZSBzZXR0aW5nIEZFTkNF X0ZEIHRvIC0xIGRvZXNuJ3QgZmFsbAo+IG92ZXIgKHNpbmNlIGdlbmVyaWMgdXNlcnNwYWNlIG1p Z2h0IGRvIHRoaXMgaW4gYW4gYXR0ZW1wdCB0byByZXN0b3JlIGFsbAo+IHRoZSBzdGF0ZSkuCj4g Cj4gPiAgCX0gZWxzZSBpZiAocHJvcGVydHkgPT0gY29uZmlnLT5wcm9wX2NydGNfaWQpIHsKPiA+ ICAJCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9IGRybV9jcnRjX2ZpbmQoZGV2LCB2YWwpOwo+ID4g IAkJcmV0dXJuIGRybV9hdG9taWNfc2V0X2NydGNfZm9yX3BsYW5lKHN0YXRlLCBjcnRjKTsKPiA+ IEBAIC03MzcsNiArNzQzLDggQEAgZHJtX2F0b21pY19wbGFuZV9nZXRfcHJvcGVydHkoc3RydWN0 IGRybV9wbGFuZSAqcGxhbmUsCj4gPiAgCj4gPiAgCWlmIChwcm9wZXJ0eSA9PSBjb25maWctPnBy b3BfZmJfaWQpIHsKPiA+ICAJCSp2YWwgPSAoc3RhdGUtPmZiKSA/IHN0YXRlLT5mYi0+YmFzZS5p ZCA6IDA7Cj4gPiArCX0gZWxzZSBpZiAocHJvcGVydHkgPT0gY29uZmlnLT5wcm9wX2ZlbmNlX2Zk KSB7Cj4gPiArCQkqdmFsID0gLTE7Cj4gPiAgCX0gZWxzZSBpZiAocHJvcGVydHkgPT0gY29uZmln LT5wcm9wX2NydGNfaWQpIHsKPiA+ICAJCSp2YWwgPSAoc3RhdGUtPmNydGMpID8gc3RhdGUtPmNy dGMtPmJhc2UuaWQgOiAwOwo+ID4gIAl9IGVsc2UgaWYgKHByb3BlcnR5ID09IGNvbmZpZy0+cHJv cF9jcnRjX3gpIHsKPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19o ZWxwZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5jCj4gPiBpbmRleCBm ODVlZjhjLi42ZWQ4MzM5IDEwMDY0NAo+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9t aWNfaGVscGVyLmMKPiA+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fYXRvbWljX2hlbHBlci5j Cj4gPiBAQCAtMjY4Nyw2ICsyNjg3LDExIEBAIHZvaWQgX19kcm1fYXRvbWljX2hlbHBlcl9wbGFu ZV9kZXN0cm95X3N0YXRlKHN0cnVjdCBkcm1fcGxhbmUgKnBsYW5lLAo+ID4gIHsKPiA+ICAJaWYg KHN0YXRlLT5mYikKPiA+ICAJCWRybV9mcmFtZWJ1ZmZlcl91bnJlZmVyZW5jZShzdGF0ZS0+ZmIp Owo+ID4gKwo+ID4gKwlpZiAoc3RhdGUtPmZlbmNlKSB7Cj4gPiArCQlmZW5jZV9wdXQoc3RhdGUt PmZlbmNlKTsKPiA+ICsJCXN0YXRlLT5mZW5jZSA9IE5VTEw7Cj4gCj4gTm8gbmVlZCB0byBzZXQg dG8gTlVMTCwgd2UgZG9uJ3QgZG8gdGhhdCBmb3IgLT5mYiBlaXRoZXIuCgpPay4KCglHdXN0YXZv Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZl bCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751557AbcDOSkY (ORCPT ); Fri, 15 Apr 2016 14:40:24 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:36549 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750993AbcDOSkW (ORCPT ); Fri, 15 Apr 2016 14:40:22 -0400 Date: Fri, 15 Apr 2016 11:40:20 -0700 From: Gustavo Padovan To: 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 Subject: Re: [RFC 4/8] drm/fence: add in-fences support Message-ID: <20160415184020.GC23954@joana> 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-5-git-send-email-gustavo@padovan.org> <20160415080538.GR2510@phenom.ffwll.local> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160415080538.GR2510@phenom.ffwll.local> 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 2016-04-15 Daniel Vetter : > On Thu, Apr 14, 2016 at 06:29:37PM -0700, Gustavo Padovan wrote: > > From: Gustavo Padovan > > > > There is now a new property called FENCE_FD attached to every plane > > state that receives the sync_file fd from userspace via the atomic commit > > IOCTL. > > > > The fd is then translated to a fence (that may be a fence_collection > > subclass or just a normal fence) and then used by DRM to fence_wait() for > > all fences in the sync_file to signal. So it only commits when all > > framebuffers are ready to scanout. > > > > Signed-off-by: Gustavo Padovan > > --- > > drivers/gpu/drm/Kconfig | 1 + > > drivers/gpu/drm/drm_atomic.c | 8 ++++++++ > > drivers/gpu/drm/drm_atomic_helper.c | 5 +++++ > > drivers/gpu/drm/drm_crtc.c | 7 +++++++ > > include/drm/drm_crtc.h | 1 + > > 5 files changed, 22 insertions(+) > > > > diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig > > index f2a74d0..3c987e3 100644 > > --- a/drivers/gpu/drm/Kconfig > > +++ b/drivers/gpu/drm/Kconfig > > @@ -12,6 +12,7 @@ menuconfig DRM > > select I2C > > select I2C_ALGOBIT > > select DMA_SHARED_BUFFER > > + select SYNC_FILE > > help > > Kernel-level support for the Direct Rendering Infrastructure (DRI) > > introduced in XFree86 4.0. If you say Y here, you need to select > > diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c > > index 8ee1db8..6702502 100644 > > --- a/drivers/gpu/drm/drm_atomic.c > > +++ b/drivers/gpu/drm/drm_atomic.c > > @@ -30,6 +30,7 @@ > > #include > > #include > > #include > > +#include > > > > /** > > * drm_atomic_state_default_release - > > @@ -680,6 +681,11 @@ int drm_atomic_plane_set_property(struct drm_plane *plane, > > drm_atomic_set_fb_for_plane(state, fb); > > if (fb) > > drm_framebuffer_unreference(fb); > > + } else if (property == config->prop_fence_fd) { > > + state->fence = sync_file_fences_get(val); > > + if (!state->fence) > > + return -EINVAL; > > + fence_get(state->fence); > > Yeah, this fence_get must be part of sync_file_fences_get, this code here > has a race (exercise for the reader to describe where things go wrong > here). Also, you need to explicitly filter out -1 here first I think. Right, I missed this race. Move it sync_file_fences_get() just fixes it. I'll add the filter for -1 too and a testcase. > > Needs an atomic testcase to make sure setting FENCE_FD to -1 doesn't fall > over (since generic userspace might do this in an attempt to restore all > the state). > > > } else if (property == config->prop_crtc_id) { > > struct drm_crtc *crtc = drm_crtc_find(dev, val); > > return drm_atomic_set_crtc_for_plane(state, crtc); > > @@ -737,6 +743,8 @@ drm_atomic_plane_get_property(struct drm_plane *plane, > > > > if (property == config->prop_fb_id) { > > *val = (state->fb) ? state->fb->base.id : 0; > > + } else if (property == config->prop_fence_fd) { > > + *val = -1; > > } else if (property == config->prop_crtc_id) { > > *val = (state->crtc) ? state->crtc->base.id : 0; > > } else if (property == config->prop_crtc_x) { > > diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c > > index f85ef8c..6ed8339 100644 > > --- a/drivers/gpu/drm/drm_atomic_helper.c > > +++ b/drivers/gpu/drm/drm_atomic_helper.c > > @@ -2687,6 +2687,11 @@ void __drm_atomic_helper_plane_destroy_state(struct drm_plane *plane, > > { > > if (state->fb) > > drm_framebuffer_unreference(state->fb); > > + > > + if (state->fence) { > > + fence_put(state->fence); > > + state->fence = NULL; > > No need to set to NULL, we don't do that for ->fb either. Ok. Gustavo