From patchwork Wed Dec 20 15:46:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 10127159 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 2A53D603B5 for ; Thu, 21 Dec 2017 09:01:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1DDB4298EB for ; Thu, 21 Dec 2017 09:01:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 12FC229B3F; Thu, 21 Dec 2017 09:01:43 +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 CA8C4298EB for ; Thu, 21 Dec 2017 09:01:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DC2AF6E5DE; Thu, 21 Dec 2017 09:00:13 +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 827F16E42D for ; Wed, 20 Dec 2017 15:50:16 +0000 (UTC) Received: by mail-lf0-x244.google.com with SMTP id f13so24551767lff.12 for ; Wed, 20 Dec 2017 07:50:16 -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=KamgjWNHgBWMuUYtRXONwL4Ae4Ew6MbWdYnvC1I/MBo=; b=Ey3lz4X9VUF4eAzwX0VEFU+x2Sm+WQORNMlCNtCGqOPGKI7ycB2cKh4CuBbh7w+dOs jeGjICst75DhORmOBGTF44NK5vdQ3QcDZ8Aq/NM8FO8PpWQktAYrmio5NwnDV2hzb+/W aF4Hw3aR4VFBBldBAC3VtBSnYuBUZ1CZZrnzjFbc9ozmBD2H3bvVdFyt1gCnHuJ8kTBv Tl2HG5Ou645OjDK9SQjWJExfKIuqOxzbUJMHYg6IyTwjB+MopVWDSvdb4lNazhyd0AEQ Y90Ri5vN9FKgpxaSgrN1MEfmBEUDloPpeqkTmgqdPGN2ZLvv4+GDRSl2BSljq0aS7Jv3 ToCg== 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=KamgjWNHgBWMuUYtRXONwL4Ae4Ew6MbWdYnvC1I/MBo=; b=KLP7/npDvFesXcmRKvNiofGhNfmYvqaFH/hfd/p/U0si2lO5mlR3ozAGarYrCseZcn 5t5d3ZjEQZQ1xCKzhzRpCIzbPIR3gS5/KvMu2wjnUirV4RbrDb3XJsmdptUypUxGXV3s qWWjpyiKteKS2+aHE4GylksJOEFx75fVY3x6dji88WZgrY0MKm/Ur1pn0d4AWiSURs2y +KlnrY4i3he1MYWzc0kCf8AO3sD4zCVeTCwF6Z1SAMh1O9zd9m6Qc0ekpoY5vC9EoQTB ajJyOcppyp6UnP3KayDaww5FMX38eU9+aFju+BN9ML8HZDJpZomkCNbxx25DWtfEvaXi MOBQ== X-Gm-Message-State: AKGB3mJk7mTX8uXUehg6e59xYRrRYzUw3OXVuzWt5yrMercfjHMxDgu9 mGBUPMbdgzxX8YbjXAoFhr0= X-Google-Smtp-Source: ACJfBov+X4SKPB+wUTydK01R9k9d9HAZf5uXH814SwIGBNXmyb0kFG0j9oUOZEf1syJ4HB0B+rk2Bw== X-Received: by 10.46.23.20 with SMTP id l20mr5401137lje.25.1513785015003; Wed, 20 Dec 2017 07:50:15 -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.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Dec 2017 07:50:14 -0800 (PST) From: Dmitry Osipenko To: Thierry Reding Subject: [PATCH v3 4/5] drm/tegra: gem: Correct iommu_map_sg() error checking Date: Wed, 20 Dec 2017 18:46:13 +0300 Message-Id: <1daf8bfe7c4ef37a4d5d6d5f87eae36425a3df14.1513783739.git.digetx@gmail.com> 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 iommu_map_sg() doesn't return a error value, but a size of the requested IOMMU mapping or zero in case of error. Signed-off-by: Dmitry Osipenko --- drivers/gpu/drm/tegra/gem.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c index ab1e53d434e8..49b9bf28f872 100644 --- a/drivers/gpu/drm/tegra/gem.c +++ b/drivers/gpu/drm/tegra/gem.c @@ -114,7 +114,7 @@ static const struct host1x_bo_ops tegra_bo_ops = { static int tegra_bo_iommu_map(struct tegra_drm *tegra, struct tegra_bo *bo) { int prot = IOMMU_READ | IOMMU_WRITE; - ssize_t err; + int err; if (bo->mm) return -EBUSY; @@ -128,22 +128,21 @@ static int tegra_bo_iommu_map(struct tegra_drm *tegra, struct tegra_bo *bo) err = drm_mm_insert_node_generic(&tegra->mm, bo->mm, bo->gem.size, PAGE_SIZE, 0, 0); if (err < 0) { - dev_err(tegra->drm->dev, "out of I/O virtual memory: %zd\n", + dev_err(tegra->drm->dev, "out of I/O virtual memory: %d\n", err); goto unlock; } bo->paddr = bo->mm->start; - err = iommu_map_sg(tegra->domain, bo->paddr, bo->sgt->sgl, - bo->sgt->nents, prot); - if (err < 0) { - dev_err(tegra->drm->dev, "failed to map buffer: %zd\n", err); + bo->size = iommu_map_sg(tegra->domain, bo->paddr, bo->sgt->sgl, + bo->sgt->nents, prot); + if (!bo->size) { + dev_err(tegra->drm->dev, "failed to map buffer\n"); + err = -ENOMEM; goto remove; } - bo->size = err; - mutex_unlock(&tegra->mm_lock); return 0;