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 0F3D6C27C65 for ; Mon, 10 Jun 2024 13:49:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 94EE810E14C; Mon, 10 Jun 2024 13:49:44 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="K2gtK210"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) by gabe.freedesktop.org (Postfix) with ESMTPS id 637F510E14C 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=1718027383; x=1749563383; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=O3keWOTlKlaVGB4aQSeuoKVgZKx0oQO2l6lbsRg9WYg=; b=K2gtK210hWHrJXgraJjjzrUdfYEKpFyRT4vqEn8EFL2IB4HIpBACZjeE 9tEE4+OetDPix2ZJIpDPxpTjPnQVs/witv6jpEpJE+VyBrOIGyT6wnaAl QhiGIb5/P635z/P0fPWB3HYJjzPa8k1at4ZJSrJMQ+ve1NJM+iT6dBRmv 1RR+Fd26s6k09Zc+uWX+mdI5EvctwoIjOQYXL2OFiuX+hQ4Mk02VTwhKB fdMb8v0Apw71A4kUi47h7xL4gAt70Ou/Kpv467eHTSMLE3zBnExhvjMF1 ta5/oicGQ1G6JmJR23CgXhXjIPi+UsmyM7gWP9s/rNRTb1eOjVLw1pEYH Q==; X-CSE-ConnectionGUID: DPld28gDSQWniBGttaOdew== X-CSE-MsgGUID: /gMJCA0xReWpFD9F20r8FA== X-IronPort-AV: E=McAfee;i="6600,9927,11099"; a="14419832" X-IronPort-AV: E=Sophos;i="6.08,227,1712646000"; d="scan'208";a="14419832" 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: Elc5p9tWRoeRY4SB6n1wxA== X-CSE-MsgGUID: ozYv2NrIQCCOPNSyxjRxvA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,227,1712646000"; d="scan'208";a="76523126" 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 3/7] drm/xe: Improve unexpected state error messages Date: Mon, 10 Jun 2024 06:50:07 -0700 Message-Id: <20240610135011.2605272-4-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" Include G2H handler name when an unexpected error state messages. Signed-off-by: Matthew Brost --- drivers/gpu/drm/xe/xe_guc_submit.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c index 4464ba337d12..766ff8e48dde 100644 --- a/drivers/gpu/drm/xe/xe_guc_submit.c +++ b/drivers/gpu/drm/xe/xe_guc_submit.c @@ -1632,8 +1632,8 @@ int xe_guc_sched_done_handler(struct xe_guc *guc, u32 *msg, u32 len) if (unlikely(!exec_queue_pending_enable(q) && !exec_queue_pending_disable(q))) { - drm_err(&xe->drm, "Unexpected engine state 0x%04x", - atomic_read(&q->guc->state)); + drm_err(&xe->drm, "SCHED_DONE: Unexpected engine state 0x%04x, guc_id=%d", + atomic_read(&q->guc->state), q->guc->id); return -EPROTO; } @@ -1671,8 +1671,8 @@ int xe_guc_deregister_done_handler(struct xe_guc *guc, u32 *msg, u32 len) if (!exec_queue_destroyed(q) || exec_queue_pending_disable(q) || exec_queue_pending_enable(q) || exec_queue_enabled(q)) { - drm_err(&xe->drm, "Unexpected engine state 0x%04x", - atomic_read(&q->guc->state)); + drm_err(&xe->drm, "DEREGISTER_DONE: Unexpected engine state 0x%04x, guc_id=%d", + atomic_read(&q->guc->state), q->guc->id); return -EPROTO; } -- 2.34.1