From patchwork Sun Dec 17 17:25:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 10118445 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 59CFB60390 for ; Mon, 18 Dec 2017 08:38:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 484D9288C5 for ; Mon, 18 Dec 2017 08:38:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D5752893F; Mon, 18 Dec 2017 08:38:19 +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.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID 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 076F8288C5 for ; Mon, 18 Dec 2017 08:38:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 125FE89C83; Mon, 18 Dec 2017 08:38:06 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf0-x244.google.com (mail-lf0-x244.google.com [IPv6:2a00:1450:4010:c07::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id EE3A089C56 for ; Sun, 17 Dec 2017 17:27:59 +0000 (UTC) Received: by mail-lf0-x244.google.com with SMTP id u127so11267144lff.5 for ; Sun, 17 Dec 2017 09:27:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=3X0W/hDuHmvc/sblMEOxQJ1SpVPEzL7Izcy3ULLQt4Q=; b=qaSX5KHgneHLK0AZ7RVsc51MtCyuJSqQmeQowX0WAmfbYr5NaOAr3ce5srDJAPgy5d ywwcDDIOGs02flqd3Hkm4UV26j6HuwSwYHVQLABdYLsuj5NMJ4Q9mzFagTvh+r3+zvUM ztKQPQcKKiHc5MaMdXE2+EOoQFuTUrjQddb/p3Sb6WrUOVd8wLyPOCHjY3SN0H/B8jkn PPsl/XqkznxVcLLl8wKKloxxTZXX1hpdhoXLdhfdatMGqd6vAnR4QUlwFIfEOPkapTD5 6bkdquWj1Pds5I44wEKT5uBwxWvHGCJmJ7Tnkp8D9KwjJ9ws1N50RGC23pDB+TgLuK2r VYhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=3X0W/hDuHmvc/sblMEOxQJ1SpVPEzL7Izcy3ULLQt4Q=; b=V6VBYV+mJWMXBzExgqlR8roLIxfA/ZYUcllsg6zay6kA4QbPEVQ08r2CUZfdwOVmAW GDOBaI4hst/C16Ta2f/Qgx4tVxVn5bGlrc7n0Or/yHxmrQ4g0DMtH0cnNzokDdPnjeXX eMbh2jVHRVU6O/OLfwzvJJ1myj6NpGOMCTeRbw6YjlszorfvgYcveAT1O93gU8vYThO2 O73bug3w7Y/kHxwHt4W2mVm1lOFGlUC1ToBZTRV/Reep7KKOsp+5FNKZU1MQaPfppGIN lIQokcqd4qCtM38xy7We5bQhztfPv9/NWw3tvsRrmcCRUy0XHctHZL3TPsBf6Xkqztwp ohJA== X-Gm-Message-State: AKGB3mJCSTIpgR4XE8xLkS9Qe8Fd2I4omuUMYhA/pPgYm7u4Mk4ilr1e crNhd3vM143vpqClaYdkrsI= X-Google-Smtp-Source: ACJfBouUaeL7tU0kU6FfgC89gz0OL9W75EMa6qNTEMxgouS9FhYx7MFl7YMwj3JzEdpUapRhEcQfkQ== X-Received: by 10.46.88.68 with SMTP id x4mr9754633ljd.138.1513531678075; Sun, 17 Dec 2017 09:27:58 -0800 (PST) Received: from localhost.localdomain (ppp109-252-55-194.pppoe.spdop.ru. [109.252.55.194]) by smtp.gmail.com with ESMTPSA id t85sm2244926ljb.91.2017.12.17.09.27.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Dec 2017 09:27:57 -0800 (PST) From: Dmitry Osipenko To: Thierry Reding Subject: [PATCH v1] drm/tegra: Correct timeout in tegra_syncpt_wait Date: Sun, 17 Dec 2017 20:25:42 +0300 Message-Id: <8a87083279bb793dd21a0c621bcd002a851495e5.1513530934.git.digetx@gmail.com> X-Mailer: git-send-email 2.15.1 X-Mailman-Approved-At: Mon, 18 Dec 2017 08:38:01 +0000 Cc: linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org 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 host1x_syncpt_wait() takes timeout value in jiffies, but DRM passes it in milliseconds. Signed-off-by: Dmitry Osipenko --- drivers/gpu/drm/tegra/drm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index bb98336fa8d7..57396388341b 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -629,7 +629,8 @@ static int tegra_syncpt_wait(struct drm_device *drm, void *data, if (!sp) return -EINVAL; - return host1x_syncpt_wait(sp, args->thresh, args->timeout, + return host1x_syncpt_wait(sp, args->thresh, + msecs_to_jiffies(args->timeout), &args->value); }