linux-next: manual merge of the drm-xe tree with the drm-fixes tree

[Mark Brown]

Hi all,

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

  drivers/gpu/drm/xe/xe_reg_whitelist.c

between commit:

  959b5016e4646 ("drm/xe/oa: Fix offset alignment for MERT WHITELIST_OA_MERT_MMIO_TRG")

from the drm-fixes tree and commits:

  5ff004fdc7377 ("drm/xe/rtp: Add struct types for RTP tables")
  90511bdcfda97 ("drm/xe/rtp: Add RING_FORCE_TO_NONPRIV_DENY to OA whitelists")
  c478244a9e2d1 ("drm/xe/rtp: Maintain OA whitelists separately")
  15739920b71ef ("drm/xe/rtp: Keep track of non-OA nonpriv slots")
  c3ff77d7235cc ("drm/xe/rtp: Generalize whitelist_apply_to_hwe")
  3a3c3e56db292 ("drm/xe/rtp: Save OA nonpriv registers to register save/restore lists")
  aeaa7d2bb0172 ("drm/xe/rtp: Toggle 'deny' bit to (de-)whitelist OA regs")
  6f73bf8fffa72 ("drm/xe/rtp: (De-)whitelist OA registers for all hwe's for a gt")
  645f1a2589bd4 ("drm/xe/rtp: Ensure locking/ref counting for OA whitelists")
  483c9f5451592 ("drm/xe/tests/rtp: Add kunit test for whitelist upper bounds")
  f6c23e4589bdc ("drm/xe/oa: Fix offset alignment for MERT WHITELIST_OA_MERT_MMIO_TRG")

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_reg_whitelist.c
index 526907d2d8246,cab1b578ca0ef..0000000000000
--- a/drivers/gpu/drm/xe/xe_reg_whitelist.c
+++ b/drivers/gpu/drm/xe/xe_reg_whitelist.c
@@@ -5,6 -5,8 +5,8 @@@
  
  #include "xe_reg_whitelist.h"
  
+ #include <kunit/visibility.h>
+ 
  #include "regs/xe_engine_regs.h"
  #include "regs/xe_gt_regs.h"
  #include "regs/xe_oa_regs.h"
@@@ -41,7 -43,7 +43,7 @@@ static bool match_multi_queue_class(con
  	return xe_gt_supports_multi_queue(gt, hwe->class);
  }
  
- static const struct xe_rtp_table_sr register_whitelist = XE_RTP_TABLE_SR(
+ VISIBLE_IF_KUNIT const struct xe_rtp_table_sr register_whitelist = XE_RTP_TABLE_SR(
  	{ XE_RTP_NAME("WaAllowPMDepthAndInvocationCountAccessFromUMD, 1408556865"),
  	  XE_RTP_RULES(GRAPHICS_VERSION_RANGE(1200, 1210), ENGINE_CLASS(RENDER)),
  	  XE_RTP_ACTIONS(WHITELIST(PS_INVOCATION_COUNT,
@@@ -104,6 -106,7 +106,7 @@@
  				   RING_FORCE_TO_NONPRIV_ACCESS_RW))
  	},
  );
+ EXPORT_SYMBOL_IF_KUNIT(register_whitelist);
  
  static const struct xe_rtp_table_sr oa_whitelist = XE_RTP_TABLE_SR(

Attachment: signature.asc
Description: PGP signature