Hi all,

Today's linux-next merge of the drm-xe tree got a conflict in:

  drivers/gpu/drm/xe/xe_wa.c

between commit:

  e23fafb8594ea ("drm/xe/rtp: Add struct types for RTP tables")

from the drm-fixes tree and commits:

  5ff004fdc7377 ("drm/xe/rtp: Add struct types for RTP tables")
  e9845449e37f5 ("drm/xe/rtp: Ensure gt_was doesn't evaluate rules with engine types")
  e2cfc5bc0c3ff ("drm/xe/rtp: Ensure oob_was does not evaluate engine type rules")
  94e15e89f491e ("drm/xe/rtp: Ensure device_oob_was only evaluates correct rules")
  02b41333f4874 ("drm/xe/xe3p_lpg: Add missing references to workarounds")

from the drm-xe tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --combined drivers/gpu/drm/xe/xe_wa.c
index b9d9fe0801aad,139434946f8f8..0000000000000
--- a/drivers/gpu/drm/xe/xe_wa.c
+++ b/drivers/gpu/drm/xe/xe_wa.c
@@@ -130,7 -130,7 +130,7 @@@
  __diag_push();
  __diag_ignore_all("-Woverride-init", "Allow field overrides in table");
  
- static const struct xe_rtp_table_sr gt_was = XE_RTP_TABLE_SR(
+ VISIBLE_IF_KUNIT const struct xe_rtp_table_sr gt_was = XE_RTP_TABLE_SR(
  	/* Workarounds applying over a range of IPs */
  
  	{ XE_RTP_NAME("14011060649"),
@@@ -293,7 -293,7 +293,7 @@@
  	  XE_RTP_ACTIONS(SET(MMIOATSREQLIMIT_GAM_WALK_3D,
  			     DIS_ATS_WRONLY_PG))
  	},
- 	{ XE_RTP_NAME("14026144927, 16029437861"),
+ 	{ XE_RTP_NAME("14026144927, 16029437861, 14026127056"),
  	  XE_RTP_RULES(GRAPHICS_VERSION(3510), GRAPHICS_STEP(A0, B0)),
  	  XE_RTP_ACTIONS(SET(L3SQCREG2, L3_SQ_DISABLE_COAMA_2WAY_COH |
  			     L3_SQ_DISABLE_COAMA))
@@@ -307,6 -307,7 +307,7 @@@
  	  XE_RTP_ACTIONS(SET(GUC_INTR_CHICKEN, DISABLE_SIGNALING_ENGINES))
  	},
  );
+ EXPORT_SYMBOL_IF_KUNIT(gt_was);
  
  static const struct xe_rtp_table_sr engine_was = XE_RTP_TABLE_SR(
  	/* Workarounds applying over a range of IPs */
@@@ -586,12 -587,12 +587,12 @@@
  
  	/* Xe3p_LPG*/
  
- 	{ XE_RTP_NAME("22021149932"),
+ 	{ XE_RTP_NAME("22021149932, 14026290593"),
  	  XE_RTP_RULES(GRAPHICS_VERSION(3510), GRAPHICS_STEP(A0, B0),
  		       FUNC(xe_rtp_match_first_render_or_compute)),
  	  XE_RTP_ACTIONS(SET(LSC_CHICKEN_BIT_0_UDW, SAMPLER_LD_LSC_DISABLE))
  	},
- 	{ XE_RTP_NAME("14025676848"),
+ 	{ XE_RTP_NAME("14025676848, 14026270459"),
  	  XE_RTP_RULES(GRAPHICS_VERSION(3510), GRAPHICS_STEP(A0, B0),
  		       FUNC(xe_rtp_match_first_render_or_compute)),
  	  XE_RTP_ACTIONS(SET(LSC_CHICKEN_BIT_0_UDW, LSCFE_SAME_ADDRESS_ATOMICS_COALESCING_DISABLE))
@@@ -802,10 -803,11 +803,11 @@@ static const struct xe_rtp_entry oob_wa
  
  static_assert(ARRAY_SIZE(oob_was_entries)  == _XE_WA_OOB_COUNT);
  
- static __maybe_unused const struct xe_rtp_table oob_was = {
+ VISIBLE_IF_KUNIT __maybe_unused const struct xe_rtp_table oob_was = {
  	.entries = oob_was_entries,
  	.n_entries = ARRAY_SIZE(oob_was_entries),
  };
+ EXPORT_SYMBOL_IF_KUNIT(oob_was);
  
  static const struct xe_rtp_entry device_oob_was_entries[] = {
  #include <generated/xe_device_wa_oob.c>
@@@ -813,10 -815,11 +815,11 @@@
  
  static_assert(ARRAY_SIZE(device_oob_was_entries) == _XE_DEVICE_WA_OOB_COUNT);
  
- static __maybe_unused const struct xe_rtp_table device_oob_was = {
+ VISIBLE_IF_KUNIT __maybe_unused const struct xe_rtp_table device_oob_was = {
  	.entries = device_oob_was_entries,
  	.n_entries = ARRAY_SIZE(device_oob_was_entries),
  };
+ EXPORT_SYMBOL_IF_KUNIT(device_oob_was);
  
  __diag_pop();