From patchwork Thu Jul 18 15:37:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11049247 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F246E13AC for ; Thu, 18 Jul 2019 15:38:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E359D2862A for ; Thu, 18 Jul 2019 15:38:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D7C7E2887A; Thu, 18 Jul 2019 15:38:07 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, 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 4850328867 for ; Thu, 18 Jul 2019 15:38:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 06C9F6E418; Thu, 18 Jul 2019 15:38:06 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 08B7E6E40C; Thu, 18 Jul 2019 15:37:57 +0000 (UTC) Received: by mail-lj1-x243.google.com with SMTP id k18so27797042ljc.11; Thu, 18 Jul 2019 08:37:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=EUukcV3jlaamnumDfccC75aQOhb0AnTqZIzflbGgY8o=; b=FZ15fcFwXK8l1eg5uDZi1texd9z8rLcqV+q9dNdeI+5q+US0TJUYr+um+iMxynqm8k oeetbljqqigXwxFAuNwlEayCmFVZwSdS4jRTWtsei5Wub19gzWvdBka31eqj8GKYn3ik niRMJiPYrkQdZ84DG0iBx5RSaauQAhwF4LI2Ho9wNodwvARbr9xoayQXzCp9F+WAs+/S 0h917kP+E0UM3Pq2WLHtPFp5etoUGwxlVqlnZ1J0u0k45ZKqvvnUdJz/vy7F76g6/DsA rWmlPz7Trw5m8a25WLjqGnh5iRg9anwdHmwu1VlLu7UtT9AuGgY4EVZYwNmFPyZitW6n 7hQg== X-Gm-Message-State: APjAAAVVJp765ObZPp40SGfpxUMYMNl6KrMdQ4FoyzgzcC/ypK2+mjIG yQs9ndmIJalOut7PUaMP/A2wFYjCieo= X-Google-Smtp-Source: APXvYqzYbPmjRL9baOD8SHSwucOD14zbA5eTMl266wxlIPK126dxcxWKHsg1X/COFJcmGw3pFNzQDg== X-Received: by 2002:a2e:8007:: with SMTP id j7mr24777828ljg.191.1563464274437; Thu, 18 Jul 2019 08:37:54 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id c30sm4062388lfp.70.2019.07.18.08.37.53 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 18 Jul 2019 08:37:54 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, openchrome-devel@lists.freedesktop.org Subject: [PATCH v1 4/6] drm/via: drop DRM_WAIT_ON() in via_dmablit.c Date: Thu, 18 Jul 2019 17:37:35 +0200 Message-Id: <20190718153737.28657-5-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190718153737.28657-1-sam@ravnborg.org> References: <20190718153737.28657-1-sam@ravnborg.org> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EUukcV3jlaamnumDfccC75aQOhb0AnTqZIzflbGgY8o=; b=ebb5BUdZUJi87SEIFciC5S2xv+UUPA31j4VjkPBg8tQVi1jkLwdU9egXGjp4HWPMiF Xh7Br0ia9Gt41jNAqs6mayhnMmYIazXlQN2lQYXKrBUQJSCXUNtti1BcDejMRCCzqNSs lUR65kjS3tSVCHuaVXuR1IvwBuKl7W3dzoMRiQu8+nQLU6aHmxbIETG4kNphT+w1eKeT wd97LiBEfTyxlynk+Cf/zSZacsA5kxok0KteaNevRG1Lg3FRRbl0DrB3tF1ilg5vnh4U c/v83tp/Kf38BtKgoFd+qP2jfgHfvwt1ULflCOI8nVSF2nmtOeLJQtGtvskieilWLrnE 09rw== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Hellstrom , Sam Ravnborg , "Gustavo A. R. Silva" , David Airlie , Daniel Vetter , Kevin Brace , Mike Marshall , Ira Weiny , Emil Velikov Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP DRM_WAIT_ON() is a reliec from the past and is discouraged. Use the standard wait_event_*() as replacement. Be carefull to keep the same return values. via_dma_blit_sync() changed -EINTR to -EAGAIN. Moved this to via_dmablit_sync() so return value is adjusted only once. Signed-off-by: Sam Ravnborg Cc: Kevin Brace Cc: Thomas Hellstrom Cc: "Gustavo A. R. Silva" Cc: Mike Marshall Cc: Ira Weiny Cc: Daniel Vetter Cc: Emil Velikov --- drivers/gpu/drm/via/via_dmablit.c | 54 ++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/via/via_dmablit.c b/drivers/gpu/drm/via/via_dmablit.c index 87d88bdd20c6..27e2a6411502 100644 --- a/drivers/gpu/drm/via/via_dmablit.c +++ b/drivers/gpu/drm/via/via_dmablit.c @@ -39,7 +39,6 @@ #include #include -#include #include #include @@ -428,8 +427,12 @@ via_dmablit_active(drm_via_blitq_t *blitq, int engine, uint32_t handle, wait_que /* * Sync. Wait for at least three seconds for the blit to be performed. + * + * Returns: + * 0 if blit was performed within the three seconds period + * -EBUSY if timeout occured + * -EAGAIN if a signal interrupted the wait */ - static int via_dmablit_sync(struct drm_device *dev, uint32_t handle, int engine) { @@ -437,16 +440,26 @@ via_dmablit_sync(struct drm_device *dev, uint32_t handle, int engine) drm_via_private_t *dev_priv = (drm_via_private_t *)dev->dev_private; drm_via_blitq_t *blitq = dev_priv->blit_queues + engine; wait_queue_head_t *queue; - int ret = 0; + int ret = 1; if (via_dmablit_active(blitq, engine, handle, &queue)) { - DRM_WAIT_ON(ret, *queue, 3 * HZ, - !via_dmablit_active(blitq, engine, handle, NULL)); + ret = wait_event_interruptible_timeout(*queue, + !via_dmablit_active(blitq, engine, handle, NULL), + msecs_to_jiffies(3 * 1000)); } DRM_DEBUG("DMA blit sync handle 0x%x engine %d returned %d\n", handle, engine, ret); - return ret; + switch (ret) { + case 0: + /* timeout */ + return -EBUSY; + case -ERESTARTSYS: + /* interrupted by signal */ + return -EAGAIN; + default: + return 0; + } } @@ -677,13 +690,17 @@ via_build_sg_info(struct drm_device *dev, drm_via_sg_info_t *vsg, drm_via_dmabli /* * Reserve one free slot in the blit queue. Will wait for one second for one - * to become available. Otherwise -EBUSY is returned. + * to become available. + * + * Returns: + * 0 if slot was reserved + * -EBUSY if timeout while waiting for free slot + * -EAGAIN if interrupted by a signal */ - static int via_dmablit_grab_slot(drm_via_blitq_t *blitq, int engine) { - int ret = 0; + int ret; unsigned long irqsave; DRM_DEBUG("Num free is %d\n", blitq->num_free); @@ -691,9 +708,19 @@ via_dmablit_grab_slot(drm_via_blitq_t *blitq, int engine) while (blitq->num_free == 0) { spin_unlock_irqrestore(&blitq->blit_lock, irqsave); - DRM_WAIT_ON(ret, blitq->busy_queue, HZ, blitq->num_free > 0); - if (ret) - return (-EINTR == ret) ? -EAGAIN : ret; + ret = wait_event_interruptible_timeout(blitq->busy_queue, + blitq->num_free > 0, + msecs_to_jiffies(1000)); + switch (ret) { + case 0: + /* timeout */ + return -EBUSY; + case -ERESTARTSYS: + /* interrupted by signal */ + return -EAGAIN; + default: + return 0; + } spin_lock_irqsave(&blitq->blit_lock, irqsave); } @@ -786,9 +813,6 @@ via_dma_blit_sync(struct drm_device *dev, void *data, struct drm_file *file_priv err = via_dmablit_sync(dev, sync->sync_handle, sync->engine); - if (-EINTR == err) - err = -EAGAIN; - return err; }