Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753034AbcDOBac (ORCPT ); Thu, 14 Apr 2016 21:30:32 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:35047 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752402AbcDOB3y (ORCPT ); Thu, 14 Apr 2016 21:29:54 -0400 From: Gustavo Padovan To: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, Daniel Stone , =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , 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: [RFC 7/8] drm/fence: create per-crtc sync_timeline Date: Thu, 14 Apr 2016 18:29:40 -0700 Message-Id: <1460683781-22535-8-git-send-email-gustavo@padovan.org> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1460683781-22535-1-git-send-email-gustavo@padovan.org> References: <1460683781-22535-1-git-send-email-gustavo@padovan.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2135 Lines: 69 From: Gustavo Padovan Add one timeline per-crtc that will be use to handle fence signalling to userspace via sync_files. Signed-off-by: Gustavo Padovan --- drivers/gpu/drm/drm_crtc.c | 9 +++++++++ include/drm/drm_crtc.h | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 65212ce..e1204cf 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -709,6 +709,13 @@ int drm_crtc_init_with_planes(struct drm_device *dev, struct drm_crtc *crtc, return -ENOMEM; } + crtc->timeline = sync_timeline_create(dev->driver->name, crtc->name); + if (!crtc->timeline) { + drm_mode_object_put(dev, &crtc->base); + kfree(crtc->name); + return -ENOMEM; + } + crtc->base.properties = &crtc->properties; list_add_tail(&crtc->head, &config->crtc_list); @@ -755,6 +762,8 @@ void drm_crtc_cleanup(struct drm_crtc *crtc) if (crtc->state && crtc->funcs->atomic_destroy_state) crtc->funcs->atomic_destroy_state(crtc, crtc->state); + sync_timeline_destroy(crtc->timeline); + kfree(crtc->name); memset(crtc, 0, sizeof(*crtc)); diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 5ba3cda..7934178 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -715,6 +716,7 @@ struct drm_crtc_funcs { * @helper_private: mid-layer private data * @properties: property tracking for this CRTC * @state: current atomic state for this CRTC + * @timeline: sync timeline for fence sigalling * @acquire_ctx: per-CRTC implicit acquire context used by atomic drivers for * legacy IOCTLs * @@ -771,6 +773,8 @@ struct drm_crtc { struct drm_crtc_state *state; + struct sync_timeline *timeline; + /* * For legacy crtc IOCTLs so that atomic drivers can get at the locking * acquire context. -- 2.5.5