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 CB925C44524 for ; Thu, 23 Jul 2026 08:25:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 84D7610F017; Thu, 23 Jul 2026 08:25:42 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="BSmDeOY/"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9A9A210E2FD for ; Thu, 23 Jul 2026 08:25:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1784795139; x=1816331139; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qGvG8qpc+9X8ubg98CK71+TYgv2CjC5wQeBnFJW9vLc=; b=BSmDeOY/xy76zVOTLtGaCERJe95pxzLKIHYnfr3X/62gfA6RYQtDX3WT 9Mb0120OSs/a7knWYHBgQbHDnM9GIUJEdn8aAxmTE+ftZyGd/3WlbwGI3 MzQlUQHpQzUkZiSBA213ex+Z2WZNGYA2ed75O4S1V1VeOTJJu0wApZhcg O8x08GlrlaOOSAJEJxZFY72XFeb16Vsez0EZ/cePA5uYrt2JchDJqmrsp ypvidRcg19a8WLflGEmXJ5LysQocy9UgLS+mrb1iGsjxjHw82G+tOnWlT 0nBEuZH/sOfB/RgJ5lYJhH/BNo9gWMDYs1akLSaNaXFF2Fav5GXxT80+O w==; X-CSE-ConnectionGUID: yrkVL9FlR06jK0z4pSeySg== X-CSE-MsgGUID: v9mO0+4HQkCpaegdSz6Y3Q== X-IronPort-AV: E=McAfee;i="6800,10657,11854"; a="85389085" X-IronPort-AV: E=Sophos;i="6.25,180,1779174000"; d="scan'208";a="85389085" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jul 2026 01:25:39 -0700 X-CSE-ConnectionGUID: qFF9u0jiRKi5O4hXTpiYeg== X-CSE-MsgGUID: LE4Dgxb6S8WXGqsNWip7Pg== X-ExtLoop1: 1 Received: from bnilawar-desk2.iind.intel.com ([10.190.239.41]) by fmviesa003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jul 2026 01:25:37 -0700 From: Badal Nilawar To: intel-xe@lists.freedesktop.org Cc: anshuman.gupta@intel.com, rodrigo.vivi@intel.com, alexander.usyskin@intel.com, michael.j.ruhl@intel.com, daniele.ceraolospurio@intel.com, anoop.c.vijay@intel.com, shamim.begum@intel.com, anthony.giardina@intel.com Subject: [PATCH v4 2/5] drm/xe/xe_late_bind_fw: Convert late bind flag to mask Date: Thu, 23 Jul 2026 14:07:02 +0530 Message-ID: <20260723083659.716683-9-badal.nilawar@intel.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260723083659.716683-7-badal.nilawar@intel.com> References: <20260723083659.716683-7-badal.nilawar@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" Replace the has_late_bind flag with a late_bind_mask to support multiple late bind firmware types. No functional change intended. Signed-off-by: Badal Nilawar --- drivers/gpu/drm/xe/xe_device.c | 2 +- drivers/gpu/drm/xe/xe_device_types.h | 4 ++-- drivers/gpu/drm/xe/xe_late_bind_fw.c | 5 ++++- drivers/gpu/drm/xe/xe_pci.c | 4 ++-- drivers/gpu/drm/xe/xe_pci_types.h | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c index 4eed9a251e65..1849e1f072b4 100644 --- a/drivers/gpu/drm/xe/xe_device.c +++ b/drivers/gpu/drm/xe/xe_device.c @@ -738,7 +738,7 @@ static void vf_update_device_info(struct xe_device *xe) xe->info.has_heci_cscfi = 0; xe->info.has_heci_gscfi = 0; xe->info.has_i2c = 0; - xe->info.has_late_bind = 0; + xe->info.late_bind_mask = 0; xe->info.skip_guc_pc = 1; xe->info.skip_pcode = 1; xe->info.has_drm_ras = false; diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h index 860ad322237f..db56d35f453d 100644 --- a/drivers/gpu/drm/xe/xe_device_types.h +++ b/drivers/gpu/drm/xe/xe_device_types.h @@ -139,6 +139,8 @@ struct xe_device { u8 vm_max_level; /** @info.va_bits: Maximum bits of a virtual address */ u8 va_bits; + /** @info.late_bind_mask: Indicates supported late binding firmwares */ + u8 late_bind_mask; /* * Keep all flags below alphabetically sorted @@ -168,8 +170,6 @@ struct xe_device { u8 has_heci_gscfi:1; /** @info.has_i2c: Device has I2C controller */ u8 has_i2c:1; - /** @info.has_late_bind: Device has firmware late binding support */ - u8 has_late_bind:1; /** @info.has_llc: Device has a shared CPU+GPU last level cache */ u8 has_llc:1; /** @info.has_mbx_power_limits: Device has support to manage power limits using diff --git a/drivers/gpu/drm/xe/xe_late_bind_fw.c b/drivers/gpu/drm/xe/xe_late_bind_fw.c index 1529a1de4051..8f3be55060f1 100644 --- a/drivers/gpu/drm/xe/xe_late_bind_fw.c +++ b/drivers/gpu/drm/xe/xe_late_bind_fw.c @@ -366,6 +366,7 @@ static int __xe_late_bind_fw_init(struct xe_late_bind *late_bind, u32 fw_id) static int xe_late_bind_fw_init(struct xe_late_bind *late_bind) { + struct xe_device *xe = late_bind_to_xe(late_bind); int ret; int fw_id; @@ -374,6 +375,8 @@ static int xe_late_bind_fw_init(struct xe_late_bind *late_bind) return -ENOMEM; for (fw_id = 0; fw_id < XE_LB_FW_MAX_ID; fw_id++) { + if (!(xe->info.late_bind_mask & BIT(fw_id))) + continue; ret = __xe_late_bind_fw_init(late_bind, fw_id); if (ret) return ret; @@ -437,7 +440,7 @@ int xe_late_bind_init(struct xe_late_bind *late_bind) struct xe_device *xe = late_bind_to_xe(late_bind); int err; - if (!xe->info.has_late_bind) + if (!xe->info.late_bind_mask) return 0; if (!IS_ENABLED(CONFIG_INTEL_MEI_LB) || !IS_ENABLED(CONFIG_INTEL_MEI_GSC)) { diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c index 36d62927b969..283919fbbc04 100644 --- a/drivers/gpu/drm/xe/xe_pci.c +++ b/drivers/gpu/drm/xe/xe_pci.c @@ -421,10 +421,10 @@ static const struct xe_device_desc bmg_desc = { .has_gsc_nvm = 1, .has_heci_cscfi = 1, .has_i2c = true, - .has_late_bind = true, .has_pre_prod_wa = 1, .has_soc_remapper_telem = true, .has_sriov = true, + .late_bind_mask = BIT(XE_LB_FW_FAN_CONTROL), .max_gt_per_tile = 2, MULTI_LRC_MASK, .needs_scratch = true, @@ -802,7 +802,6 @@ static int xe_info_init_early(struct xe_device *xe, xe->info.has_heci_gscfi = desc->has_heci_gscfi; xe->info.has_heci_cscfi = desc->has_heci_cscfi; xe->info.has_i2c = desc->has_i2c; - xe->info.has_late_bind = desc->has_late_bind; xe->info.has_llc = desc->has_llc; xe->info.has_mert = desc->has_mert; xe->info.has_page_reclaim_hw_assist = desc->has_page_reclaim_hw_assist; @@ -818,6 +817,7 @@ static int xe_info_init_early(struct xe_device *xe, xe->info.needs_scratch = desc->needs_scratch; xe->info.needs_shared_vf_gt_wq = desc->needs_shared_vf_gt_wq; xe->info.multi_lrc_mask = desc->multi_lrc_mask; + xe->info.late_bind_mask = desc->late_bind_mask; xe->info.probe_display = IS_ENABLED(CONFIG_DRM_XE_DISPLAY) && xe_modparam.probe_display && diff --git a/drivers/gpu/drm/xe/xe_pci_types.h b/drivers/gpu/drm/xe/xe_pci_types.h index fed509ff601e..d1d41c65133f 100644 --- a/drivers/gpu/drm/xe/xe_pci_types.h +++ b/drivers/gpu/drm/xe/xe_pci_types.h @@ -28,6 +28,7 @@ struct xe_device_desc { enum xe_platform platform; u8 dma_mask_size; + u8 late_bind_mask; u8 max_remote_tiles:2; u8 max_gt_per_tile:2; u8 multi_lrc_mask; @@ -47,7 +48,6 @@ struct xe_device_desc { u8 has_heci_gscfi:1; u8 has_heci_cscfi:1; u8 has_i2c:1; - u8 has_late_bind:1; u8 has_llc:1; u8 has_mbx_power_limits:1; u8 has_mbx_thermal_info:1; -- 2.54.0