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 Content-Length: 1506 Lines: 46 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)