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 F209CC67861 for ; Fri, 5 Apr 2024 14:06:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 92E5610EC32; Fri, 5 Apr 2024 14:06:22 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="aZ/c3N1q"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16]) by gabe.freedesktop.org (Postfix) with ESMTPS id E572E10EC32 for ; Fri, 5 Apr 2024 14:06:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1712325981; x=1743861981; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=SrAPxF0xyxsgi3G6fGNBNf/YT4V+frKOXVOe3qTZmQA=; b=aZ/c3N1q9jmapCK2angVPnt7Z6ruBcoWHX5AG0Hj0BbQR8FoVRp1oO8F mo2/BAavQzWCq0PmxJSRf6VKC+T0Dx+3QYwmo0rCzY6+4KHphNRse2PRJ QQmK6dtZdvrH716Gc1gEI4hqaJmO3uZWPNnKET0mhd7rd5lm44tITfA8I UVZTD2z9z+JNYnZSkEw31AYS0yUBOFyKtVWJV41AOZcrcq6L7lZ1RqyPE UdhX/4dbRjcNC4d0NxRPxBp9urkx3yjVMVGzYbvwqF1DLXm8TOYFlOFIe vUsF79urNcCaDVUazoE0lkq4SlsPHotp/FY6KK2+brytD28QUtDEg8Oad g==; X-CSE-ConnectionGUID: lY7fhKNNRpCY0aVU/+VVQg== X-CSE-MsgGUID: ADHR+Xf8SDSJlUPWYorz8A== X-IronPort-AV: E=McAfee;i="6600,9927,11035"; a="7782429" X-IronPort-AV: E=Sophos;i="6.07,181,1708416000"; d="scan'208";a="7782429" Received: from fmviesa006.fm.intel.com ([10.60.135.146]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Apr 2024 07:06:19 -0700 X-CSE-ConnectionGUID: UkBcW55oS/GHM14+ULnmkQ== X-CSE-MsgGUID: WW4whrfvTMmEhE+Lpsvs4Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,181,1708416000"; d="scan'208";a="19197796" Received: from dut-internal-9dd7.jf.intel.com ([10.165.21.194]) by fmviesa006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Apr 2024 07:06:19 -0700 From: Jonathan Cavitt To: intel-xe@lists.freedesktop.org Cc: saurabhg.gupta@intel.com, jonathan.cavitt@intel.com, matthew.brost@intel.com, lucas.demarchi@intel.com, john.c.harrison@intel.com Subject: [PATCH v3 3/3] drm/xe/xe_guc_submit: Declare reset if banned or killed Date: Fri, 5 Apr 2024 06:51:00 -0700 Message-Id: <20240405135100.967990-3-jonathan.cavitt@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240405135100.967990-1-jonathan.cavitt@intel.com> References: <20240405135100.967990-1-jonathan.cavitt@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" Add an additional condition to the reset_status guc_exec_queue_op that returns true if the exec queue has been banned or killed. The reset_status op is only used for exiting any xe_wait_user_fence_ioctl that waits on an exec queue without timing out, so doing this will exit the ioctl early in cases where the exec queue can no longer function, such as after a GuC stop during a reset. Suggested-by: Matthew Brost Signed-off-by: Jonathan Cavitt --- drivers/gpu/drm/xe/xe_guc_submit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c index 7e851cd486c92..03060b23d0f55 100644 --- a/drivers/gpu/drm/xe/xe_guc_submit.c +++ b/drivers/gpu/drm/xe/xe_guc_submit.c @@ -1371,7 +1371,7 @@ static void guc_exec_queue_resume(struct xe_exec_queue *q) static bool guc_exec_queue_reset_status(struct xe_exec_queue *q) { - return exec_queue_reset(q); + return exec_queue_reset(q) || exec_queue_killed_or_banned(q); } /* -- 2.25.1