From patchwork Thu Jul 18 15:37:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11049249 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 1D5A413AC for ; Thu, 18 Jul 2019 15:38:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0EA6A28746 for ; Thu, 18 Jul 2019 15:38:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 01FDD28867; Thu, 18 Jul 2019 15:38:09 +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 3DF4328746 for ; Thu, 18 Jul 2019 15:38:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 230C86E41B; 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-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9D41E6E418; Thu, 18 Jul 2019 15:37:57 +0000 (UTC) Received: by mail-lj1-x244.google.com with SMTP id k18so27797103ljc.11; Thu, 18 Jul 2019 08:37:57 -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=j3sl61idaWn9UYKJNwtX3bBPEmvS1pnSPVz5HXlu+zY=; b=TG6KQnxlVZmETfTe0jjxGQEZFhwxw4ExAgKfOM8qtSMRw9rSckT7BEbFjCUHbpr3p1 kXY1Xn/YkZoerfpZYGdoYOn7odCgp0QDJUMMwnkHmNNoxst7NYfi/pBT7fHqJAw2Kua+ dbscqRIavRPf7CMap7VMgx0y3vnZlPtZ73oveSUatFrCBeyl7QUWDo4skUsbBufJEGh9 xOXj8DeOuqwjmLqAJsW2/QCueWGaIJPJTTkYWLvnAjoslkZnos77FXvlpeI3AKFV5Yix KnnoPts6DwX/H+buh8AitKUaG1HHEvRRW5DiNYZJoyZI75XsFFv9Ppp0floeOAgWEVcZ rEfg== X-Gm-Message-State: APjAAAXTY0A7rnwYeBdN5062O9BzZXQYKd3if5Y+Bf9rdqWh9LVhhn8+ eFhrDQs5B0O3/X31zDOWc9cHdjcxMLE= X-Google-Smtp-Source: APXvYqzxzJ41zh7MyQhmQGZy4bflCU5eBwZzm7dS+kL2al4Bf1vCJV2vvkrKANKvHQ9F7ImeWrnP5A== X-Received: by 2002:a2e:96d0:: with SMTP id d16mr10974480ljj.14.1563464275466; Thu, 18 Jul 2019 08:37:55 -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.54 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 18 Jul 2019 08:37:55 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, openchrome-devel@lists.freedesktop.org Subject: [PATCH v1 5/6] drm/via: drop DRM_WAIT_ON() in via_irq Date: Thu, 18 Jul 2019 17:37:36 +0200 Message-Id: <20190718153737.28657-6-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=j3sl61idaWn9UYKJNwtX3bBPEmvS1pnSPVz5HXlu+zY=; b=YJ46WydpYc2OIbO/z9BmBvwDAapVVoO0jMa/ePRzITSBZayDg0Qzuq0JrDOp5TtHwK Sq3UOG7k34XNsnUTf24KlDQ6raVMRXnPU5Rf5EcATout/jggrgwwfVWk0U3u6tluNC98 yRZb5WEe/Si5Yt+lxZUYOEgRo/Ljky4hRf5JdExVc1LpBjDyJqM1Tjnj3SB+MG23QwFQ 7Ib9aWeIQiSjJxDOFsAfokqCgxi+kLKYdz9KFLUs8LEAmSno4YcdhaauXLhdVRTHxjGW tEQaB+tvOKGcNm02B9CzPhyJ9ix1UD7Hvs65u2idbmjbInv8dUgzZVPW83bdur7rzfIb pDzg== 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 Replace DRM_WAIT_ON() with wait_event_interruptible(). While replacing be careful to keep same return value semantics. 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_irq.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c index 9d47feb367d8..6de15065a3c0 100644 --- a/drivers/gpu/drm/via/via_irq.c +++ b/drivers/gpu/drm/via/via_irq.c @@ -36,7 +36,6 @@ */ #include -#include #include #include @@ -201,6 +200,12 @@ void via_disable_vblank(struct drm_device *dev, unsigned int pipe) DRM_ERROR("%s: bad crtc %u\n", __func__, pipe); } +/* + * Returns: + * 0 if interrupt occured within 3 secs + * -EBUSY if timeout happended + * -EINTR if interrupted by a signal + */ static int via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence, unsigned int *sequence) @@ -208,7 +213,7 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private; unsigned int cur_irq_sequence; drm_via_irq_t *cur_irq; - int ret = 0; + int ret; maskarray_t *masks; int real_irq; @@ -236,18 +241,27 @@ 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_READ(masks[irq][2]) & masks[irq][3]) == - masks[irq][4])); + ret = wait_event_interruptible_timeout(cur_irq->irq_queue, + ((VIA_READ(masks[irq][2]) & masks[irq][3]) == masks[irq][4]), + msecs_to_jiffies(3000)); cur_irq_sequence = atomic_read(&cur_irq->irq_received); } else { - DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ, - (((cur_irq_sequence = - atomic_read(&cur_irq->irq_received)) - - *sequence) <= (1 << 23))); + ret = wait_event_interruptible_timeout(cur_irq->irq_queue, + (((cur_irq_sequence = atomic_read(&cur_irq->irq_received)) - *sequence) <= (1 << 23)), + msecs_to_jiffies(3000)); } *sequence = cur_irq_sequence; - return ret; + + switch (ret) { + case 0: + /* timeout */ + return -EBUSY; + case -ERESTARTSYS: + /* interrupted by signal */ + return -EINTR; + default: + return 0; + } }