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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 CBF77C433DF for ; Tue, 26 May 2020 19:17:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9D03920888 for ; Tue, 26 May 2020 19:17:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590520676; bh=UB225bkBOAb7NVsN5iNweXrXSv5RIdCjD+JX39Q3gRE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dXbUXWT9BXgfpS73MoCOX3OI1UfWHkxlL7EFJt+BmnC5txBq8TMh1GWlEtiVXcWRU LsfLnY/UR2zf3kn6DIZxtiDD815opx+Evksx/8jlJuaIMV49RTY8AL/cL1uUtscjbp +jtBio2V7mB6dOWisLy7Ca2MWcshOX2R1rOSUIcw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392350AbgEZTR4 (ORCPT ); Tue, 26 May 2020 15:17:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:44774 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392141AbgEZTOH (ORCPT ); Tue, 26 May 2020 15:14:07 -0400 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 D7D83208B6; Tue, 26 May 2020 19:14:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590520447; bh=UB225bkBOAb7NVsN5iNweXrXSv5RIdCjD+JX39Q3gRE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tJ3tFuJYBoHexEuYnmkMtbQe4yu6FobuERHmrqYJYlsS77VX1swtCmVbqIa/Btj70 Lyy+SyqFwbSYMTAPa4b7nOv8DMprSDzSeyoZorPCXnzSnMk67EjxNLyfMKirZwRgCl HekKb2b8AbRCKa9hez1kCZJ/sBrIza6F4P/nFYbg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chris Wilson , Tvrtko Ursulin , Matthew Auld , Rodrigo Vivi Subject: [PATCH 5.6 084/126] drm/i915: Propagate error from completed fences Date: Tue, 26 May 2020 20:53:41 +0200 Message-Id: <20200526183945.105425987@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200526183937.471379031@linuxfoundation.org> References: <20200526183937.471379031@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chris Wilson commit bc850943486887e3859597a266767f95db90aa72 upstream. We need to preserve fatal errors from fences that are being terminated as we hook them up. Fixes: ef4688497512 ("drm/i915: Propagate fence errors") Signed-off-by: Chris Wilson Cc: Tvrtko Ursulin Cc: Matthew Auld Reviewed-by: Matthew Auld Link: https://patchwork.freedesktop.org/patch/msgid/20200506162136.3325-1-chris@chris-wilson.co.uk (cherry picked from commit 24fe5f2ab2478053d50a3bc629ada895903a5cbc) Signed-off-by: Rodrigo Vivi Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/i915/i915_request.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/i915/i915_request.c +++ b/drivers/gpu/drm/i915/i915_request.c @@ -947,8 +947,10 @@ i915_request_await_request(struct i915_r GEM_BUG_ON(to == from); GEM_BUG_ON(to->timeline == from->timeline); - if (i915_request_completed(from)) + if (i915_request_completed(from)) { + i915_sw_fence_set_error_once(&to->submit, from->fence.error); return 0; + } if (to->engine->schedule) { ret = i915_sched_node_add_dependency(&to->sched,