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 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 68C76C41513 for ; Mon, 10 Jun 2024 13:49:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 04D4810E483; Mon, 10 Jun 2024 13:49:54 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="AR9dg1ST"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) by gabe.freedesktop.org (Postfix) with ESMTPS id D1E4610E14C for ; Mon, 10 Jun 2024 13:49:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1718027384; x=1749563384; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=93JYQmWidhOqURHaWGP9qIgfYTQt2W3nl8OWtjyjqq8=; b=AR9dg1STBf+jps1Jr35+jZ/WzVoqF6iqGBe4mZGcK3aBfQUMj84SrmaK G2XO31t1/PfBBcgVUrwOMr7WzQVt2jI2GpsR10rqsTYqradLMuKNrSL7J umshP5Nf9hIdl/Gv4xrWfpprf9XCHxZ/XFrSw/4tkyriJGerHze/+FZF4 S9Kozd7VmSAJA56jeLptLmGWVZUrv2Be//+3Egz/RSGHX93oV8+UDOh4B JbQVM5v7sZ2ZwvD3bsYxJZ6g5/B/XFkWitQ0Y0huY8syJGAcvS2LfPgax MRmJVT3QR7JSH+eTcmi/H22SZa5VpBGfKcHqoetW2yB4TAIbutoPLyQ7v g==; X-CSE-ConnectionGUID: 3LfKZbvUTV6FYEhtvO4NPg== X-CSE-MsgGUID: 3YASjgQbT2abU2AIL2w5+A== X-IronPort-AV: E=McAfee;i="6600,9927,11099"; a="14419835" X-IronPort-AV: E=Sophos;i="6.08,227,1712646000"; d="scan'208";a="14419835" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jun 2024 06:49:42 -0700 X-CSE-ConnectionGUID: l9K15dJNSfGUvCimaBSx1A== X-CSE-MsgGUID: mdndwxXiRxKh8HUza8syrw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,227,1712646000"; d="scan'208";a="76523130" Received: from lstrano-desk.jf.intel.com ([10.54.39.91]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jun 2024 06:49:42 -0700 From: Matthew Brost To: intel-xe@lists.freedesktop.org Subject: [PATCH v4 6/7] drm/xe: Add killed, banned, or wedged as stick bit during GuC reset Date: Mon, 10 Jun 2024 06:50:10 -0700 Message-Id: <20240610135011.2605272-7-matthew.brost@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240610135011.2605272-1-matthew.brost@intel.com> References: <20240610135011.2605272-1-matthew.brost@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" These bits should be persistent across reset, treat them as such. Signed-off-by: Matthew Brost --- drivers/gpu/drm/xe/xe_guc_submit.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c index 9e1535c2d8f3..3db0aa40535d 100644 --- a/drivers/gpu/drm/xe/xe_guc_submit.c +++ b/drivers/gpu/drm/xe/xe_guc_submit.c @@ -1444,7 +1444,9 @@ static void guc_exec_queue_stop(struct xe_guc *guc, struct xe_exec_queue *q) set_exec_queue_suspended(q); suspend_fence_signal(q); } - atomic_and(EXEC_QUEUE_STATE_DESTROYED | EXEC_QUEUE_STATE_SUSPENDED, + atomic_and(EXEC_QUEUE_STATE_WEDGED | EXEC_QUEUE_STATE_BANNED | + EXEC_QUEUE_STATE_KILLED | EXEC_QUEUE_STATE_DESTROYED | + EXEC_QUEUE_STATE_SUSPENDED, &q->guc->state); q->guc->resume_time = 0; trace_xe_exec_queue_stop(q); -- 2.34.1