Skip to contentSkip to conversation

drm/xe/pf: remove code guarded by nonexistent config option

PATCH New Ethan Nelson-Moore 2 participants 2 messages Jun 14 – Jun 15

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/xe/pf: remove code guarded by nonexistent config option

Some code in drivers/gpu/drm/xe/xe_lmtt_2l.c depends on CONFIG_DRM_XE_LMTT_2L_128GB, which has never been defined in the kernel. Remove this dead code and correct a related comment.

Discovered while searching for CONFIG_* symbols referenced in code but not defined in any Kconfig file.

---
 drivers/gpu/drm/xe/xe_lmtt_2l.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/gpu/drm/xe/xe_lmtt_2l.c +2 -7
index 84bc5c4212b5..707e0d090c62 100644
@@ -14,9 +14,9 @@
 /**
  * DOC: Two-Level LMTT Structure
  *
- * LMHAW (Local Memory Host Address Width) is 37 bit (128GB)
+ * LMHAW (Local Memory Host Address Width) is 35 bit (32GB)
  *
- * LMGAW (Local Memory Guest Address Width) is 37 bit (128GB)
+ * LMGAW (Local Memory Guest Address Width) is 35 bit (32GB)
  *
  * The following figure illustrates the structure and function of the 2L LMTT::
  *
@@ -54,11 +54,7 @@
 typedef u32 lmtt_2l_pde_t;
 typedef u32 lmtt_2l_pte_t;
 
-#if IS_ENABLED(CONFIG_DRM_XE_LMTT_2L_128GB)
-#define LMTT_2L_HAW			37 /* 128 GiB */
-#else
 #define LMTT_2L_HAW			35 /* 32 GiB */
-#endif
 
 #define LMTT_2L_PDE_MAX_NUM		64 /* SRIOV with PF and 63 VFs, index 0 (PF) is unused */
 #define LMTT_2L_PDE_LMTT_PTR		GENMASK(LMTT_2L_HAW - 13, 4)
@@ -79,7 +75,6 @@ static unsigned int lmtt_2l_pte_num(unsigned int level)
 	case 1:
 		return LMTT_2L_PDE_MAX_NUM;
 	case 0:
-		BUILD_BUG_ON(LMTT_2L_HAW == 37 && LMTT_2L_PTE_MAX_NUM != SZ_64K);
 		BUILD_BUG_ON(LMTT_2L_HAW == 35 && LMTT_2L_PTE_MAX_NUM != SZ_16K);
 		return LMTT_2L_PTE_MAX_NUM;
 	default:
Signature · 1 line
2.43.0
#1 lore raw

✗ LGCI.VerificationFailed: failure for drm/xe/pf: remove code guarded by nonexistent config option

== Series Details ==

== Series Details ==

Series: drm/xe/pf: remove code guarded by nonexistent config option
URL : https://patchwork.freedesktop.org/series/168522/
State : failure

== Summary ==

Series author address '[email protected]' is not on the allowlist, which prevents CI from being automatically triggered. If you want CI to run for this series, ask Patchwork project owners to click 'retest' on the series in Patchwork. Exception occurred during validation, bailing out!
Build URL: http://intel-gfx-ci-public.igk.intel.com:8080/job/xe_pw_trigger/1190263/ (on master)