From patchwork Mon Aug 15 23:05:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 9282289 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0B79E60467 for ; Mon, 15 Aug 2016 23:06:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F3D1728EA1 for ; Mon, 15 Aug 2016 23:06:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E851A28EA5; Mon, 15 Aug 2016 23:06:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A454A28EA1 for ; Mon, 15 Aug 2016 23:06:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E736C6E5E6; Mon, 15 Aug 2016 23:05:59 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yw0-f195.google.com (mail-yw0-f195.google.com [209.85.161.195]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4A4C16E180 for ; Mon, 15 Aug 2016 23:05:58 +0000 (UTC) Received: by mail-yw0-f195.google.com with SMTP id r9so2854432ywg.2 for ; Mon, 15 Aug 2016 16:05:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ljkkzt7ZsCl/SYMKs7BRIoAE6TwJGk6OiVElC607Hjc=; b=efND40tuhZJPP2P7QEJ/SW1UM5HGSoA5/WQqnBkiwqTMROuc+PmbGEdWhx03yJKezz cBktA6mTcVtEAvBqq7BAkaWs2d66N8jo4bNLEn9Yvt/Cr+1V/bXT27XVsfZi4d1dXVJj 4XIRMcGpoURCjQxBhrGlW7gM35RK2x3aXjNpptJ/8E8dGn/gmcf+qYVaDgWwtUGAIgoq hZdBWUSTgaNLSIDlb5v85zPXK3ouuSjb2Dmz4Bgzl3Zph9nNXQUuAGOiZz/wZiQMv0wc He/gIwqNJF/EwKIZAPm/3jGmeHWApqg3jPg5GHoNmtq7zR1KLFC8vJbjGB8EMZP3+HDe TilA== X-Gm-Message-State: AEkoouvXYd5t+F3rHCbJ+MTO2BNkjB4TbohznUxgIibg2eg00O/zoeUBo2dqk5aa6SaFqQ== X-Received: by 10.13.252.5 with SMTP id m5mr23615294ywf.274.1471302357495; Mon, 15 Aug 2016 16:05:57 -0700 (PDT) Received: from jade.localdomain ([201.82.189.183]) by smtp.gmail.com with ESMTPSA id t134sm11344648ywc.54.2016.08.15.16.05.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Aug 2016 16:05:56 -0700 (PDT) From: Gustavo Padovan To: dri-devel@lists.freedesktop.org Subject: [PATCH v2 2/2] drm/fence: allow fence waiting to be interrupted by userspace Date: Mon, 15 Aug 2016 20:05:41 -0300 Message-Id: <1471302341-12824-2-git-send-email-gustavo@padovan.org> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1471302341-12824-1-git-send-email-gustavo@padovan.org> References: <1471302341-12824-1-git-send-email-gustavo@padovan.org> Cc: marcheu@google.com, Daniel Stone , seanpaul@google.com, Daniel Vetter , linux-kernel@vger.kernel.org, laurent.pinchart@ideasonboard.com, Gustavo Padovan , John Harrison , m.chehab@samsung.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Gustavo Padovan If userspace is running an synchronously atomic commit and interrupts the atomic operation during fence_wait() it will hang until the timer expires, so here we change the wait to be interruptible so it stop immediately when userspace wants to quit. Also adds the necessary error checking for fence_wait(). v2: Comment by Daniel Vetter - Add error checking for fence_wait() v3: Rebase on top of new atomic noblocking support v4: Comment by Maarten Lankhorst - remove 'swapped' bitfield as it was duplicating information Signed-off-by: Gustavo Padovan --- drivers/gpu/drm/drm_atomic_helper.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index bf1bc43..292d15b 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -1022,20 +1022,37 @@ int drm_atomic_helper_wait_for_fences(struct drm_device *dev, { struct drm_plane *plane; struct drm_plane_state *plane_state; + struct fence *fence; int i, ret; for_each_plane_in_state(state, plane, plane_state, i) { - if (!plane->state->fence) + if (!plane->state->fence && !plane_state->fence) continue; - WARN_ON(!plane->state->fb); + /* + * If the caller asks for an interruptible wait it means + * that the state were not swapped yet and the operation + * can still be interrupted by userspace, so we need + * to look to plane_state instead. + */ + if (intr) { + fence = plane_state->fence; + WARN_ON(!plane_state->fb); + } else { + fence = plane->state->fence; + WARN_ON(!plane->state->fb); + } - ret = fence_wait(plane->state->fence, intr); + ret = fence_wait(fence, intr); if (ret) return ret; - fence_put(plane->state->fence); - plane->state->fence = NULL; + fence_put(fence); + + if (intr) + plane_state->fence = NULL; + else + plane->state->fence = NULL; } return 0; @@ -1244,6 +1261,12 @@ int drm_atomic_helper_commit(struct drm_device *dev, if (ret) return ret; + if (!nonblock) { + ret = drm_atomic_helper_wait_for_fences(dev, state, true); + if (ret) + return ret; + } + /* * This is the point of no return - everything below never fails except * when the hw goes bonghits. Which means we can commit the new state on