linux-next: manual merge of the drm tree with Linus' tree

Stephen Rothwell
2019-11-13T00:46:26Z

[-- Attachment #1: Type: text/plain, Size: 1733 bytes --]

Hi all,

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

drivers/gpu/drm/i915/gt/intel_engine_types.h

between commit:

311a50e76a33 ("drm/i915: Add support for mandatory cmdparsing")

from Linus' tree and commits:

cdb736fa8b8b ("drm/i915: Use engine relative LRIs on context setup")
058179e72e09 ("drm/i915/gt: Replace hangcheck by heartbeats")

from the drm 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/i915/gt/intel_engine_types.h
index 9dd8c299cb2d,c5d1047a4bc5..000000000000
--- a/drivers/gpu/drm/i915/gt/intel_engine_types.h
+++ b/drivers/gpu/drm/i915/gt/intel_engine_types.h
@@@ -473,15 -454,13 +454,14 @@@ struct intel_engine_cs
/* status_notifier: list of callbacks for context-switch changes */
struct atomic_notifier_head context_status_notifier;

- struct intel_engine_hangcheck hangcheck;
-
-#define I915_ENGINE_NEEDS_CMD_PARSER BIT(0)
+#define I915_ENGINE_USING_CMD_PARSER BIT(0)
#define I915_ENGINE_SUPPORTS_STATS BIT(1)
#define I915_ENGINE_HAS_PREEMPTION BIT(2)
#define I915_ENGINE_HAS_SEMAPHORES BIT(3)
#define I915_ENGINE_NEEDS_BREADCRUMB_TASKLET BIT(4)
#define I915_ENGINE_IS_VIRTUAL BIT(5)
+ #define I915_ENGINE_HAS_RELATIVE_MMIO BIT(6)
+#define I915_ENGINE_REQUIRES_CMD_PARSER BIT(7)
unsigned int flags;

/*

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]