From patchwork Wed Oct 26 08:55:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Starkey X-Patchwork-Id: 37794 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bzK6a-00082c-Ak; Wed, 26 Oct 2016 09:02:40 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.84_2/mailfrontend-5) with esmtp id 1bzK6Y-0002vZ-7Q; Wed, 26 Oct 2016 11:02:40 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757278AbcJZI6R (ORCPT + 1 other); Wed, 26 Oct 2016 04:58:17 -0400 Received: from foss.arm.com ([217.140.101.70]:34294 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754042AbcJZI4I (ORCPT ); Wed, 26 Oct 2016 04:56:08 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 7CA50152F; Wed, 26 Oct 2016 01:55:36 -0700 (PDT) Received: from e106950-lin.cambridge.arm.com (e106950-lin.cambridge.arm.com [10.2.133.193]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id BC58A3F220; Wed, 26 Oct 2016 01:55:35 -0700 (PDT) From: Brian Starkey To: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [RFC PATCH v2 7/9] drm: atomic: factor out common out-fence operations Date: Wed, 26 Oct 2016 09:55:06 +0100 Message-Id: <1477472108-27222-8-git-send-email-brian.starkey@arm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1477472108-27222-1-git-send-email-brian.starkey@arm.com> References: <1477472108-27222-1-git-send-email-brian.starkey@arm.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2016.10.26.85715 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, IN_REP_TO 0, LEGITIMATE_NEGATE 0, LEGITIMATE_SIGNS 0, MSG_THREAD 0, NO_URI_HTTPS 0, REFERENCES 0, SINGLE_URI_IN_BODY 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MULTIPLE_RCPTS_CC_X2 0, __REFERENCES 0, __SANE_MSGID 0, __SINGLE_URI_TEXT 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_IN_BODY 0, __URI_NO_WWW 0, __URI_NS , __URI_WITH_PATH 0' Some parts of setting up the CRTC out-fence can be re-used for writeback out-fences. Factor this out into a separate function. Signed-off-by: Brian Starkey --- drivers/gpu/drm/drm_atomic.c | 64 +++++++++++++++++++++++++++--------------- 1 file changed, 42 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index f434f34..3f8fc97 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -1693,37 +1693,46 @@ void drm_atomic_clean_old_fb(struct drm_device *dev, } EXPORT_SYMBOL(drm_atomic_clean_old_fb); -static int crtc_setup_out_fence(struct drm_crtc *crtc, - struct drm_crtc_state *crtc_state, - struct drm_out_fence_state *fence_state) +static struct fence *get_crtc_fence(struct drm_crtc *crtc, + struct drm_crtc_state *crtc_state) { struct fence *fence; - fence_state->fd = get_unused_fd_flags(O_CLOEXEC); - if (fence_state->fd < 0) { - return fence_state->fd; - } - - fence_state->out_fence_ptr = crtc_state->out_fence_ptr; - crtc_state->out_fence_ptr = NULL; - - if (put_user(fence_state->fd, fence_state->out_fence_ptr)) - return -EFAULT; - fence = kzalloc(sizeof(*fence), GFP_KERNEL); if (!fence) - return -ENOMEM; + return NULL; fence_init(fence, &drm_crtc_fence_ops, &crtc->fence_lock, crtc->fence_context, ++crtc->fence_seqno); + crtc_state->event->base.fence = fence_get(fence); + + return fence; +} + +static int setup_out_fence(struct drm_out_fence_state *fence_state, + u64 __user *out_fence_ptr, + struct fence *fence) +{ + int ret; + + DRM_DEBUG_ATOMIC("Putting out-fence %p into user ptr: %p\n", + fence, out_fence_ptr); + + fence_state->fd = get_unused_fd_flags(O_CLOEXEC); + if (fence_state->fd < 0) + return fence_state->fd; + + ret = put_user(fence_state->fd, out_fence_ptr); + if (ret) + return ret; + + fence_state->out_fence_ptr = out_fence_ptr; + fence_state->sync_file = sync_file_create(fence); - if(!fence_state->sync_file) { - fence_put(fence); + if (!fence_state->sync_file) return -ENOMEM; - } - crtc_state->event->base.fence = fence_get(fence); return 0; } @@ -1896,10 +1905,21 @@ retry: } if (crtc_state->out_fence_ptr) { - ret = crtc_setup_out_fence(crtc, crtc_state, - &fence_state[fence_idx++]); - if (ret) + struct fence *fence = get_crtc_fence(crtc, crtc_state); + if (!fence) { + ret = -ENOMEM; + goto out; + } + + ret = setup_out_fence(&fence_state[fence_idx++], + crtc_state->out_fence_ptr, + fence); + if (ret) { + fence_put(fence); goto out; + } + + crtc_state->out_fence_ptr = NULL; } }