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 4EE00C982E3 for ; Sat, 19 Sep 2026 05:01:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6F96F10E65B; Sat, 19 Sep 2026 05:01:05 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="iC+hTsVP"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0DC6B10E642 for ; Sat, 19 Sep 2026 05:01:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1789794064; x=1821330064; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=5z4VYv6JC6kcr0rHZPC8y867mYHvVHYmoYFsAhFskTc=; b=iC+hTsVPJh1fJX/bGWzYtUy813yA7Q7do9TyNCTfpE34x58vP0jD1bc5 NEm49mrYyND1GCWEwz/TAxewF2onNk1d6G1gylAOCmFJWVb+Grou2knAO WAlZG6PZs06jzo9tPBe88d0kTarYL6ZMBsPaxeAQpfeAOoGq9mkM59Xen rHsRgRi95QM6g5dedKGTSFcm1oC7TDcp7wHvxhfv2yEPU87xg4EjHAIA/ JxwTzPM/fhqyVXr0H60jswxcdLqR+FbRiaBCYeBQzLflNuAN8VHMRl/7L H8Q1CH7d5J3gFVmWf4A6siNLw6UgopmXE3lB2bBqPCBglpNMNaQL7SeUD g==; X-CSE-ConnectionGUID: Tme4r9YsRuW5MwjTQfuaPQ== X-CSE-MsgGUID: 27H0ZXbkS4yo5PzUCrx8hg== X-IronPort-AV: E=McAfee;i="6800,10657,11909"; a="89463550" X-IronPort-AV: E=Sophos;i="6.27,109,1787036400"; d="scan'208";a="89463550" Received: from fmviesa011.fm.intel.com ([10.60.135.151]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Sep 2026 22:01:03 -0700 X-CSE-ConnectionGUID: aNAGetM8TgSbMG9D3tx+/w== X-CSE-MsgGUID: uT26FLj0RWeCH6NnVcVW9Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.27,109,1787036400"; d="scan'208";a="2926706" Received: from orsosgc001.jf.intel.com ([10.54.56.63]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Sep 2026 22:01:04 -0700 From: Umesh Nerlige Ramappa To: intel-xe@lists.freedesktop.org Cc: daniele.ceraolospurio@intel.com, michal.wajdeczko@intel.com, aravind.iddamsetty@intel.com, mallesh.koujalagi@intel.com, alan.previn.teres.alexis@intel.com, julia.filipchuk@intel.com Subject: [PATCH v5 3/7] drm/xe/guc: Make ct_dead_capture available on non-debug config Date: Fri, 18 Sep 2026 22:00:59 -0700 Message-ID: <20260919050055.2092579-12-umesh.nerlige.ramappa@intel.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260919050055.2092579-9-umesh.nerlige.ramappa@intel.com> References: <20260919050055.2092579-9-umesh.nerlige.ramappa@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" Define ct_dead_capture for non-debug as well to simplify future refactor. Signed-off-by: Umesh Nerlige Ramappa --- v2: Fix CI build failure --- drivers/gpu/drm/xe/xe_guc_ct.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_guc_ct.c b/drivers/gpu/drm/xe/xe_guc_ct.c index b3a6aa37808b..5dbda0fe20f3 100644 --- a/drivers/gpu/drm/xe/xe_guc_ct.c +++ b/drivers/gpu/drm/xe/xe_guc_ct.c @@ -59,7 +59,10 @@ static struct xe_device *ct_to_xe(struct xe_guc_ct *ct) return gt_to_xe(ct_to_gt(ct)); } -#if IS_ENABLED(CONFIG_DRM_XE_DEBUG) +#define ct_id(reason_code) CT_DEAD_##reason_code +#define CT_DEAD(ct, ctb, reason_code) ct_dead_capture((ct), (ctb), ct_id(reason_code)) +static void ct_dead_capture(struct xe_guc_ct *ct, struct guc_ctb *ctb, u32 reason_code); + enum { /* Internal states, not error conditions */ CT_DEAD_STATE_REARM, /* 0x0001 */ @@ -82,8 +85,8 @@ enum { CT_DEAD_CRASH, /* 0x8000 */ }; +#if IS_ENABLED(CONFIG_DRM_XE_DEBUG) static void ct_dead_worker_func(struct work_struct *w); -static void ct_dead_capture(struct xe_guc_ct *ct, struct guc_ctb *ctb, u32 reason_code); static void ct_dead_fini(struct xe_guc_ct *ct) { @@ -162,9 +165,6 @@ static void fast_req_track(struct xe_guc_ct *ct, u16 fence, u16 action) ct->fast_req[slot].fence = fence; ct->fast_req[slot].action = action; } - -#define CT_DEAD(ct, ctb, reason_code) ct_dead_capture((ct), (ctb), CT_DEAD_##reason_code) - #else static void ct_dead_fini(struct xe_guc_ct *ct) { } @@ -173,13 +173,6 @@ static void ct_dead_init(struct xe_guc_ct *ct) { } static void fast_req_report(struct xe_guc_ct *ct, u16 fence) { } static void fast_req_track(struct xe_guc_ct *ct, u16 fence, u16 action) { } -#define CT_DEAD(ct, ctb, reason) \ - do { \ - struct guc_ctb *_ctb = (ctb); \ - if (_ctb) \ - _ctb->info.broken = true; \ - } while (0) - #endif /* Used when a CT send wants to block and / or receive data */ @@ -2376,4 +2369,10 @@ static void ct_dead_worker_func(struct work_struct *w) spin_unlock_irq(&ct->dead.lock); } +#else +static void ct_dead_capture(struct xe_guc_ct *ct, struct guc_ctb *ctb, u32 reason_code) +{ + if (ctb) + ctb->info.broken = true; +} #endif -- 2.55.0