Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756954AbcKKPys (ORCPT ); Fri, 11 Nov 2016 10:54:48 -0500 Received: from mail-yb0-f171.google.com ([209.85.213.171]:33016 "EHLO mail-yb0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756695AbcKKPyq (ORCPT ); Fri, 11 Nov 2016 10:54:46 -0500 MIME-Version: 1.0 In-Reply-To: <1478841369-20826-3-git-send-email-gustavo@padovan.org> References: <1478841369-20826-1-git-send-email-gustavo@padovan.org> <1478841369-20826-3-git-send-email-gustavo@padovan.org> From: Sean Paul Date: Fri, 11 Nov 2016 10:48:54 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v8 2/3] drm/fence: add fence timeline to drm_crtc To: Gustavo Padovan Cc: dri-devel , Linux Kernel Mailing List , Daniel Stone , Daniel Vetter , Rob Clark , Greg Hackmann , John Harrison , Laurent Pinchart , =?UTF-8?Q?St=C3=A9phane_Marchesin?= , m.chehab@samsung.com, Maarten Lankhorst , Brian Starkey , Gustavo Padovan Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by mail.home.local id uABFsqlv031142 Content-Length: 4956 Lines: 154 On Fri, Nov 11, 2016 at 12:16 AM, Gustavo Padovan wrote: > From: Gustavo Padovan > > Create one timeline context for each CRTC to be able to handle out-fences > and signal them. It adds a few members to struct drm_crtc: fence_context, > where we store the context we get from fence_context_alloc(), the > fence seqno and the fence lock, that we pass in fence_init() to be > used by the fence. > > v2: Comment by Daniel Stone: > - add BUG_ON() to fence_to_crtc() macro > > v3: Comment by Ville Syrjälä > - Use more meaningful name as crtc timeline name > > v4: Comments by Brian Starkey > - Use even more meaninful name for the crtc timeline > - add doc for timeline_name > Comment by Daniel Vetter > - use in-line style for comments > > - rebase after fence -> dma_fence rename > > v5: Comment by Daniel Vetter > - Add doc for drm_crtc_fence_ops > > Signed-off-by: Gustavo Padovan > Reviewed-by: Daniel Vetter Reviewed-by: Sean Paul > --- > drivers/gpu/drm/drm_crtc.c | 31 +++++++++++++++++++++++++++++++ > include/drm/drm_crtc.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 76 insertions(+) > > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c > index 154e040..9b9881b 100644 > --- a/drivers/gpu/drm/drm_crtc.c > +++ b/drivers/gpu/drm/drm_crtc.c > @@ -165,6 +165,32 @@ static void drm_crtc_crc_fini(struct drm_crtc *crtc) > #endif > } > > +static const char *drm_crtc_fence_get_driver_name(struct dma_fence *fence) > +{ > + struct drm_crtc *crtc = fence_to_crtc(fence); > + > + return crtc->dev->driver->name; > +} > + > +static const char *drm_crtc_fence_get_timeline_name(struct dma_fence *fence) > +{ > + struct drm_crtc *crtc = fence_to_crtc(fence); > + > + return crtc->timeline_name; > +} > + > +static bool drm_crtc_fence_enable_signaling(struct dma_fence *fence) > +{ > + return true; > +} > + > +const struct dma_fence_ops drm_crtc_fence_ops = { > + .get_driver_name = drm_crtc_fence_get_driver_name, > + .get_timeline_name = drm_crtc_fence_get_timeline_name, > + .enable_signaling = drm_crtc_fence_enable_signaling, > + .wait = dma_fence_default_wait, > +}; > + > /** > * drm_crtc_init_with_planes - Initialise a new CRTC object with > * specified primary and cursor planes. > @@ -222,6 +248,11 @@ int drm_crtc_init_with_planes(struct drm_device *dev, struct drm_crtc *crtc, > return -ENOMEM; > } > > + crtc->fence_context = dma_fence_context_alloc(1); > + spin_lock_init(&crtc->fence_lock); > + snprintf(crtc->timeline_name, sizeof(crtc->timeline_name), > + "CRTC:%d-%s", crtc->base.id, crtc->name); > + > crtc->base.properties = &crtc->properties; > > list_add_tail(&crtc->head, &config->crtc_list); > diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h > index 11780a9..0870de1 100644 > --- a/include/drm/drm_crtc.h > +++ b/include/drm/drm_crtc.h > @@ -32,6 +32,8 @@ > #include > #include > #include > +#include > +#include > #include > #include > #include > @@ -739,9 +741,52 @@ struct drm_crtc { > */ > struct drm_crtc_crc crc; > #endif > + > + /** > + * @fence_context: > + * > + * timeline context used for fence operations. > + */ > + unsigned int fence_context; > + > + /** > + * @fence_lock: > + * > + * spinlock to protect the fences in the fence_context. > + */ > + > + spinlock_t fence_lock; > + /** > + * @fence_seqno: > + * > + * Seqno variable used as monotonic counter for the fences > + * created on the CRTC's timeline. > + */ > + unsigned long fence_seqno; > + > + /** > + * @timeline_name: > + * > + * The name of the CRTC's fence timeline. > + */ > + char timeline_name[32]; > }; > > /** > + * dma_crtc_fence_ops - fence ops for the drm_crtc timeline > + * > + * It contains the dma_fence_ops that should be called by the dma_fence > + * code. CRTC core should use this ops when initializing fences. > + */ > +extern const struct dma_fence_ops drm_crtc_fence_ops; > + > +static inline struct drm_crtc *fence_to_crtc(struct dma_fence *fence) > +{ > + BUG_ON(fence->ops != &drm_crtc_fence_ops); > + return container_of(fence->lock, struct drm_crtc, fence_lock); > +} > + > +/** > * struct drm_mode_set - new values for a CRTC config change > * @fb: framebuffer to use for new config > * @crtc: CRTC whose configuration we're about to change > -- > 2.5.5 >