From mboxrd@z Thu Jan 1 00:00:00 1970 From: Boris Brezillon Subject: Re: [PATCH 1/4] drm/vc4: Hook up plane prepare_fb to lookup dma-buf reservations. Date: Thu, 22 Jun 2017 10:03:49 +0200 Message-ID: <20170622100349.4200af30@bbrezillon> References: <20170621185002.28563-1-eric@anholt.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.free-electrons.com (mail.free-electrons.com [62.4.15.54]) by gabe.freedesktop.org (Postfix) with ESMTP id 1DEE46E5F2 for ; Thu, 22 Jun 2017 08:04:12 +0000 (UTC) In-Reply-To: <20170621185002.28563-1-eric@anholt.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Eric Anholt Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCAyMSBKdW4gMjAxNyAxMTo0OTo1OSAtMDcwMApFcmljIEFuaG9sdCA8ZXJpY0Bhbmhv bHQubmV0PiB3cm90ZToKCj4gVGhpcyB3YXkgZHJtX2F0b21pY19oZWxwZXJfd2FpdF9mb3JfZmVu Y2VzKCkgd2lsbCBhY3R1YWxseSBkbwo+IHNvbWV0aGluZy4gIFRoZSB2YzRfc2Vxbm9fY2IgaGFz IGJlZW4gZG9pbmcgdGhlIGZlbmNlIHdhaXRzIG9uIFYzRAo+IG1hbnVhbGx5LCBzbyBmYXIuCj4g Cj4gU2lnbmVkLW9mZi1ieTogRXJpYyBBbmhvbHQgPGVyaWNAYW5ob2x0Lm5ldD4KClJldmlld2Vk LWJ5OiBCb3JpcyBCcmV6aWxsb24gPGJvcmlzLmJyZXppbGxvbkBmcmVlLWVsZWN0cm9ucy5jb20+ Cgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF9wbGFuZS5jIHwgMTcgKysrKysrKysr KysrKysrKysKPiAgMSBmaWxlIGNoYW5nZWQsIDE3IGluc2VydGlvbnMoKykKPiAKPiBkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfcGxhbmUuYyBiL2RyaXZlcnMvZ3B1L2RybS92 YzQvdmM0X3BsYW5lLmMKPiBpbmRleCBmYTY4MDlkOGIwZmUuLjg4NTNlOWE0ZjAwNSAxMDA2NDQK PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF9wbGFuZS5jCj4gKysrIGIvZHJpdmVycy9n cHUvZHJtL3ZjNC92YzRfcGxhbmUuYwo+IEBAIC03NTksOSArNzU5LDI2IEBAIHZvaWQgdmM0X3Bs YW5lX2FzeW5jX3NldF9mYihzdHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSwgc3RydWN0IGRybV9mcmFt ZWJ1ZmZlciAqZmIpCj4gIAl2YzRfc3RhdGUtPmRsaXN0W3ZjNF9zdGF0ZS0+cHRyMF9vZmZzZXRd ID0gYWRkcjsKPiAgfQo+ICAKPiArc3RhdGljIGludCB2YzRfcHJlcGFyZV9mYihzdHJ1Y3QgZHJt X3BsYW5lICpwbGFuZSwKPiArCQkJICBzdHJ1Y3QgZHJtX3BsYW5lX3N0YXRlICpzdGF0ZSkKPiAr ewo+ICsJc3RydWN0IHZjNF9ibyAqYm87Cj4gKwlzdHJ1Y3QgZG1hX2ZlbmNlICpmZW5jZTsKPiAr Cj4gKwlpZiAoKHBsYW5lLT5zdGF0ZS0+ZmIgPT0gc3RhdGUtPmZiKSB8fCAhc3RhdGUtPmZiKQo+ ICsJCXJldHVybiAwOwo+ICsKPiArCWJvID0gdG9fdmM0X2JvKCZkcm1fZmJfY21hX2dldF9nZW1f b2JqKHN0YXRlLT5mYiwgMCktPmJhc2UpOwo+ICsJZmVuY2UgPSByZXNlcnZhdGlvbl9vYmplY3Rf Z2V0X2V4Y2xfcmN1KGJvLT5yZXN2KTsKPiArCWRybV9hdG9taWNfc2V0X2ZlbmNlX2Zvcl9wbGFu ZShzdGF0ZSwgZmVuY2UpOwo+ICsKPiArCXJldHVybiAwOwo+ICt9Cj4gKwo+ICBzdGF0aWMgY29u c3Qgc3RydWN0IGRybV9wbGFuZV9oZWxwZXJfZnVuY3MgdmM0X3BsYW5lX2hlbHBlcl9mdW5jcyA9 IHsKPiAgCS5hdG9taWNfY2hlY2sgPSB2YzRfcGxhbmVfYXRvbWljX2NoZWNrLAo+ICAJLmF0b21p Y191cGRhdGUgPSB2YzRfcGxhbmVfYXRvbWljX3VwZGF0ZSwKPiArCS5wcmVwYXJlX2ZiID0gdmM0 X3ByZXBhcmVfZmIsCj4gIH07Cj4gIAo+ICBzdGF0aWMgdm9pZCB2YzRfcGxhbmVfZGVzdHJveShz dHJ1Y3QgZHJtX3BsYW5lICpwbGFuZSkKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZy ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752768AbdFVIEP (ORCPT ); Thu, 22 Jun 2017 04:04:15 -0400 Received: from mail.free-electrons.com ([62.4.15.54]:59554 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751143AbdFVIEN (ORCPT ); Thu, 22 Jun 2017 04:04:13 -0400 Date: Thu, 22 Jun 2017 10:03:49 +0200 From: Boris Brezillon To: Eric Anholt Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/4] drm/vc4: Hook up plane prepare_fb to lookup dma-buf reservations. Message-ID: <20170622100349.4200af30@bbrezillon> In-Reply-To: <20170621185002.28563-1-eric@anholt.net> References: <20170621185002.28563-1-eric@anholt.net> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 21 Jun 2017 11:49:59 -0700 Eric Anholt wrote: > This way drm_atomic_helper_wait_for_fences() will actually do > something. The vc4_seqno_cb has been doing the fence waits on V3D > manually, so far. > > Signed-off-by: Eric Anholt Reviewed-by: Boris Brezillon > --- > drivers/gpu/drm/vc4/vc4_plane.c | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c > index fa6809d8b0fe..8853e9a4f005 100644 > --- a/drivers/gpu/drm/vc4/vc4_plane.c > +++ b/drivers/gpu/drm/vc4/vc4_plane.c > @@ -759,9 +759,26 @@ void vc4_plane_async_set_fb(struct drm_plane *plane, struct drm_framebuffer *fb) > vc4_state->dlist[vc4_state->ptr0_offset] = addr; > } > > +static int vc4_prepare_fb(struct drm_plane *plane, > + struct drm_plane_state *state) > +{ > + struct vc4_bo *bo; > + struct dma_fence *fence; > + > + if ((plane->state->fb == state->fb) || !state->fb) > + return 0; > + > + bo = to_vc4_bo(&drm_fb_cma_get_gem_obj(state->fb, 0)->base); > + fence = reservation_object_get_excl_rcu(bo->resv); > + drm_atomic_set_fence_for_plane(state, fence); > + > + return 0; > +} > + > static const struct drm_plane_helper_funcs vc4_plane_helper_funcs = { > .atomic_check = vc4_plane_atomic_check, > .atomic_update = vc4_plane_atomic_update, > + .prepare_fb = vc4_prepare_fb, > }; > > static void vc4_plane_destroy(struct drm_plane *plane)