From patchwork Thu Jul 18 15:37:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11049239 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 5B4BA13A4 for ; Thu, 18 Jul 2019 15:37:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D033286FE for ; Thu, 18 Jul 2019 15:37:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 418B72887A; Thu, 18 Jul 2019 15:37:57 +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 8EF6A28837 for ; Thu, 18 Jul 2019 15:37:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B9C696E409; Thu, 18 Jul 2019 15:37:53 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf1-x143.google.com (mail-lf1-x143.google.com [IPv6:2a00:1450:4864:20::143]) by gabe.freedesktop.org (Postfix) with ESMTPS id CA2A56E409; Thu, 18 Jul 2019 15:37:52 +0000 (UTC) Received: by mail-lf1-x143.google.com with SMTP id 62so14654970lfa.8; Thu, 18 Jul 2019 08:37:52 -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=CkYH+Syi4O/yhDhEc/xDog537x8dbMQ1g6nGXmqq72Q=; b=PH7VdpCYcZjdUw6KslEeLSSM07A+YAArBUcby7QTpVtMf54w4hjsRAlhbdCvkDYX6A fQSdnBj1HylY37ZHY9lWchXYSA5FWXawidGygfqi/Yc1azFslxffxvmkLMS35zYOyWiy tkn/mwGV51zWqi+epmEuLgzXN+LK5bApbDBDZDK3LyFmK3KnapaNiU2rcImFVAnizNds SYiiPcHapyYAX8ObvMZ2ViI05y3VbSbmw4F9zYEAWJjTpygKndaWhHXowpKzeznFPtxZ JMQSn8fanYEFPCrLlMRyVDQ3eWFkuqpgYjgYc2rgcjUE5EGYJvmYC+EZjbZDhBSM7GFJ lFfg== X-Gm-Message-State: APjAAAX+lR07G5R9gGJzniLXBJOnT6eOmacBcmf7RD7r9Dy9GLe3HvBF HLkg0aJ4tnNvjautu58/qAF44Wdccrg= X-Google-Smtp-Source: APXvYqxSlSluV91UM2MLhgAoZdC51nh8gVhNKIETIyBmBCB5Dhl2uNW9VeU67oPjGbpaKXqQi1v7DQ== X-Received: by 2002:a19:ca0d:: with SMTP id a13mr20721673lfg.110.1563464271038; Thu, 18 Jul 2019 08:37:51 -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.49 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 18 Jul 2019 08:37:50 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, openchrome-devel@lists.freedesktop.org Subject: [PATCH v1 1/6] drm/via: drop use of DRM(READ|WRITE) macros Date: Thu, 18 Jul 2019 17:37:32 +0200 Message-Id: <20190718153737.28657-2-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=CkYH+Syi4O/yhDhEc/xDog537x8dbMQ1g6nGXmqq72Q=; b=piCo1azNyKTRasmRFMNy+vhgzG7AikQxt4DvXgMc7DNXpTtDHdzwockXLgm85AKs59 Ji7Tt6sqzKU/ElIKmIj0wFvR2s5HD1rS+6wB+2oCqDQl3yTCeV0cH8+P4NSLOaefs8cq naJw58RoxWq3Zf4+AHIRygw53zw91DwcR6IUFR7iSSjInaegR1RS0wvrUOOHrJCLf6cK ddHaB5CjEj5WzPJ/j8OJbLI1QGwupvTiSjH10dimcEDmX/gdY+oH5HkybrKjQABlXCT+ HfhXDwxr4wdV9fTKOBu7BBo8JflYjg/NHEupsnLb7HtzwLCeGL/Pwyb3rJMd1HzRi5dx X20g== 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 The DRM_READ, DRM_WRITE macros comes from the deprecated drm_os_linux.h header file. Remove their use to remove this dependency. Replace the use of the macros with open coded variants. 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_drv.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h index 6d1ae834484c..d5a2b1ffd8c1 100644 --- a/drivers/gpu/drm/via/via_drv.h +++ b/drivers/gpu/drm/via/via_drv.h @@ -115,10 +115,17 @@ enum via_family { /* VIA MMIO register access */ #define VIA_BASE ((dev_priv->mmio)) -#define VIA_READ(reg) DRM_READ32(VIA_BASE, reg) -#define VIA_WRITE(reg, val) DRM_WRITE32(VIA_BASE, reg, val) -#define VIA_READ8(reg) DRM_READ8(VIA_BASE, reg) -#define VIA_WRITE8(reg, val) DRM_WRITE8(VIA_BASE, reg, val) +#define VIA_READ(reg) \ + readl(((void __iomem *)VIA_BASE->handle) + (reg)) + +#define VIA_WRITE(reg, val) \ + writel(val, ((void __iomem *)VIA_BASE->handle) + (reg)) + +#define VIA_READ8(reg) \ + readb(((void __iomem *)VIA_BASE->handle) + (reg)) + +#define VIA_WRITE8(reg, val) \ + writeb(val, ((void __iomem *)VIA_BASE->handle) + (reg)) extern const struct drm_ioctl_desc via_ioctls[]; extern int via_max_ioctl; From patchwork Thu Jul 18 15:37:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11049241 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 519E013AC for ; Thu, 18 Jul 2019 15:37:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4305128872 for ; Thu, 18 Jul 2019 15:37:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 378552887A; Thu, 18 Jul 2019 15:37:59 +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 D42FD28872 for ; Thu, 18 Jul 2019 15:37:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7BD4C6E40B; Thu, 18 Jul 2019 15:37:55 +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 DC1846E40B; Thu, 18 Jul 2019 15:37:53 +0000 (UTC) Received: by mail-lj1-x244.google.com with SMTP id x25so27844856ljh.2; Thu, 18 Jul 2019 08:37:53 -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=w6yHqmxck4jbNZAyXHzblUU+tcGpDiDKg0tZ501j8fk=; b=AMkKPpVs9QiBgnMK+oQIVWfyOqQYDLTFtSuhi5Grx9maDZ1f67PGLNaFDQI7JwfZCq P344HUfCfBidBMX2Ks/I11boeeVIf87TNgk1MhUloWUfp9qJKj0vuSsWzBL2v12NZAP5 WOAFgTJxPGTHVZv1nFw83MWv9Yv2x1e50rp7aLjTR3/JBQKZX/Rdjr3T7EhHwbrXtNc4 yNhz1b3Ak1dfKyh1RiX0F+GwMfHYiR2NoiQxNdOV7TU+B80JatpLM9jC/zCptCuFnV5T VnBOmLztmAUt0OC6HdxXGZXXTMu/FhXLeNF1hs9ADtTVOuUSUdM4ox+qYsWf5/KLsRJM HLHQ== X-Gm-Message-State: APjAAAXqqxuS/xC1SooWQJ0dlseLyUF/hcn/7gIfcBZcfC2Shgz1k8Eb ZD72BMuvMBYd+tx1F2RmglAUfQz2WOU= X-Google-Smtp-Source: APXvYqw9QxIzUJtvGxY+df+B6xKMMcawOqcuSXsObNg7rQ3hiNLz+0DbweMOyAkqSggZgH/TMzjSCg== X-Received: by 2002:a2e:7818:: with SMTP id t24mr6265468ljc.210.1563464272078; Thu, 18 Jul 2019 08:37:52 -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.51 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 18 Jul 2019 08:37:51 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, openchrome-devel@lists.freedesktop.org Subject: [PATCH v1 2/6] drm/via: make via_drv.h self-contained Date: Thu, 18 Jul 2019 17:37:33 +0200 Message-Id: <20190718153737.28657-3-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=w6yHqmxck4jbNZAyXHzblUU+tcGpDiDKg0tZ501j8fk=; b=oCZ/msCfkMapoYpybJdeaXXD90/mqq3oHISqkRNaJbHT0kyU6jY1DzyaNBVqbtLYjT m/09iT0GMkuVY3oNc9xjjuFCptkY5f4NUc9aev0u1kxFHbBecoWndCoNbgJKYgSlv8Xx o8/8FRYNQwJPZjc9+7G7KoYv9BgTZS0oinlPjA8lhCx0mUrjLJx+SH1xgaW3aPHhX3V4 taRfrpWVpbQJJncjhYZj2c5bXGnTxQXwNuhU4jKAMuzUkaPaflcqzujFbmwgUfgo/GfV 7+RMZJFLuQw60KeI83WjS+eOvrhTfn/54O1x7qI6p0xxR62kw6skxCEclD12esSxj8Vu LYpQ== 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 Added the necessary header files to make this header file self-contained. 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_drv.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h index d5a2b1ffd8c1..f36ac1134424 100644 --- a/drivers/gpu/drm/via/via_drv.h +++ b/drivers/gpu/drm/via/via_drv.h @@ -24,8 +24,12 @@ #ifndef _VIA_DRV_H_ #define _VIA_DRV_H_ -#include +#include + +#include #include +#include +#include #define DRIVER_AUTHOR "Various" From patchwork Thu Jul 18 15:37:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11049245 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 7A42C13A4 for ; Thu, 18 Jul 2019 15:38:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6C5C728833 for ; Thu, 18 Jul 2019 15:38:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6090F286D4; Thu, 18 Jul 2019 15:38:05 +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 C59912887A for ; Thu, 18 Jul 2019 15:38:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4EE8B6E416; Thu, 18 Jul 2019 15:38:01 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 26D976E413; Thu, 18 Jul 2019 15:37:55 +0000 (UTC) Received: by mail-lj1-x242.google.com with SMTP id x25so27844917ljh.2; Thu, 18 Jul 2019 08:37:55 -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=abKr8U1s26zaXGUSgB//T3ReRdjCy7lXyFiU/pL3ZEw=; b=VxO7tKzYM22CSvm0RGhXAJ4758W6fGYmE9s8zwL/dvXjwkBpdXmJ/mgvRCVkE1oKLT dPliejx4xuqm2ML+ZQTRMCzkQMlJ9aAQkNb/8hvIRmdxgp492jMflhS2IUwjgOaq2L8n ssUA06LfVax49JwS9pC8LLufY4uOAMmT2sGg6KYad9kH4uwWr7Lzxc7GuC69UW/AzW5F 3fqRyjGcd4GgaYoiyONzb1c2mrQw/KBQhHmOmKbGJERFvTJ/dNbGEkQ4cGC2rTGDq8iY OFcYpgMPWPYEjZJshbSx0QB4OmO8bYqo7oSZ16sTbMcWRHApcZOkvYMzB8EBSLNQmbLH 89oA== X-Gm-Message-State: APjAAAXUzf8N6iYdx2wQ4HrMwaj0qpUqmyaBYDYF7G0eChVtCoUPDpGF WMMYEl+Ip6DN5GMlm6UBI4hs8HXlwro= X-Google-Smtp-Source: APXvYqwqEqct5AdufUBnsQ3hmvU1UBswNF3Y7f3JP2PUnwRWzCwj+7m69jtRYQNfLctLQLmbl/HbEw== X-Received: by 2002:a2e:86cc:: with SMTP id n12mr609046ljj.146.1563464273195; Thu, 18 Jul 2019 08:37:53 -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.52 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 18 Jul 2019 08:37:52 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, openchrome-devel@lists.freedesktop.org Subject: [PATCH v1 3/6] drm/via: drop use of drmP.h Date: Thu, 18 Jul 2019 17:37:34 +0200 Message-Id: <20190718153737.28657-4-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=abKr8U1s26zaXGUSgB//T3ReRdjCy7lXyFiU/pL3ZEw=; b=IJDwkskybjs7DJyTAZGzlcNnaRllDYFqoGaSa4kt/N6ONay30Kl4yK2ex2D39CtF49 oa9y7k9gyHvkT6IeeBIdwFz//T+8Nv7i9CrCy5aKhWvJUeFUZUDb4VGywcd+QRWFn0Rs 1kajwNzC2RkxQkhmXSAJvnX6ZXSXeNK1wtLhBek9DwyIFGXTgnmXbGc1VQ9nkjYyWRIA q8gckHqWljx2RCMhchyVcQONuJe4V218XuXzxogPetlhUAQ7taJ3JGxoKkLESVoM2AiX ALUm62cd59kxud9NiBo9JqTPSoaF7e4GZSKSy/RTFu+ZExSfTw3XY3LL5cDee9U2JQrm f4lw== 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 Drop use of the deprecated drmP.h header. While touching the files divide include files in blocks and sort the files alphabetically. 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_dma.c | 9 ++++++++- drivers/gpu/drm/via/via_dmablit.c | 14 +++++++++----- drivers/gpu/drm/via/via_drv.c | 7 +++++-- drivers/gpu/drm/via/via_irq.c | 5 ++++- drivers/gpu/drm/via/via_map.c | 6 +++++- drivers/gpu/drm/via/via_mm.c | 7 ++++++- drivers/gpu/drm/via/via_verifier.c | 10 +++++----- drivers/gpu/drm/via/via_video.c | 4 +++- 8 files changed, 45 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/via/via_dma.c b/drivers/gpu/drm/via/via_dma.c index d17d8f245c1a..4e50834dd222 100644 --- a/drivers/gpu/drm/via/via_dma.c +++ b/drivers/gpu/drm/via/via_dma.c @@ -34,8 +34,15 @@ * Thomas Hellstrom. */ -#include +#include +#include + +#include +#include +#include +#include #include + #include "via_drv.h" #include "via_3d_reg.h" diff --git a/drivers/gpu/drm/via/via_dmablit.c b/drivers/gpu/drm/via/via_dmablit.c index 062067438f1d..87d88bdd20c6 100644 --- a/drivers/gpu/drm/via/via_dmablit.c +++ b/drivers/gpu/drm/via/via_dmablit.c @@ -34,13 +34,17 @@ * the same DMA mappings? */ -#include -#include -#include "via_drv.h" -#include "via_dmablit.h" - #include #include +#include + +#include +#include +#include +#include + +#include "via_dmablit.h" +#include "via_drv.h" #define VIA_PGDN(x) (((unsigned long)(x)) & PAGE_MASK) #define VIA_PGOFF(x) (((unsigned long)(x)) & ~PAGE_MASK) diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c index af6a12d3c058..666a16de84f9 100644 --- a/drivers/gpu/drm/via/via_drv.c +++ b/drivers/gpu/drm/via/via_drv.c @@ -24,11 +24,14 @@ #include -#include +#include +#include +#include +#include #include + #include "via_drv.h" -#include static int via_driver_open(struct drm_device *dev, struct drm_file *file) { diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c index c96830ccc0ec..9d47feb367d8 100644 --- a/drivers/gpu/drm/via/via_irq.c +++ b/drivers/gpu/drm/via/via_irq.c @@ -35,8 +35,11 @@ * The refresh rate is also calculated for video playback sync purposes. */ -#include +#include +#include +#include #include + #include "via_drv.h" #define VIA_REG_INTERRUPT 0x200 diff --git a/drivers/gpu/drm/via/via_map.c b/drivers/gpu/drm/via/via_map.c index 2ad865870372..431c150df014 100644 --- a/drivers/gpu/drm/via/via_map.c +++ b/drivers/gpu/drm/via/via_map.c @@ -21,8 +21,12 @@ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ -#include + +#include +#include +#include #include + #include "via_drv.h" static int via_do_init_map(struct drm_device *dev, drm_via_init_t *init) diff --git a/drivers/gpu/drm/via/via_mm.c b/drivers/gpu/drm/via/via_mm.c index 4217d66a5cc6..45cc9e900260 100644 --- a/drivers/gpu/drm/via/via_mm.c +++ b/drivers/gpu/drm/via/via_mm.c @@ -25,8 +25,13 @@ * Authors: Thomas Hellström */ -#include +#include + +#include +#include +#include #include + #include "via_drv.h" #define VIA_MM_ALIGN_SHIFT 4 diff --git a/drivers/gpu/drm/via/via_verifier.c b/drivers/gpu/drm/via/via_verifier.c index fb2609434df7..361a450058f2 100644 --- a/drivers/gpu/drm/via/via_verifier.c +++ b/drivers/gpu/drm/via/via_verifier.c @@ -28,13 +28,13 @@ * be very slow. */ -#include "via_3d_reg.h" -#include -#include +#include #include -#include "via_verifier.h" +#include + +#include "via_3d_reg.h" #include "via_drv.h" -#include +#include "via_verifier.h" typedef enum { state_command, diff --git a/drivers/gpu/drm/via/via_video.c b/drivers/gpu/drm/via/via_video.c index a9ffbad1cfdd..4e165b1b0b18 100644 --- a/drivers/gpu/drm/via/via_video.c +++ b/drivers/gpu/drm/via/via_video.c @@ -25,8 +25,10 @@ * Video and XvMC related functions. */ -#include +#include +#include #include + #include "via_drv.h" void via_init_futex(drm_via_private_t *dev_priv) 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; } 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; + } } From patchwork Thu Jul 18 15:37:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11049243 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 F0E8113AC for ; Thu, 18 Jul 2019 15:38:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E1F6928867 for ; Thu, 18 Jul 2019 15:38:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D67F82887A; Thu, 18 Jul 2019 15:38:02 +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 8046C28867 for ; Thu, 18 Jul 2019 15:38:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 776486E41A; Thu, 18 Jul 2019 15:38:01 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf1-x141.google.com (mail-lf1-x141.google.com [IPv6:2a00:1450:4864:20::141]) by gabe.freedesktop.org (Postfix) with ESMTPS id 666E36E40C; Thu, 18 Jul 2019 15:37:58 +0000 (UTC) Received: by mail-lf1-x141.google.com with SMTP id b17so19553660lff.7; Thu, 18 Jul 2019 08:37:58 -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=LLrJd06qiFDP4GE0liBgjxZMnk5poDqpfuPX5kofgWM=; b=ilc/E1d+KOqZ6BWS+BgkW0cvOsUN+e4RAWetsNtZSgeagNk1gCDkLdzu3fBcJTYGvB xZ+DHhRswm4yVBMnHVsUrxDq7cwEwwCXnBmcQ63G0H44eBMmxZdMaljwB9eXnCma6X1w jAYomKI1r0/hwjrRMHkdr+KSr3VjcWlmIqVjDu+0If7hGZpsfIG090eV98q7m6ec7vcQ 3uhzMmPv4RN4F+IwdbbWURCXbyeAu6gP5WlunN4JDFk6kz9mJk+lw2Tv1pvnjO2ty5gF 7Facno+dj/9+4/UeuKOd2ADKMMAv7/WLecombZAjGK5xz3J+LguYH8sH88Mdd41uBIem mM5g== X-Gm-Message-State: APjAAAXnJ52XEHckjJGYqwbZnzzLAFAX38poSJpggIW9F6D3lNq41VZa KfFjoHdkA10iI/7VlQDL7vDJDqeAR4w= X-Google-Smtp-Source: APXvYqz+tuBXxumYanvzxdC1TzdnCeeorGWynHiiVTy6bzSeFsNP8JSHOBvdEged/Qx+QDSMXAJzfA== X-Received: by 2002:a05:6512:48f:: with SMTP id v15mr17733196lfq.37.1563464276494; Thu, 18 Jul 2019 08:37:56 -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.55 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 18 Jul 2019 08:37:56 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, openchrome-devel@lists.freedesktop.org Subject: [PATCH v1 6/6] drm/via: drop DRM_WAIT_ON() in via_video Date: Thu, 18 Jul 2019 17:37:37 +0200 Message-Id: <20190718153737.28657-7-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=LLrJd06qiFDP4GE0liBgjxZMnk5poDqpfuPX5kofgWM=; b=jDhxEVsoTa506cjPZjB31vsZDAtu/mmo7nfsZRGkU63NCjhpDvPmh1ClUPYoOHKwIz 8Xc7GWx8FRQAqyKKEP59TAqWJm8hfzDQey2Ng5i6+QgT9zLzWuAF5wSaSFzMRYlaIgUZ +V+AccBzDPxepfolh+4ZSFjpfI0JPAdV2RPZ7GGU8Fk2JH91XJUG5JgwJb/E8gpAlHPe d/E4XQOf3+dAjDYS1KoLWWzp/nNr14HHxkxCPFwWmTT01J/1G1hjhdUVQpy7WsiVq0oX KrJYq/F5UhYZId5aeyNkFzcnmOQUIj9+999VzNSzPBJK6MVMt/bslQP7LDrTi8laWTwO CUpw== 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(). 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_video.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/via/via_video.c b/drivers/gpu/drm/via/via_video.c index 4e165b1b0b18..1f88180affef 100644 --- a/drivers/gpu/drm/via/via_video.c +++ b/drivers/gpu/drm/via/via_video.c @@ -26,7 +26,6 @@ */ #include -#include #include #include "via_drv.h" @@ -73,7 +72,7 @@ int via_decoder_futex(struct drm_device *dev, void *data, struct drm_file *file_ volatile int *lock; drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private; drm_via_sarea_t *sAPriv = dev_priv->sarea_priv; - int ret = 0; + int ret; DRM_DEBUG("\n"); @@ -84,9 +83,21 @@ 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], - (fx->ms / 10) * (HZ / 100), *lock != fx->val); - return ret; + ret = wait_event_interruptible_timeout( + dev_priv->decoder_queue[fx->lock], + *lock != fx->val, + msecs_to_jiffies(fx->ms)); + switch (ret) { + case 0: + /* timeout */ + return -EBUSY; + case -ERESTARTSYS: + /* interrupted by signal */ + return -EINTR; + default: + return 0; + } + case VIA_FUTEX_WAKE: wake_up(&(dev_priv->decoder_queue[fx->lock])); return 0;