From patchwork Wed Dec 20 15:46:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 10127181 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 A60DA603B5 for ; Thu, 21 Dec 2017 09:02:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9A19F29B3E for ; Thu, 21 Dec 2017 09:02:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8F08229B41; Thu, 21 Dec 2017 09:02:10 +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 376B229B3E for ; Thu, 21 Dec 2017 09:02:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 485836E5C5; Thu, 21 Dec 2017 09:00:28 +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 94D7C6E42D for ; Wed, 20 Dec 2017 15:50:17 +0000 (UTC) Received: by mail-lf0-x244.google.com with SMTP id u84so4613268lff.7 for ; Wed, 20 Dec 2017 07:50:17 -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:in-reply-to:references :in-reply-to:references; bh=3X0W/hDuHmvc/sblMEOxQJ1SpVPEzL7Izcy3ULLQt4Q=; b=MleUSLlFsCt+OKfWOpWJwJUQzaLB1APO8bM53orucBvX+46uma5nSLasr46KagzkFT mBcvcmloOaZuy2+6lLOZJAj/OBFY00kV368IUQ284jtYLGO5bM1KmeGfpZGaMdXoYLlT HHbQLFRCkZr6yQqoRFFhYBJW6QlzEufpGM6efY/cZAuuOJCe03IPGNlYLBROcTAMk+C8 83F1v5Ml3/SoRAPKGMhcrweLeb8DAY/nR0iyymg1yIIhsg2zni049FN7uzU7TC5rA3oe gFZBUO7Cbm1Na15KX+RuZ7Yco4PEMKtAFhZXw5Kv8bWLm1PptFVcNBDMJNGh5gp3RNMf 9FMQ== 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:in-reply-to :references:in-reply-to:references; bh=3X0W/hDuHmvc/sblMEOxQJ1SpVPEzL7Izcy3ULLQt4Q=; b=Z98lghAYZ5n9pL+78H0RsmvSH27/5JXtKjxljE7HhyTKJrqedTbmMI7TeXtqvja47D nkumDrvKp8lUFmFL+dN3xyZ6i5M8Gy0gaLNKQvbHxUSD/kjVE5vBUAq/BEQAdBHLfb19 ZxAua1QOMnaEcjyLGSlgs4p49VuB4JU1QxqltRF7r9ws90Pak6muEkvVd8a4RECamyY4 YPXfXpRF12/Klt7paatfsLuUoPNd+qcmUu9g9qNaHEXOoCIipiryxXajxSnsH6gHgOm+ x2148D4DEL2ozQ7PyWNG7LcfCRVDGdN8BaTEd1WlJ5P0g0O+64BsKCsl+a0V9u8533MO EP4A== X-Gm-Message-State: AKGB3mJQxYaDQeYwRzVjwHwxvOMJNf9yuyCHID62rA79eYcN0VGsjGU5 PVoA3ATwRzhIHHKPi/7blKMuq7PY X-Google-Smtp-Source: ACJfBoummvB3laKUP2DRK47R2JEm6uPf9kdlaK+0dHzAn2krxpWRP1CBPjZfJ4rRUugUCgPg+wAohA== X-Received: by 10.46.76.26 with SMTP id z26mr4653158lja.19.1513785016084; Wed, 20 Dec 2017 07:50:16 -0800 (PST) Received: from localhost.localdomain (ppp109-252-55-194.pppoe.spdop.ru. [109.252.55.194]) by smtp.gmail.com with ESMTPSA id m18sm3685762lje.21.2017.12.20.07.50.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Dec 2017 07:50:15 -0800 (PST) From: Dmitry Osipenko To: Thierry Reding Subject: [PATCH v3 5/5] drm/tegra: Correct timeout in tegra_syncpt_wait Date: Wed, 20 Dec 2017 18:46:14 +0300 Message-Id: X-Mailer: git-send-email 2.15.1 In-Reply-To: References: In-Reply-To: References: X-Mailman-Approved-At: Thu, 21 Dec 2017 08:59:57 +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); }