From patchwork Tue Jul 23 20:09:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11055261 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 8913A1398 for ; Tue, 23 Jul 2019 20:10:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B97827F93 for ; Tue, 23 Jul 2019 20:10:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6FAC728682; Tue, 23 Jul 2019 20:10:40 +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 D73C727F93 for ; Tue, 23 Jul 2019 20:10:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C035F6E3B8; Tue, 23 Jul 2019 20:10:38 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0D1EB6E3B8; Tue, 23 Jul 2019 20:10:37 +0000 (UTC) Received: by mail-lj1-x244.google.com with SMTP id v18so42242274ljh.6; Tue, 23 Jul 2019 13:10:36 -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=oE2GCWUZjElyuUxUkWwexdCv/sFyiwrD0HUdJqH9gW4=; b=asg+7Y211UtMiXbNr5D/Ha8mV7s4N4Jch93XiRh6CLeh5soqqu4z57CS3bmeRMEgju SNiJAMWbn9QuNbP/i2kblsUPAmPt22hoSgDJN/2i7LMQ8cO1o4u4zbI+NC5anzTs5xib Bu71a3SCt8UDAgjKwmGKDPzsXM0XVo4rxNvC9UqjpDT8XBp1wNppz9SeOzPfgarnrrBl 4W/4L4s5RIFCU2duCR1OcGhfCiAfuZC31e/zS/siIqWlR1vPXBvSfzKxlI5lD7Gm/hOp hnzsMsruu3vgUjGxNnVdnrtC4OcUdlrELClRuS4tclG6KU9bSvMTlnLvQvflCODVhbFR whNw== X-Gm-Message-State: APjAAAVlD6u4v14m4Vj/kOpAlffSdiTvu0sqo2VN/FDE7L9M7J8afIF4 tfEEEsNzmNH2vCkIusDwO0e6U+pI0XU= X-Google-Smtp-Source: APXvYqy0wP5KwGsophZjpv4ijxSLsU0u5aoS31vFo/C+wYIRLWFNMzrxOxy4CfTqaMA+/l731nJNSA== X-Received: by 2002:a2e:93c8:: with SMTP id p8mr40191657ljh.6.1563912635177; Tue, 23 Jul 2019 13:10:35 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id p21sm6708006lfc.41.2019.07.23.13.10.34 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 23 Jul 2019 13:10:34 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, openchrome-devel@lists.freedesktop.org Subject: [PATCH v4 2/4] drm/via: copy DRM_WAIT_ON as VIA_WAIT_ON and use it Date: Tue, 23 Jul 2019 22:09:42 +0200 Message-Id: <20190723200944.17285-3-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190723200944.17285-1-sam@ravnborg.org> References: <20190723200944.17285-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=oE2GCWUZjElyuUxUkWwexdCv/sFyiwrD0HUdJqH9gW4=; b=PGg/Iqq2OcdMDksksfNGD2mc6FN7eFW29sbpTAL10HlhfZI20rDLV3cZWEf/MVrweq hwEdnfPij0Mii/9w/Mr5M9a2b3V4+7QnUbandgsaPJyf7YnXY++YMOJv4cpKWRdoW3jP V9QNbm5D5gzeCOyCWdOavgkprzXgvTfTxi3tdNHrHixff6vnb2ke5Q2kV4zRJDjwBcet Ayn9wnd6lZ1A70gZgmeQxPqofxtiQfX2nrfg/C9rR9ojtpjxBA/BewqC/vUSYue3jJuE 6wzKLkvFVxm/tXyVMYYtc3w/cd+k1W3Pvqt9n6yP64aewF6ORxloe+axHMV+2yed6o1A yNaw== 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 , =?utf-8?q?Michel_D=C3=A4nzer?= , 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 VIA_WAIT_ON() is a direct copy of DRM_WAIT_ON() from drm_os_linux.h. The copy is made so we can avoid the dependency on the legacy header. A more involved approach had been to introduce wait_event_* but for this legacy driver the simpler and more safe approach with a copy of the macro was selected. Added the relevant header files for the functions used in VIA_WAIT_ON. v3: - Updated users of DRM_WAIT_ON => VIA_WAIT_ON (Emil) - Updated $subject (Emil) 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 Cc: Michel Dänzer --- drivers/gpu/drm/via/via_dmablit.c | 4 +-- drivers/gpu/drm/via/via_drv.h | 42 ++++++++++++++++++++++++++++++- drivers/gpu/drm/via/via_irq.c | 4 +-- drivers/gpu/drm/via/via_video.c | 2 +- 4 files changed, 46 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/via/via_dmablit.c b/drivers/gpu/drm/via/via_dmablit.c index e1557dd67083..2ec93d976a43 100644 --- a/drivers/gpu/drm/via/via_dmablit.c +++ b/drivers/gpu/drm/via/via_dmablit.c @@ -436,7 +436,7 @@ via_dmablit_sync(struct drm_device *dev, uint32_t handle, int engine) int ret = 0; if (via_dmablit_active(blitq, engine, handle, &queue)) { - DRM_WAIT_ON(ret, *queue, 3 * HZ, + VIA_WAIT_ON(ret, *queue, 3 * HZ, !via_dmablit_active(blitq, engine, handle, NULL)); } DRM_DEBUG("DMA blit sync handle 0x%x engine %d returned %d\n", @@ -687,7 +687,7 @@ 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); + VIA_WAIT_ON(ret, blitq->busy_queue, HZ, blitq->num_free > 0); if (ret) return (-EINTR == ret) ? -EAGAIN : ret; diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h index 368185b80184..9e6a0c5f316c 100644 --- a/drivers/gpu/drm/via/via_drv.h +++ b/drivers/gpu/drm/via/via_drv.h @@ -24,8 +24,13 @@ #ifndef _VIA_DRV_H_ #define _VIA_DRV_H_ -#include +#include +#include +#include +#include + #include +#include #define DRIVER_AUTHOR "Various" @@ -140,6 +145,41 @@ static inline void via_write8_mask(struct drm_via_private *dev_priv, writeb(tmp, (void __iomem *)(dev_priv->mmio->handle + reg)); } +/* + * Poll in a loop waiting for 'contidition' to be true. + * Note: A direct replacement with wait_event_interruptible_timeout() + * will not work unless driver is updated to emit wake_up() + * in relevant places that can impact the 'condition' + * + * Returns: + * ret keeps current value if 'condition' becomes true + * ret = -BUSY if timeout happens + * ret = -EINTR if a signal interrupted the waiting period + */ +#define VIA_WAIT_ON( ret, queue, timeout, condition ) \ +do { \ + DECLARE_WAITQUEUE(entry, current); \ + unsigned long end = jiffies + (timeout); \ + add_wait_queue(&(queue), &entry); \ + \ + for (;;) { \ + __set_current_state(TASK_INTERRUPTIBLE); \ + if (condition) \ + break; \ + if (time_after_eq(jiffies, end)) { \ + ret = -EBUSY; \ + break; \ + } \ + schedule_timeout((HZ/100 > 1) ? HZ/100 : 1); \ + if (signal_pending(current)) { \ + ret = -EINTR; \ + break; \ + } \ + } \ + __set_current_state(TASK_RUNNING); \ + remove_wait_queue(&(queue), &entry); \ +} while (0) + extern const struct drm_ioctl_desc via_ioctls[]; extern int via_max_ioctl; diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c index 08c87127f143..3e68cfa65b12 100644 --- a/drivers/gpu/drm/via/via_irq.c +++ b/drivers/gpu/drm/via/via_irq.c @@ -233,12 +233,12 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence cur_irq = dev_priv->via_irqs + real_irq; if (masks[real_irq][2] && !force_sequence) { - DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ, + VIA_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ, ((via_read(dev_priv, masks[irq][2]) & masks[irq][3]) == masks[irq][4])); cur_irq_sequence = atomic_read(&cur_irq->irq_received); } else { - DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ, + VIA_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ, (((cur_irq_sequence = atomic_read(&cur_irq->irq_received)) - *sequence) <= (1 << 23))); diff --git a/drivers/gpu/drm/via/via_video.c b/drivers/gpu/drm/via/via_video.c index a9ffbad1cfdd..cf53612c945e 100644 --- a/drivers/gpu/drm/via/via_video.c +++ b/drivers/gpu/drm/via/via_video.c @@ -82,7 +82,7 @@ int via_decoder_futex(struct drm_device *dev, void *data, struct drm_file *file_ switch (fx->func) { case VIA_FUTEX_WAIT: - DRM_WAIT_ON(ret, dev_priv->decoder_queue[fx->lock], + VIA_WAIT_ON(ret, dev_priv->decoder_queue[fx->lock], (fx->ms / 10) * (HZ / 100), *lock != fx->val); return ret; case VIA_FUTEX_WAKE: