From patchwork Sat Nov 21 00:24:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 7672821 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 446989F392 for ; Sat, 21 Nov 2015 00:24:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A84F120531 for ; Sat, 21 Nov 2015 00:24:26 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id CC5782052A for ; Sat, 21 Nov 2015 00:24:25 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8EAA26EB60; Fri, 20 Nov 2015 16:24:24 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yk0-f180.google.com (mail-yk0-f180.google.com [209.85.160.180]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7BF216EB60 for ; Fri, 20 Nov 2015 16:24:23 -0800 (PST) Received: by ykfs79 with SMTP id s79so185170430ykf.1 for ; Fri, 20 Nov 2015 16:24:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=OgkbDpgFuBaP/P3gyt5ZcwSRzHFnffveYi6uulYUKUA=; b=iP/8leGXQ4bIl4n36rCx9qhq0WRdoR0lHkA9gEIHjcrkogrGJ48pvolvxZTITUeaNX poDLAZ0sujvvxHszrdWcpXlS8xPV1hjVLYIJZ5kFS5BfnGzw7lVQZjlxDkGAKIi7Xzhy DqSGTXNSoBwT05bknR8lgd47X4UWW9a7elVbICJ3CJZL/wjlr0B7jYSQO4HsttU6E1U1 uWHIyprxACmsEyEo6QkRuVbiRxsH0bAHaVzJ0y3PWgKvcef87XG+kpkyInN3v+O7mMUj sp5TCqdBI8pXagxaJouusRtDDlLl9yM+yZjGkcbVSF0YPte3D0Sm+7ZHRgWuWsjdQBt4 zkbw== X-Received: by 10.129.40.210 with SMTP id o201mr15467199ywo.145.1448065462667; Fri, 20 Nov 2015 16:24:22 -0800 (PST) Received: from localhost.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by smtp.gmail.com with ESMTPSA id 4sm1839590ywb.26.2015.11.20.16.24.22 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 20 Nov 2015 16:24:22 -0800 (PST) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH 2/2] amdgpu: Make amdgpu_cs_calculate_timeout() return something sensible on error Date: Fri, 20 Nov 2015 19:24:14 -0500 Message-Id: <1448065454-6805-2-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1448065454-6805-1-git-send-email-alexander.deucher@amd.com> References: <1448065454-6805-1-git-send-email-alexander.deucher@amd.com> MIME-Version: 1.0 Cc: Tom St Denis 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tom St Denis Signed-off-by: Tom St Denis Reviewed-by: Christian König --- amdgpu/amdgpu_cs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/amdgpu/amdgpu_cs.c b/amdgpu/amdgpu_cs.c index aa594c4..6747158 100644 --- a/amdgpu/amdgpu_cs.c +++ b/amdgpu/amdgpu_cs.c @@ -291,8 +291,10 @@ drm_private uint64_t amdgpu_cs_calculate_timeout(uint64_t timeout) struct timespec current; uint64_t current_ns; r = clock_gettime(CLOCK_MONOTONIC, ¤t); - if (r) - return r; + if (r) { + fprintf(stderr, "clock_gettime() returned error (%d)!", errno); + return AMDGPU_TIMEOUT_INFINITE; + } current_ns = ((uint64_t)current.tv_sec) * 1000000000ull; current_ns += current.tv_nsec;