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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 81D72C433DF for ; Tue, 9 Jun 2020 00:31:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5D19D2078B for ; Tue, 9 Jun 2020 00:31:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591662706; bh=44g2p60ef6jX0NKp5biRUFqEU0/P6TtB7D5IGi8TaZw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=NDAgLx6A/13qKY9xJeQLZxHSqa7lqD5pupDysFTvkqrtYYrGwY55qVIq0DemxkYdt qEJRhnHCascW6qQV0C2T4Z/+qAZINXmBUpGNLLgczDGivU+Bx6zHZ7zreCIhdkaWCg K1ucty8EnHtOgsolKpjT4/QFzfkQ52K2RO0g3pMc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733105AbgFIAbp (ORCPT ); Mon, 8 Jun 2020 20:31:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:36402 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728917AbgFHXP2 (ORCPT ); Mon, 8 Jun 2020 19:15:28 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 248A620760; Mon, 8 Jun 2020 23:15:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591658128; bh=44g2p60ef6jX0NKp5biRUFqEU0/P6TtB7D5IGi8TaZw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KKQI4w4sAQr5p7P9i4PVhBeUJe07y0I6i9Mvtt8i3r1q8a3NNgQVvfJZizGRLo7oP ayhc7lKmR75CNEsra+zMKjWhB+g5FOZBdF54htF41sgzswcFgQrMF4uSzR9YoAZqtW PZlC7445OEnQLhlIF7HgNO8C3YJ7DvTnElhfSjIU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chris Wilson , Tvrtko Ursulin , Matthew Auld , Rodrigo Vivi , Greg Kroah-Hartman , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.6 163/606] drm/i915: Propagate error from completed fences Date: Mon, 8 Jun 2020 19:04:48 -0400 Message-Id: <20200608231211.3363633-163-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200608231211.3363633-1-sashal@kernel.org> References: <20200608231211.3363633-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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(-) diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c index 32ab154db788..1f50fc8bcebf 100644 --- 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_request *to, struct i915_request *from) 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, -- 2.25.1