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

[Stephen Rothwell]

Hi all,

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

  drivers/gpu/drm/xe/xe_device.h

between commit:

  c01c6066e6fa ("drm/xe/device: implement transient flush")

from the drm-intel tree and commits:

  fb74b205cdd2 ("drm/xe: Introduce a simple wedged state")
  8ed9aaae39f3 ("drm/xe: Force wedged state and block GT reset upon any GPU hang")
  6b8ef44cc0a9 ("drm/xe: Introduce the wedged_mode debugfs")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/xe/xe_device.h
index 7524a71c0d84,82317580f4bf..000000000000
--- a/drivers/gpu/drm/xe/xe_device.h
+++ b/drivers/gpu/drm/xe/xe_device.h
@@@ -167,6 -167,11 +167,13 @@@ void xe_device_snapshot_print(struct xe
  u64 xe_device_canonicalize_addr(struct xe_device *xe, u64 address);
  u64 xe_device_uncanonicalize_addr(struct xe_device *xe, u64 address);
  
 +void xe_device_td_flush(struct xe_device *xe);
 +
+ static inline bool xe_device_wedged(struct xe_device *xe)
+ {
+ 	return atomic_read(&xe->wedged.flag);
+ }
+ 
+ void xe_device_declare_wedged(struct xe_device *xe);
+ 
  #endif

Attachment: pgpziJeA5IUpx.pgp
Description: OpenPGP digital signature