From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F9E6C43331 for ; Mon, 11 Nov 2019 18:59:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 754B620659 for ; Mon, 11 Nov 2019 18:59:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573498771; bh=P0xW9POmQTznkNapmDxgM+/xOySToWOv2Nm0fg7d5sw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=EJPUtwWfGoSiHCRiELVKxnGfsSTPJpG1tQMTV8gX6XmgPQiCAnGEkgcVhFO7ubzly 1YNmJiVeQgWB7/SPhjhN7yZx0LmZDmI7iU3twiyZq1xFMg3q5oxCmAWRmvXTITFHUU ++ZSCyN+ZgnEwugI4e5Lyzi0iuXri4O+WIh2ELDE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730709AbfKKS4h (ORCPT ); Mon, 11 Nov 2019 13:56:37 -0500 Received: from mail.kernel.org ([198.145.29.99]:55076 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729809AbfKKS4g (ORCPT ); Mon, 11 Nov 2019 13:56:36 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0631E20818; Mon, 11 Nov 2019 18:56:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573498595; bh=P0xW9POmQTznkNapmDxgM+/xOySToWOv2Nm0fg7d5sw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ky32dlcD+PJXxtygRHqz9GVq83MXsmGS+1bw6ZTvXJ9a8KoenidIxPKCCVE03S97W tchvyMNFUgp5UsS7K7fPgrKQ8VLNl+ivpUtFxvx2OZ1Yf/3FSmiirFcfWhKO+m6Jxx fyjpe1PXrjvKS0/5M4XexXI6XzesdtSyVwZOY+sY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andrey Grodzovsky , =?UTF-8?q?Christian=20K=C3=B6nig?= , Alex Deucher , Sasha Levin Subject: [PATCH 5.3 166/193] drm/amdgpu: If amdgpu_ib_schedule fails return back the error. Date: Mon, 11 Nov 2019 19:29:08 +0100 Message-Id: <20191111181513.370232254@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191111181459.850623879@linuxfoundation.org> References: <20191111181459.850623879@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Andrey Grodzovsky [ Upstream commit 57c0f58e9f562089de5f0b60da103677d232374c ] Use ERR_PTR to return back the error happened during amdgpu_ib_schedule. Signed-off-by: Andrey Grodzovsky Reviewed-by: Christian König Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c index 9d76e0923a5a3..96b2a31ccfed3 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c @@ -218,7 +218,7 @@ static struct dma_fence *amdgpu_job_run(struct drm_sched_job *sched_job) struct amdgpu_ring *ring = to_amdgpu_ring(sched_job->sched); struct dma_fence *fence = NULL, *finished; struct amdgpu_job *job; - int r; + int r = 0; job = to_amdgpu_job(sched_job); finished = &job->base.s_fence->finished; @@ -243,6 +243,8 @@ static struct dma_fence *amdgpu_job_run(struct drm_sched_job *sched_job) job->fence = dma_fence_get(fence); amdgpu_job_free_resources(job); + + fence = r ? ERR_PTR(r) : fence; return fence; } -- 2.20.1