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 36FE8D59F53 for ; Fri, 12 Dec 2025 23:34:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EA9D510E986; Fri, 12 Dec 2025 23:34:56 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="RIExnJBV"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 129A810E979 for ; Fri, 12 Dec 2025 23:34:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1765582490; x=1797118490; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=TryNx0SqfekLOphEH1xGPiBqDAE3XwhFEqHghb1HkmQ=; b=RIExnJBVX58rf9YxWAE0tjcAtJ4X2+fZZ6n1YNMPFadMUigC2byGlV3x voB9NCn6oITlLoE3umITlLT+Za7OB8hsDaOo7mEBLdQ2ePAHhvyIsnM0N uInc1KaK/Skwy1xAXMAqZff0AiypH6wecDUHV0Xk/yEw+KhaVzBoOIsVF PeCW6gNC6GqaACEJgoVcKVew7/lzjN4rZH/3NOy04blFodonvYqfU8QXq APiUddSjGww9GMGpjhXJDlnPgiRSqh+4QZHvUytBzqk7C8JINDsQbY7IG BR6Vwk8+8D3Qf80css8i0DoMCk8nti0OS5NmEkwCY3ODd4LYLWQxwTnOo g==; X-CSE-ConnectionGUID: GUCHwEGCQfaVIEru5qmcrA== X-CSE-MsgGUID: QMEx3kFjQ7SXYBlp5hsHnw== X-IronPort-AV: E=McAfee;i="6800,10657,11640"; a="71216671" X-IronPort-AV: E=Sophos;i="6.21,144,1763452800"; d="scan'208";a="71216671" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2025 15:34:49 -0800 X-CSE-ConnectionGUID: Mi72ji+jTtebp9I6fDl5Ig== X-CSE-MsgGUID: dHEoDgQQRO+gK1gs8zEh2w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,144,1763452800"; d="scan'208";a="201696880" Received: from lstrano-desk.jf.intel.com ([10.54.39.91]) by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2025 15:34:49 -0800 From: Matthew Brost To: intel-xe@lists.freedesktop.org Subject: [RFC PATCH 3/3] drm/xe: Trigger queue cleanup if not in wedged mode 2 Date: Fri, 12 Dec 2025 15:34:44 -0800 Message-Id: <20251212233444.1717326-4-matthew.brost@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251212233444.1717326-1-matthew.brost@intel.com> References: <20251212233444.1717326-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" The intent of wedging a device is to allow queues to continue running only in wedged mode 2. In other modes, queues should initiate cleanup and signal all remaining fences. Fix xe_guc_submit_wedge to correctly clean up queues when wedge mode != 2. Fixes: 7dbe8af13c18 ("drm/xe: Wedge the entire device") Cc: stable@vger.kernel.org Signed-off-by: Matthew Brost --- drivers/gpu/drm/xe/xe_guc_submit.c | 31 ++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c index 857375be9a84..1eef93d474f0 100644 --- a/drivers/gpu/drm/xe/xe_guc_submit.c +++ b/drivers/gpu/drm/xe/xe_guc_submit.c @@ -1277,6 +1277,7 @@ static void disable_scheduling_deregister(struct xe_guc *guc, */ void xe_guc_submit_wedge(struct xe_guc *guc) { + struct xe_device *xe = guc_to_xe(guc); struct xe_gt *gt = guc_to_gt(guc); struct xe_exec_queue *q; unsigned long index; @@ -1291,19 +1292,25 @@ void xe_guc_submit_wedge(struct xe_guc *guc) if (!guc->submission_state.initialized) return; - err = devm_add_action_or_reset(guc_to_xe(guc)->drm.dev, - guc_submit_wedged_fini, guc); - if (err) { - xe_gt_err(gt, "Failed to register clean-up on wedged.mode=2; " - "Although device is wedged.\n"); - return; - } + if (xe->wedged.mode == 2) { + err = devm_add_action_or_reset(guc_to_xe(guc)->drm.dev, + guc_submit_wedged_fini, guc); + if (err) { + xe_gt_err(gt, "Failed to register clean-up on wedged.mode=2; " + "Although device is wedged.\n"); + return; + } - mutex_lock(&guc->submission_state.lock); - xa_for_each(&guc->submission_state.exec_queue_lookup, index, q) - if (xe_exec_queue_get_unless_zero(q)) - set_exec_queue_wedged(q); - mutex_unlock(&guc->submission_state.lock); + mutex_lock(&guc->submission_state.lock); + xa_for_each(&guc->submission_state.exec_queue_lookup, index, q) + if (xe_exec_queue_get_unless_zero(q)) + set_exec_queue_wedged(q); + mutex_unlock(&guc->submission_state.lock); + } else { + /* Forcefully kill any remaining exec queues, signal fences */ + xe_guc_submit_stop(guc); + xe_guc_submit_pause_abort(guc); + } } static bool guc_submit_hint_wedged(struct xe_guc *guc) -- 2.34.1