Skip to contentSkip to conversation

Update firmware to v62.0.0

PATCH In review Matthew Brost 6 participants 12 messages Jun 15, 2021 – Jun 18, 2021

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

cover Update firmware to v62.0.0

As part of enabling GuC submission [1] we need to update to the latest and greatest firmware. This series does that. All backwards compatibility breaking changes squashed into a single patch #2. Same series sent to trybot [2] forcing GuC to be enabled to ensure we haven't broke something.

v2: Address comments, looking for remaning RBs so patches can be squashed and sent for CI
v3: Delete a few unused defines, squash patches
v4: Add values back into kernel doc, fix docs warning

[1] https://patchwork.freedesktop.org/series/89844
[2] https://patchwork.freedesktop.org/series/91341

Michal Wajdeczko (3):
drm/i915/guc: Introduce unified HXG messages
drm/i915/guc: Update firmware to v62.0.0
drm/i915/doc: Include GuC ABI documentation

 Documentation/gpu/i915.rst                    |   8 +
 .../gpu/drm/i915/gt/uc/abi/guc_actions_abi.h  | 107 ++++++
 .../gt/uc/abi/guc_communication_ctb_abi.h     | 126 +++++--
 .../gt/uc/abi/guc_communication_mmio_abi.h    |  65 ++--
 .../gpu/drm/i915/gt/uc/abi/guc_messages_abi.h | 213 +++++++++++
 drivers/gpu/drm/i915/gt/uc/intel_guc.c        | 107 ++++--
 drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c    |  45 +--
 drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c     | 356 +++++++++---------
 drivers/gpu/drm/i915/gt/uc/intel_guc_ct.h     |   6 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h   |  75 +---
 drivers/gpu/drm/i915/gt/uc/intel_guc_log.c    |  29 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc_log.h    |   6 +-
 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c      |  26 +-
 13 files changed, 748 insertions(+), 421 deletions(-)
Signature · 6 lines
2.28.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH 1/3 drm/i915/guc: Introduce unified HXG messages

From: Michal Wajdeczko <[email protected]>

New GuC firmware will unify format of MMIO and CTB H2G messages. Introduce their definitions now to allow gradual transition of our code to match new changes.

---
 .../gpu/drm/i915/gt/uc/abi/guc_messages_abi.h | 213 ++++++++++++++++++
 1 file changed, 213 insertions(+)
drivers/gpu/drm/i915/gt/uc/abi/guc_messages_abi.h +213 -0
index 775e21f3058c..29ac823acd4c 100644
@@ -6,6 +6,219 @@
 #ifndef _ABI_GUC_MESSAGES_ABI_H
 #define _ABI_GUC_MESSAGES_ABI_H
 
+/**
+ * DOC: HXG Message
+ *
+ * All messages exchanged with GuC are defined using 32 bit dwords.
+ * First dword is treated as a message header. Remaining dwords are optional.
+ *
+ *  +---+-------+--------------------------------------------------------------+
+ *  |   | Bits  | Description                                                  |
+ *  +===+=======+==============================================================+
+ *  |   |       |                                                              |
+ *  | 0 |    31 | **ORIGIN** - originator of the message                       |
+ *  |   |       |   - _`GUC_HXG_ORIGIN_HOST` = 0                               |
+ *  |   |       |   - _`GUC_HXG_ORIGIN_GUC` = 1                                |
+ *  |   |       |                                                              |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   | 30:28 | **TYPE** - message type                                      |
+ *  |   |       |   - _`GUC_HXG_TYPE_REQUEST` = 0                              |
+ *  |   |       |   - _`GUC_HXG_TYPE_EVENT` = 1                                |
+ *  |   |       |   - _`GUC_HXG_TYPE_NO_RESPONSE_BUSY` = 3                     |
+ *  |   |       |   - _`GUC_HXG_TYPE_NO_RESPONSE_RETRY` = 5                    |
+ *  |   |       |   - _`GUC_HXG_TYPE_RESPONSE_FAILURE` = 6                     |
+ *  |   |       |   - _`GUC_HXG_TYPE_RESPONSE_SUCCESS` = 7                     |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   |  27:0 | **AUX** - auxiliary data (depends on TYPE)                   |
+ *  +---+-------+--------------------------------------------------------------+
+ *  | 1 |  31:0 |                                                              |
+ *  +---+-------+                                                              |
+ *  |...|       | **PAYLOAD** - optional payload (depends on TYPE)             |
+ *  +---+-------+                                                              |
+ *  | n |  31:0 |                                                              |
+ *  +---+-------+--------------------------------------------------------------+
+ */
+
+#define GUC_HXG_MSG_MIN_LEN			1u
+#define GUC_HXG_MSG_0_ORIGIN			(0x1 << 31)
+#define   GUC_HXG_ORIGIN_HOST			0u
+#define   GUC_HXG_ORIGIN_GUC			1u
+#define GUC_HXG_MSG_0_TYPE			(0x7 << 28)
+#define   GUC_HXG_TYPE_REQUEST			0u
+#define   GUC_HXG_TYPE_EVENT			1u
+#define   GUC_HXG_TYPE_NO_RESPONSE_BUSY		3u
+#define   GUC_HXG_TYPE_NO_RESPONSE_RETRY	5u
+#define   GUC_HXG_TYPE_RESPONSE_FAILURE		6u
+#define   GUC_HXG_TYPE_RESPONSE_SUCCESS		7u
+#define GUC_HXG_MSG_0_AUX			(0xfffffff << 0)
+#define GUC_HXG_MSG_n_PAYLOAD			(0xffffffff << 0)
+
+/**
+ * DOC: HXG Request
+ *
+ * The `HXG Request`_ message should be used to initiate synchronous activity
+ * for which confirmation or return data is expected.
+ *
+ * The recipient of this message shall use `HXG Response`_, `HXG Failure`_
+ * or `HXG Retry`_ message as a definite reply, and may use `HXG Busy`_
+ * message as a intermediate reply.
+ *
+ * Format of @DATA0 and all @DATAn fields depends on the @ACTION code.
+ *
+ *  +---+-------+--------------------------------------------------------------+
+ *  |   | Bits  | Description                                                  |
+ *  +===+=======+==============================================================+
+ *  | 0 |    31 | ORIGIN                                                       |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   | 30:28 | TYPE = GUC_HXG_TYPE_REQUEST_                                 |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   | 27:16 | **DATA0** - request data (depends on ACTION)                 |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   |  15:0 | **ACTION** - requested action code                           |
+ *  +---+-------+--------------------------------------------------------------+
+ *  | 1 |  31:0 |                                                              |
+ *  +---+-------+                                                              |
+ *  |...|       | **DATAn** - optional data (depends on ACTION)                |
+ *  +---+-------+                                                              |
+ *  | n |  31:0 |                                                              |
+ *  +---+-------+--------------------------------------------------------------+
+ */
+
+#define GUC_HXG_REQUEST_MSG_MIN_LEN		GUC_HXG_MSG_MIN_LEN
+#define GUC_HXG_REQUEST_MSG_0_DATA0		(0xfff << 16)
+#define GUC_HXG_REQUEST_MSG_0_ACTION		(0xffff << 0)
+#define GUC_HXG_REQUEST_MSG_n_DATAn		GUC_HXG_MSG_n_PAYLOAD
+
+/**
+ * DOC: HXG Event
+ *
+ * The `HXG Event`_ message should be used to initiate asynchronous activity
+ * that does not involves immediate confirmation nor data.
+ *
+ * Format of @DATA0 and all @DATAn fields depends on the @ACTION code.
+ *
+ *  +---+-------+--------------------------------------------------------------+
+ *  |   | Bits  | Description                                                  |
+ *  +===+=======+==============================================================+
+ *  | 0 |    31 | ORIGIN                                                       |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   | 30:28 | TYPE = GUC_HXG_TYPE_EVENT_                                   |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   | 27:16 | **DATA0** - event data (depends on ACTION)                   |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   |  15:0 | **ACTION** - event action code                               |
+ *  +---+-------+--------------------------------------------------------------+
+ *  | 1 |  31:0 |                                                              |
+ *  +---+-------+                                                              |
+ *  |...|       | **DATAn** - optional event  data (depends on ACTION)         |
+ *  +---+-------+                                                              |
+ *  | n |  31:0 |                                                              |
+ *  +---+-------+--------------------------------------------------------------+
+ */
+
+#define GUC_HXG_EVENT_MSG_MIN_LEN		GUC_HXG_MSG_MIN_LEN
+#define GUC_HXG_EVENT_MSG_0_DATA0		(0xfff << 16)
+#define GUC_HXG_EVENT_MSG_0_ACTION		(0xffff << 0)
+#define GUC_HXG_EVENT_MSG_n_DATAn		GUC_HXG_MSG_n_PAYLOAD
+
+/**
+ * DOC: HXG Busy
+ *
+ * The `HXG Busy`_ message may be used to acknowledge reception of the `HXG Request`_
+ * message if the recipient expects that it processing will be longer than default
+ * timeout.
+ *
+ * The @COUNTER field may be used as a progress indicator.
+ *
+ *  +---+-------+--------------------------------------------------------------+
+ *  |   | Bits  | Description                                                  |
+ *  +===+=======+==============================================================+
+ *  | 0 |    31 | ORIGIN                                                       |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   | 30:28 | TYPE = GUC_HXG_TYPE_NO_RESPONSE_BUSY_                        |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   |  27:0 | **COUNTER** - progress indicator                             |
+ *  +---+-------+--------------------------------------------------------------+
+ */
+
+#define GUC_HXG_BUSY_MSG_LEN			GUC_HXG_MSG_MIN_LEN
+#define GUC_HXG_BUSY_MSG_0_COUNTER		GUC_HXG_MSG_0_AUX
+
+/**
+ * DOC: HXG Retry
+ *
+ * The `HXG Retry`_ message should be used by recipient to indicate that the
+ * `HXG Request`_ message was dropped and it should be resent again.
+ *
+ * The @REASON field may be used to provide additional information.
+ *
+ *  +---+-------+--------------------------------------------------------------+
+ *  |   | Bits  | Description                                                  |
+ *  +===+=======+==============================================================+
+ *  | 0 |    31 | ORIGIN                                                       |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   | 30:28 | TYPE = GUC_HXG_TYPE_NO_RESPONSE_RETRY_                       |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   |  27:0 | **REASON** - reason for retry                                |
+ *  |   |       |  - _`GUC_HXG_RETRY_REASON_UNSPECIFIED` = 0                   |
+ *  +---+-------+--------------------------------------------------------------+
+ */
+
+#define GUC_HXG_RETRY_MSG_LEN			GUC_HXG_MSG_MIN_LEN
+#define GUC_HXG_RETRY_MSG_0_REASON		GUC_HXG_MSG_0_AUX
+#define   GUC_HXG_RETRY_REASON_UNSPECIFIED	0u
+
+/**
+ * DOC: HXG Failure
+ *
+ * The `HXG Failure`_ message shall be used as a reply to the `HXG Request`_
+ * message that could not be processed due to an error.
+ *
+ *  +---+-------+--------------------------------------------------------------+
+ *  |   | Bits  | Description                                                  |
+ *  +===+=======+==============================================================+
+ *  | 0 |    31 | ORIGIN                                                       |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   | 30:28 | TYPE = GUC_HXG_TYPE_RESPONSE_FAILURE_                        |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   | 27:16 | **HINT** - additional error hint                             |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   |  15:0 | **ERROR** - error/result code                                |
+ *  +---+-------+--------------------------------------------------------------+
+ */
+
+#define GUC_HXG_FAILURE_MSG_LEN			GUC_HXG_MSG_MIN_LEN
+#define GUC_HXG_FAILURE_MSG_0_HINT		(0xfff << 16)
+#define GUC_HXG_FAILURE_MSG_0_ERROR		(0xffff << 0)
+
+/**
+ * DOC: HXG Response
+ *
+ * The `HXG Response`_ message shall be used as a reply to the `HXG Request`_
+ * message that was successfully processed without an error.
+ *
+ *  +---+-------+--------------------------------------------------------------+
+ *  |   | Bits  | Description                                                  |
+ *  +===+=======+==============================================================+
+ *  | 0 |    31 | ORIGIN                                                       |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   | 30:28 | TYPE = GUC_HXG_TYPE_RESPONSE_SUCCESS_                        |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   |  27:0 | **DATA0** - data (depends on ACTION from `HXG Request`_)     |
+ *  +---+-------+--------------------------------------------------------------+
+ *  | 1 |  31:0 |                                                              |
+ *  +---+-------+                                                              |
+ *  |...|       | **DATAn** - data (depends on ACTION from `HXG Request`_)     |
+ *  +---+-------+                                                              |
+ *  | n |  31:0 |                                                              |
+ *  +---+-------+--------------------------------------------------------------+
+ */
+
+#define GUC_HXG_RESPONSE_MSG_MIN_LEN		GUC_HXG_MSG_MIN_LEN
+#define GUC_HXG_RESPONSE_MSG_0_DATA0		GUC_HXG_MSG_0_AUX
+#define GUC_HXG_RESPONSE_MSG_n_DATAn		GUC_HXG_MSG_n_PAYLOAD
+
+/* deprecated */
 #define INTEL_GUC_MSG_TYPE_SHIFT	28
 #define INTEL_GUC_MSG_TYPE_MASK		(0xF << INTEL_GUC_MSG_TYPE_SHIFT)
 #define INTEL_GUC_MSG_DATA_SHIFT	16
Signature · 1 line
2.28.0
#2 lore raw

PATCH 2/3 drm/i915/guc: Update firmware to v62.0.0

In reply to Matthew Brost

From: Michal Wajdeczko <[email protected]>

Most of the changes to the 62.0.0 firmware revolved around CTB communication channel. Conform to the new (stable) CTB protocol.

v2:
(Michal)
Add values back to kernel DOC for actions
(Docs)
Add 'CT buffer' back in to fix warning

---
 .../gpu/drm/i915/gt/uc/abi/guc_actions_abi.h  | 107 ++++++
 .../gt/uc/abi/guc_communication_ctb_abi.h     | 126 +++++--
 .../gt/uc/abi/guc_communication_mmio_abi.h    |  65 ++--
 drivers/gpu/drm/i915/gt/uc/intel_guc.c        | 107 ++++--
 drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c    |  45 +--
 drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c     | 356 +++++++++---------
 drivers/gpu/drm/i915/gt/uc/intel_guc_ct.h     |   6 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h   |  75 +---
 drivers/gpu/drm/i915/gt/uc/intel_guc_log.c    |  29 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc_log.h    |   6 +-
 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c      |  26 +-
 11 files changed, 527 insertions(+), 421 deletions(-)
drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h +107 -0
index 90efef8a73e4..2d6198e63ebe 100644
@@ -6,6 +6,113 @@
 #ifndef _ABI_GUC_ACTIONS_ABI_H
 #define _ABI_GUC_ACTIONS_ABI_H
 
+/**
+ * DOC: HOST2GUC_REGISTER_CTB
+ *
+ * This message is used as part of the `CTB based communication`_ setup.
+ *
+ * This message must be sent as `MMIO HXG Message`_.
+ *
+ *  +---+-------+--------------------------------------------------------------+
+ *  |   | Bits  | Description                                                  |
+ *  +===+=======+==============================================================+
+ *  | 0 |    31 | ORIGIN = GUC_HXG_ORIGIN_HOST_                                |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   | 30:28 | TYPE = GUC_HXG_TYPE_REQUEST_                                 |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   | 27:16 | DATA0 = MBZ                                                  |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   |  15:0 | ACTION = _`GUC_ACTION_HOST2GUC_REGISTER_CTB` = 0x4505        |
+ *  +---+-------+--------------------------------------------------------------+
+ *  | 1 | 31:12 | RESERVED = MBZ                                               |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   |  11:8 | **TYPE** - type for the `CT Buffer`_                         |
+ *  |   |       |                                                              |
+ *  |   |       |   - _`GUC_CTB_TYPE_HOST2GUC` = 0                             |
+ *  |   |       |   - _`GUC_CTB_TYPE_GUC2HOST` = 1                             |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   |   7:0 | **SIZE** - size of the `CT Buffer`_ in 4K units minus 1      |
+ *  +---+-------+--------------------------------------------------------------+
+ *  | 2 |  31:0 | **DESC_ADDR** - GGTT address of the `CTB Descriptor`_        |
+ *  +---+-------+--------------------------------------------------------------+
+ *  | 3 |  31:0 | **BUFF_ADDF** - GGTT address of the `CT Buffer`_             |
+ *  +---+-------+--------------------------------------------------------------+
+ *
+ *  +---+-------+--------------------------------------------------------------+
+ *  |   | Bits  | Description                                                  |
+ *  +===+=======+==============================================================+
+ *  | 0 |    31 | ORIGIN = GUC_HXG_ORIGIN_GUC_                                 |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   | 30:28 | TYPE = GUC_HXG_TYPE_RESPONSE_SUCCESS_                        |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   |  27:0 | DATA0 = MBZ                                                  |
+ *  +---+-------+--------------------------------------------------------------+
+ */
+#define GUC_ACTION_HOST2GUC_REGISTER_CTB		0x4505
+
+#define HOST2GUC_REGISTER_CTB_REQUEST_MSG_LEN		(GUC_HXG_REQUEST_MSG_MIN_LEN + 3u)
+#define HOST2GUC_REGISTER_CTB_REQUEST_MSG_0_MBZ		GUC_HXG_REQUEST_MSG_0_DATA0
+#define HOST2GUC_REGISTER_CTB_REQUEST_MSG_1_MBZ		(0xfffff << 12)
+#define HOST2GUC_REGISTER_CTB_REQUEST_MSG_1_TYPE	(0xf << 8)
+#define   GUC_CTB_TYPE_HOST2GUC				0u
+#define   GUC_CTB_TYPE_GUC2HOST				1u
+#define HOST2GUC_REGISTER_CTB_REQUEST_MSG_1_SIZE	(0xff << 0)
+#define HOST2GUC_REGISTER_CTB_REQUEST_MSG_2_DESC_ADDR	GUC_HXG_REQUEST_MSG_n_DATAn
+#define HOST2GUC_REGISTER_CTB_REQUEST_MSG_3_BUFF_ADDR	GUC_HXG_REQUEST_MSG_n_DATAn
+
+#define HOST2GUC_REGISTER_CTB_RESPONSE_MSG_LEN		GUC_HXG_RESPONSE_MSG_MIN_LEN
+#define HOST2GUC_REGISTER_CTB_RESPONSE_MSG_0_MBZ	GUC_HXG_RESPONSE_MSG_0_DATA0
+
+/**
+ * DOC: HOST2GUC_DEREGISTER_CTB
+ *
+ * This message is used as part of the `CTB based communication`_ teardown.
+ *
+ * This message must be sent as `MMIO HXG Message`_.
+ *
+ *  +---+-------+--------------------------------------------------------------+
+ *  |   | Bits  | Description                                                  |
+ *  +===+=======+==============================================================+
+ *  | 0 |    31 | ORIGIN = GUC_HXG_ORIGIN_HOST_                                |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   | 30:28 | TYPE = GUC_HXG_TYPE_REQUEST_                                 |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   | 27:16 | DATA0 = MBZ                                                  |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   |  15:0 | ACTION = _`GUC_ACTION_HOST2GUC_DEREGISTER_CTB` = 0x4506      |
+ *  +---+-------+--------------------------------------------------------------+
+ *  | 1 | 31:12 | RESERVED = MBZ                                               |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   |  11:8 | **TYPE** - type of the `CT Buffer`_                          |
+ *  |   |       |                                                              |
+ *  |   |       | see `GUC_ACTION_HOST2GUC_REGISTER_CTB`_                      |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   |   7:0 | RESERVED = MBZ                                               |
+ *  +---+-------+--------------------------------------------------------------+
+ *
+ *  +---+-------+--------------------------------------------------------------+
+ *  |   | Bits  | Description                                                  |
+ *  +===+=======+==============================================================+
+ *  | 0 |    31 | ORIGIN = GUC_HXG_ORIGIN_GUC_                                 |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   | 30:28 | TYPE = GUC_HXG_TYPE_RESPONSE_SUCCESS_                        |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   |  27:0 | DATA0 = MBZ                                                  |
+ *  +---+-------+--------------------------------------------------------------+
+ */
+#define GUC_ACTION_HOST2GUC_DEREGISTER_CTB		0x4506
+
+#define HOST2GUC_DEREGISTER_CTB_REQUEST_MSG_LEN		(GUC_HXG_REQUEST_MSG_MIN_LEN + 1u)
+#define HOST2GUC_DEREGISTER_CTB_REQUEST_MSG_0_MBZ	GUC_HXG_REQUEST_MSG_0_DATA0
+#define HOST2GUC_DEREGISTER_CTB_REQUEST_MSG_1_MBZ	(0xfffff << 12)
+#define HOST2GUC_DEREGISTER_CTB_REQUEST_MSG_1_TYPE	(0xf << 8)
+#define HOST2GUC_DEREGISTER_CTB_REQUEST_MSG_1_MBZ2	(0xff << 0)
+
+#define HOST2GUC_DEREGISTER_CTB_RESPONSE_MSG_LEN	GUC_HXG_RESPONSE_MSG_MIN_LEN
+#define HOST2GUC_DEREGISTER_CTB_RESPONSE_MSG_0_MBZ	GUC_HXG_RESPONSE_MSG_0_DATA0
+
+/* legacy definitions */
+
 enum intel_guc_action {
 	INTEL_GUC_ACTION_DEFAULT = 0x0,
 	INTEL_GUC_ACTION_REQUEST_PREEMPTION = 0x2,
drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h +104 -22

138 lines not on this page · raw message

drivers/gpu/drm/i915/gt/uc/abi/guc_communication_mmio_abi.h +31 -34

77 lines not on this page · raw message

drivers/gpu/drm/i915/gt/uc/intel_guc.c +72 -35

155 lines not on this page · raw message

drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +4 -41

77 lines not on this page · raw message

drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +169 -187

580 lines not on this page · raw message

drivers/gpu/drm/i915/gt/uc/intel_guc_ct.h +4 -2
index cb222f202301..1ae2dde6db93 100644
@@ -31,13 +31,15 @@ struct intel_guc;
  * @lock: protects access to the commands buffer and buffer descriptor
  * @desc: pointer to the buffer descriptor
  * @cmds: pointer to the commands buffer
- * @size: size of the commands buffer
+ * @size: size of the commands buffer in dwords
+ * @broken: flag to indicate if descriptor data is broken
  */
 struct intel_guc_ct_buffer {
 	spinlock_t lock;
 	struct guc_ct_buffer_desc *desc;
 	u32 *cmds;
 	u32 size;
+	bool broken;
 };
 
 
@@ -59,7 +61,7 @@ struct intel_guc_ct {
 	struct tasklet_struct receive_tasklet;
 
 	struct {
-		u32 last_fence; /* last fence used to send request */
+		u16 last_fence; /* last fence used to send request */
 
 		spinlock_t lock; /* protects pending requests list */
 		struct list_head pending; /* requests waiting for response */
drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +11 -64

119 lines not on this page · raw message

drivers/gpu/drm/i915/gt/uc/intel_guc_log.c +10 -19
index c36d5eb5bbb9..ac0931f0374b 100644
@@ -197,10 +197,8 @@ static bool guc_check_log_buf_overflow(struct intel_guc_log *log,
 static unsigned int guc_get_log_buffer_size(enum guc_log_buffer_type type)
 {
 	switch (type) {
-	case GUC_ISR_LOG_BUFFER:
-		return ISR_BUFFER_SIZE;
-	case GUC_DPC_LOG_BUFFER:
-		return DPC_BUFFER_SIZE;
+	case GUC_DEBUG_LOG_BUFFER:
+		return DEBUG_BUFFER_SIZE;
 	case GUC_CRASH_DUMP_LOG_BUFFER:
 		return CRASH_BUFFER_SIZE;
 	default:
@@ -245,7 +243,7 @@ static void guc_read_update_log_buffer(struct intel_guc_log *log)
 	src_data += PAGE_SIZE;
 	dst_data += PAGE_SIZE;
 
-	for (type = GUC_ISR_LOG_BUFFER; type < GUC_MAX_LOG_BUFFER; type++) {
+	for (type = GUC_DEBUG_LOG_BUFFER; type < GUC_MAX_LOG_BUFFER; type++) {
 		/*
 		 * Make a copy of the state structure, inside GuC log buffer
 		 * (which is uncached mapped), on the stack to avoid reading
@@ -463,21 +461,16 @@ int intel_guc_log_create(struct intel_guc_log *log)
 	 *  +===============================+ 00B
 	 *  |    Crash dump state header    |
 	 *  +-------------------------------+ 32B
-	 *  |       DPC state header        |
+	 *  |      Debug state header       |
 	 *  +-------------------------------+ 64B
-	 *  |       ISR state header        |
-	 *  +-------------------------------+ 96B
 	 *  |                               |
 	 *  +===============================+ PAGE_SIZE (4KB)
 	 *  |        Crash Dump logs        |
 	 *  +===============================+ + CRASH_SIZE
-	 *  |           DPC logs            |
-	 *  +===============================+ + DPC_SIZE
-	 *  |           ISR logs            |
-	 *  +===============================+ + ISR_SIZE
+	 *  |          Debug logs           |
+	 *  +===============================+ + DEBUG_SIZE
 	 */
-	guc_log_size = PAGE_SIZE + CRASH_BUFFER_SIZE + DPC_BUFFER_SIZE +
-			ISR_BUFFER_SIZE;
+	guc_log_size = PAGE_SIZE + CRASH_BUFFER_SIZE + DEBUG_BUFFER_SIZE;
 
 	vma = intel_guc_allocate_vma(guc, guc_log_size);
 	if (IS_ERR(vma)) {
@@ -675,10 +668,8 @@ static const char *
 stringify_guc_log_type(enum guc_log_buffer_type type)
 {
 	switch (type) {
-	case GUC_ISR_LOG_BUFFER:
-		return "ISR";
-	case GUC_DPC_LOG_BUFFER:
-		return "DPC";
+	case GUC_DEBUG_LOG_BUFFER:
+		return "DEBUG";
 	case GUC_CRASH_DUMP_LOG_BUFFER:
 		return "CRASH";
 	default:
@@ -708,7 +699,7 @@ void intel_guc_log_info(struct intel_guc_log *log, struct drm_printer *p)
 
 	drm_printf(p, "\tRelay full count: %u\n", log->relay.full_count);
 
-	for (type = GUC_ISR_LOG_BUFFER; type < GUC_MAX_LOG_BUFFER; type++) {
+	for (type = GUC_DEBUG_LOG_BUFFER; type < GUC_MAX_LOG_BUFFER; type++) {
 		drm_printf(p, "\t%s:\tflush count %10u, overflow count %10u\n",
 			   stringify_guc_log_type(type),
 			   log->stats[type].flush,
drivers/gpu/drm/i915/gt/uc/intel_guc_log.h +2 -4
index 11fccd0b2294..ac1ee1d5ce10 100644
@@ -17,12 +17,10 @@ struct intel_guc;
 
 #ifdef CONFIG_DRM_I915_DEBUG_GUC
 #define CRASH_BUFFER_SIZE	SZ_2M
-#define DPC_BUFFER_SIZE		SZ_8M
-#define ISR_BUFFER_SIZE		SZ_8M
+#define DEBUG_BUFFER_SIZE	SZ_16M
 #else
 #define CRASH_BUFFER_SIZE	SZ_8K
-#define DPC_BUFFER_SIZE		SZ_32K
-#define ISR_BUFFER_SIZE		SZ_32K
+#define DEBUG_BUFFER_SIZE	SZ_64K
 #endif
 
 /*
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +13 -13
index df647c9a8d56..9f23e9de3237 100644
@@ -48,19 +48,19 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,
  * firmware as TGL.
  */
 #define INTEL_UC_FIRMWARE_DEFS(fw_def, guc_def, huc_def) \
-	fw_def(ALDERLAKE_S, 0, guc_def(tgl, 49, 0, 1), huc_def(tgl,  7, 5, 0)) \
-	fw_def(ROCKETLAKE,  0, guc_def(tgl, 49, 0, 1), huc_def(tgl,  7, 5, 0)) \
-	fw_def(TIGERLAKE,   0, guc_def(tgl, 49, 0, 1), huc_def(tgl,  7, 5, 0)) \
-	fw_def(JASPERLAKE,  0, guc_def(ehl, 49, 0, 1), huc_def(ehl,  9, 0, 0)) \
-	fw_def(ELKHARTLAKE, 0, guc_def(ehl, 49, 0, 1), huc_def(ehl,  9, 0, 0)) \
-	fw_def(ICELAKE,     0, guc_def(icl, 49, 0, 1), huc_def(icl,  9, 0, 0)) \
-	fw_def(COMETLAKE,   5, guc_def(cml, 49, 0, 1), huc_def(cml,  4, 0, 0)) \
-	fw_def(COMETLAKE,   0, guc_def(kbl, 49, 0, 1), huc_def(kbl,  4, 0, 0)) \
-	fw_def(COFFEELAKE,  0, guc_def(kbl, 49, 0, 1), huc_def(kbl,  4, 0, 0)) \
-	fw_def(GEMINILAKE,  0, guc_def(glk, 49, 0, 1), huc_def(glk,  4, 0, 0)) \
-	fw_def(KABYLAKE,    0, guc_def(kbl, 49, 0, 1), huc_def(kbl,  4, 0, 0)) \
-	fw_def(BROXTON,     0, guc_def(bxt, 49, 0, 1), huc_def(bxt,  2, 0, 0)) \
-	fw_def(SKYLAKE,     0, guc_def(skl, 49, 0, 1), huc_def(skl,  2, 0, 0))
+	fw_def(ALDERLAKE_S, 0, guc_def(tgl, 62, 0, 0), huc_def(tgl,  7, 5, 0)) \
+	fw_def(ROCKETLAKE,  0, guc_def(tgl, 62, 0, 0), huc_def(tgl,  7, 5, 0)) \
+	fw_def(TIGERLAKE,   0, guc_def(tgl, 62, 0, 0), huc_def(tgl,  7, 5, 0)) \
+	fw_def(JASPERLAKE,  0, guc_def(ehl, 62, 0, 0), huc_def(ehl,  9, 0, 0)) \
+	fw_def(ELKHARTLAKE, 0, guc_def(ehl, 62, 0, 0), huc_def(ehl,  9, 0, 0)) \
+	fw_def(ICELAKE,     0, guc_def(icl, 62, 0, 0), huc_def(icl,  9, 0, 0)) \
+	fw_def(COMETLAKE,   5, guc_def(cml, 62, 0, 0), huc_def(cml,  4, 0, 0)) \
+	fw_def(COMETLAKE,   0, guc_def(kbl, 62, 0, 0), huc_def(kbl,  4, 0, 0)) \
+	fw_def(COFFEELAKE,  0, guc_def(kbl, 62, 0, 0), huc_def(kbl,  4, 0, 0)) \
+	fw_def(GEMINILAKE,  0, guc_def(glk, 62, 0, 0), huc_def(glk,  4, 0, 0)) \
+	fw_def(KABYLAKE,    0, guc_def(kbl, 62, 0, 0), huc_def(kbl,  4, 0, 0)) \
+	fw_def(BROXTON,     0, guc_def(bxt, 62, 0, 0), huc_def(bxt,  2, 0, 0)) \
+	fw_def(SKYLAKE,     0, guc_def(skl, 62, 0, 0), huc_def(skl,  2, 0, 0))
 
 #define __MAKE_UC_FW_PATH(prefix_, name_, major_, minor_, patch_) \
 	"i915/" \
Signature · 6 lines
2.28.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 2/3
#3 lore raw

Re: [PATCH 2/3] drm/i915/guc: Update firmware to v62.0.0

Quoted 152 lines · Matthew Brost

From: Michal Wajdeczko <[email protected]>

Most of the changes to the 62.0.0 firmware revolved around CTB communication channel. Conform to the new (stable) CTB protocol.

v2:
(Michal)
Add values back to kernel DOC for actions
(Docs)
Add 'CT buffer' back in to fix warning

---
  .../gpu/drm/i915/gt/uc/abi/guc_actions_abi.h  | 107 ++++++
  .../gt/uc/abi/guc_communication_ctb_abi.h     | 126 +++++--
  .../gt/uc/abi/guc_communication_mmio_abi.h    |  65 ++--
  drivers/gpu/drm/i915/gt/uc/intel_guc.c        | 107 ++++--
  drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c    |  45 +--
  drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c     | 356 +++++++++---------
  drivers/gpu/drm/i915/gt/uc/intel_guc_ct.h     |   6 +-
  drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h   |  75 +---
  drivers/gpu/drm/i915/gt/uc/intel_guc_log.c    |  29 +-
  drivers/gpu/drm/i915/gt/uc/intel_guc_log.h    |   6 +-
  drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c      |  26 +-
  11 files changed, 527 insertions(+), 421 deletions(-)
drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h +107 -0
index 90efef8a73e4..2d6198e63ebe 100644
@@ -6,6 +6,113 @@
  #ifndef _ABI_GUC_ACTIONS_ABI_H
  #define _ABI_GUC_ACTIONS_ABI_H
 
+/**
+ * DOC: HOST2GUC_REGISTER_CTB
+ *
+ * This message is used as part of the `CTB based communication`_ setup.
+ *
+ * This message must be sent as `MMIO HXG Message`_.
+ *
+ *  +---+-------+--------------------------------------------------------------+
+ *  |   | Bits  | Description                                                  |
+ *  +===+=======+==============================================================+
+ *  | 0 |    31 | ORIGIN = GUC_HXG_ORIGIN_HOST_                                |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   | 30:28 | TYPE = GUC_HXG_TYPE_REQUEST_                                 |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   | 27:16 | DATA0 = MBZ                                                  |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   |  15:0 | ACTION = _`GUC_ACTION_HOST2GUC_REGISTER_CTB` = 0x4505        |
+ *  +---+-------+--------------------------------------------------------------+
+ *  | 1 | 31:12 | RESERVED = MBZ                                               |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   |  11:8 | **TYPE** - type for the `CT Buffer`_                         |
+ *  |   |       |                                                              |
+ *  |   |       |   - _`GUC_CTB_TYPE_HOST2GUC` = 0                             |
+ *  |   |       |   - _`GUC_CTB_TYPE_GUC2HOST` = 1                             |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   |   7:0 | **SIZE** - size of the `CT Buffer`_ in 4K units minus 1      |
+ *  +---+-------+--------------------------------------------------------------+
+ *  | 2 |  31:0 | **DESC_ADDR** - GGTT address of the `CTB Descriptor`_        |
+ *  +---+-------+--------------------------------------------------------------+
+ *  | 3 |  31:0 | **BUFF_ADDF** - GGTT address of the `CT Buffer`_             |
+ *  +---+-------+--------------------------------------------------------------+
+ *
+ *  +---+-------+--------------------------------------------------------------+
+ *  |   | Bits  | Description                                                  |
+ *  +===+=======+==============================================================+
+ *  | 0 |    31 | ORIGIN = GUC_HXG_ORIGIN_GUC_                                 |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   | 30:28 | TYPE = GUC_HXG_TYPE_RESPONSE_SUCCESS_                        |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   |  27:0 | DATA0 = MBZ                                                  |
+ *  +---+-------+--------------------------------------------------------------+
+ */
+#define GUC_ACTION_HOST2GUC_REGISTER_CTB		0x4505
+
+#define HOST2GUC_REGISTER_CTB_REQUEST_MSG_LEN		(GUC_HXG_REQUEST_MSG_MIN_LEN + 3u)
+#define HOST2GUC_REGISTER_CTB_REQUEST_MSG_0_MBZ		GUC_HXG_REQUEST_MSG_0_DATA0
+#define HOST2GUC_REGISTER_CTB_REQUEST_MSG_1_MBZ		(0xfffff << 12)
+#define HOST2GUC_REGISTER_CTB_REQUEST_MSG_1_TYPE	(0xf << 8)
+#define   GUC_CTB_TYPE_HOST2GUC				0u
+#define   GUC_CTB_TYPE_GUC2HOST				1u
+#define HOST2GUC_REGISTER_CTB_REQUEST_MSG_1_SIZE	(0xff << 0)
+#define HOST2GUC_REGISTER_CTB_REQUEST_MSG_2_DESC_ADDR	GUC_HXG_REQUEST_MSG_n_DATAn
+#define HOST2GUC_REGISTER_CTB_REQUEST_MSG_3_BUFF_ADDR	GUC_HXG_REQUEST_MSG_n_DATAn
+
+#define HOST2GUC_REGISTER_CTB_RESPONSE_MSG_LEN		GUC_HXG_RESPONSE_MSG_MIN_LEN
+#define HOST2GUC_REGISTER_CTB_RESPONSE_MSG_0_MBZ	GUC_HXG_RESPONSE_MSG_0_DATA0
+
+/**
+ * DOC: HOST2GUC_DEREGISTER_CTB
+ *
+ * This message is used as part of the `CTB based communication`_ teardown.
+ *
+ * This message must be sent as `MMIO HXG Message`_.
+ *
+ *  +---+-------+--------------------------------------------------------------+
+ *  |   | Bits  | Description                                                  |
+ *  +===+=======+==============================================================+
+ *  | 0 |    31 | ORIGIN = GUC_HXG_ORIGIN_HOST_                                |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   | 30:28 | TYPE = GUC_HXG_TYPE_REQUEST_                                 |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   | 27:16 | DATA0 = MBZ                                                  |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   |  15:0 | ACTION = _`GUC_ACTION_HOST2GUC_DEREGISTER_CTB` = 0x4506      |
+ *  +---+-------+--------------------------------------------------------------+
+ *  | 1 | 31:12 | RESERVED = MBZ                                               |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   |  11:8 | **TYPE** - type of the `CT Buffer`_                          |
+ *  |   |       |                                                              |
+ *  |   |       | see `GUC_ACTION_HOST2GUC_REGISTER_CTB`_                      |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   |   7:0 | RESERVED = MBZ                                               |
+ *  +---+-------+--------------------------------------------------------------+
+ *
+ *  +---+-------+--------------------------------------------------------------+
+ *  |   | Bits  | Description                                                  |
+ *  +===+=======+==============================================================+
+ *  | 0 |    31 | ORIGIN = GUC_HXG_ORIGIN_GUC_                                 |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   | 30:28 | TYPE = GUC_HXG_TYPE_RESPONSE_SUCCESS_                        |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   |  27:0 | DATA0 = MBZ                                                  |
+ *  +---+-------+--------------------------------------------------------------+
+ */
+#define GUC_ACTION_HOST2GUC_DEREGISTER_CTB		0x4506
+
+#define HOST2GUC_DEREGISTER_CTB_REQUEST_MSG_LEN		(GUC_HXG_REQUEST_MSG_MIN_LEN + 1u)
+#define HOST2GUC_DEREGISTER_CTB_REQUEST_MSG_0_MBZ	GUC_HXG_REQUEST_MSG_0_DATA0
+#define HOST2GUC_DEREGISTER_CTB_REQUEST_MSG_1_MBZ	(0xfffff << 12)
+#define HOST2GUC_DEREGISTER_CTB_REQUEST_MSG_1_TYPE	(0xf << 8)
+#define HOST2GUC_DEREGISTER_CTB_REQUEST_MSG_1_MBZ2	(0xff << 0)
+
+#define HOST2GUC_DEREGISTER_CTB_RESPONSE_MSG_LEN	GUC_HXG_RESPONSE_MSG_MIN_LEN
+#define HOST2GUC_DEREGISTER_CTB_RESPONSE_MSG_0_MBZ	GUC_HXG_RESPONSE_MSG_0_DATA0
+
+/* legacy definitions */
+
  enum intel_guc_action {
  	INTEL_GUC_ACTION_DEFAULT = 0x0,
  	INTEL_GUC_ACTION_REQUEST_PREEMPTION = 0x2,
drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h +0 -0
index d38935f47ecf..29fc93a8b5be 100644
@@ -7,6 +7,110 @@
  #define _ABI_GUC_COMMUNICATION_CTB_ABI_H

drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h line 17

Quoted 10 lines
drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h +8 -0
 
  #include <linux/types.h>
+#include <linux/build_bug.h>
+
+#include "guc_messages_abi.h"
+
+/**
+ * DOC: CT Buffer
+ *
+ * Circular buffer used to send / receive CTBs (H2G or G2H)

nit: the CTB is not used to send CTBs, but to send messages. Can fix while pushing.

For the rest I couldn't spot anything that didn't match what was already reviewed, so:

Daniele

Quoted 1,341 lines
drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h +96 -22
+ */
+
+/**
+ * DOC: CTB Descriptor
+ *
+ *  +---+-------+--------------------------------------------------------------+
+ *  |   | Bits  | Description                                                  |
+ *  +===+=======+==============================================================+
+ *  | 0 |  31:0 | **HEAD** - offset (in dwords) to the last dword that was     |
+ *  |   |       | read from the `CT Buffer`_.                                  |
+ *  |   |       | It can only be updated by the receiver.                      |
+ *  +---+-------+--------------------------------------------------------------+
+ *  | 1 |  31:0 | **TAIL** - offset (in dwords) to the last dword that was     |
+ *  |   |       | written to the `CT Buffer`_.                                 |
+ *  |   |       | It can only be updated by the sender.                        |
+ *  +---+-------+--------------------------------------------------------------+
+ *  | 2 |  31:0 | **STATUS** - status of the CTB                               |
+ *  |   |       |                                                              |
+ *  |   |       |   - _`GUC_CTB_STATUS_NO_ERROR` = 0 (normal operation)        |
+ *  |   |       |   - _`GUC_CTB_STATUS_OVERFLOW` = 1 (head/tail too large)     |
+ *  |   |       |   - _`GUC_CTB_STATUS_UNDERFLOW` = 2 (truncated message)      |
+ *  |   |       |   - _`GUC_CTB_STATUS_MISMATCH` = 4 (head/tail modified)      |
+ *  +---+-------+--------------------------------------------------------------+
+ *  |...|       | RESERVED = MBZ                                               |
+ *  +---+-------+--------------------------------------------------------------+
+ *  | 15|  31:0 | RESERVED = MBZ                                               |
+ *  +---+-------+--------------------------------------------------------------+
+ */
+
+struct guc_ct_buffer_desc {
+	u32 head;
+	u32 tail;
+	u32 status;
+#define GUC_CTB_STATUS_NO_ERROR				0
+#define GUC_CTB_STATUS_OVERFLOW				(1 << 0)
+#define GUC_CTB_STATUS_UNDERFLOW			(1 << 1)
+#define GUC_CTB_STATUS_MISMATCH				(1 << 2)
+	u32 reserved[13];
+} __packed;
+static_assert(sizeof(struct guc_ct_buffer_desc) == 64);
+
+/**
+ * DOC: CTB Message
+ *
+ *  +---+-------+--------------------------------------------------------------+
+ *  |   | Bits  | Description                                                  |
+ *  +===+=======+==============================================================+
+ *  | 0 | 31:16 | **FENCE** - message identifier                               |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   | 15:12 | **FORMAT** - format of the CTB message                       |
+ *  |   |       |  - _`GUC_CTB_FORMAT_HXG` = 0 - see `CTB HXG Message`_        |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   |  11:8 | **RESERVED**                                                 |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   |   7:0 | **NUM_DWORDS** - length of the CTB message (w/o header)      |
+ *  +---+-------+--------------------------------------------------------------+
+ *  | 1 |  31:0 | optional (depends on FORMAT)                                 |
+ *  +---+-------+                                                              |
+ *  |...|       |                                                              |
+ *  +---+-------+                                                              |
+ *  | n |  31:0 |                                                              |
+ *  +---+-------+--------------------------------------------------------------+
+ */
+
+#define GUC_CTB_MSG_MIN_LEN			1u
+#define GUC_CTB_MSG_MAX_LEN			256u
+#define GUC_CTB_MSG_0_FENCE			(0xffff << 16)
+#define GUC_CTB_MSG_0_FORMAT			(0xf << 12)
+#define   GUC_CTB_FORMAT_HXG			0u
+#define GUC_CTB_MSG_0_RESERVED			(0xf << 8)
+#define GUC_CTB_MSG_0_NUM_DWORDS		(0xff << 0)
+
+/**
+ * DOC: CTB HXG Message
+ *
+ *  +---+-------+--------------------------------------------------------------+
+ *  |   | Bits  | Description                                                  |
+ *  +===+=======+==============================================================+
+ *  | 0 | 31:16 | FENCE                                                        |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   | 15:12 | FORMAT = GUC_CTB_FORMAT_HXG_                                 |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   |  11:8 | RESERVED = MBZ                                               |
+ *  |   +-------+--------------------------------------------------------------+
+ *  |   |   7:0 | NUM_DWORDS = length (in dwords) of the embedded HXG message  |
+ *  +---+-------+--------------------------------------------------------------+
+ *  | 1 |  31:0 |  +--------------------------------------------------------+  |
+ *  +---+-------+  |                                                        |  |
+ *  |...|       |  |  Embedded `HXG Message`_                               |  |
+ *  +---+-------+  |                                                        |  |
+ *  | n |  31:0 |  +--------------------------------------------------------+  |
+ *  +---+-------+--------------------------------------------------------------+
+ */
+
+#define GUC_CTB_HXG_MSG_MIN_LEN		(GUC_CTB_MSG_MIN_LEN + GUC_HXG_MSG_MIN_LEN)
+#define GUC_CTB_HXG_MSG_MAX_LEN		GUC_CTB_MSG_MAX_LEN
 
  /**
   * DOC: CTB based communication
@@ -60,28 +164,6 @@
   * - **flags**, holds various bits to control message handling
   */
 
-/*
- * Describes single command transport buffer.
- * Used by both guc-master and clients.
- */
-struct guc_ct_buffer_desc {
-	u32 addr;		/* gfx address */
-	u64 host_private;	/* host private data */
-	u32 size;		/* size in bytes */
-	u32 head;		/* offset updated by GuC*/
-	u32 tail;		/* offset updated by owner */
-	u32 is_in_error;	/* error indicator */
-	u32 reserved1;
-	u32 reserved2;
-	u32 owner;		/* id of the channel owner */
-	u32 owner_sub_id;	/* owner-defined field for extra tracking */
-	u32 reserved[5];
-} __packed;
-
-/* Type of command transport buffer */
-#define INTEL_GUC_CT_BUFFER_TYPE_SEND	0x0u
-#define INTEL_GUC_CT_BUFFER_TYPE_RECV	0x1u
-
  /*
   * Definition of the command transport message header (DW0)
   *
drivers/gpu/drm/i915/gt/uc/abi/guc_communication_mmio_abi.h +31 -34
index be066a62e9e0..bbf1ddb77434 100644
@@ -7,46 +7,43 @@
  #define _ABI_GUC_COMMUNICATION_MMIO_ABI_H
 
  /**
- * DOC: MMIO based communication
+ * DOC: GuC MMIO based communication
   *
- * The MMIO based communication between Host and GuC uses software scratch
- * registers, where first register holds data treated as message header,
- * and other registers are used to hold message payload.
+ * The MMIO based communication between Host and GuC relies on special
+ * hardware registers which format could be defined by the software
+ * (so called scratch registers).
   *
- * For Gen9+, GuC uses software scratch registers 0xC180-0xC1B8,
- * but no H2G command takes more than 8 parameters and the GuC FW
- * itself uses an 8-element array to store the H2G message.
+ * Each MMIO based message, both Host to GuC (H2G) and GuC to Host (G2H)
+ * messages, which maximum length depends on number of available scratch
+ * registers, is directly written into those scratch registers.
   *
- *      +-----------+---------+---------+---------+
- *      |  MMIO[0]  | MMIO[1] |   ...   | MMIO[n] |
- *      +-----------+---------+---------+---------+
- *      | header    |      optional payload       |
- *      +======+====+=========+=========+=========+
- *      | 31:28|type|         |         |         |
- *      +------+----+         |         |         |
- *      | 27:16|data|         |         |         |
- *      +------+----+         |         |         |
- *      |  15:0|code|         |         |         |
- *      +------+----+---------+---------+---------+
+ * For Gen9+, there are 16 software scratch registers 0xC180-0xC1B8,
+ * but no H2G command takes more than 4 parameters and the GuC firmware
+ * itself uses an 4-element array to store the H2G message.
   *
- * The message header consists of:
+ * For Gen11+, there are additional 4 registers 0x190240-0x19024C, which
+ * are, regardless on lower count, preferred over legacy ones.
   *
- * - **type**, indicates message type
- * - **code**, indicates message code, is specific for **type**
- * - **data**, indicates message data, optional, depends on **code**
- *
- * The following message **types** are supported:
- *
- * - **REQUEST**, indicates Host-to-GuC request, requested GuC action code
- *   must be priovided in **code** field. Optional action specific parameters
- *   can be provided in remaining payload registers or **data** field.
- *
- * - **RESPONSE**, indicates GuC-to-Host response from earlier GuC request,
- *   action response status will be provided in **code** field. Optional
- *   response data can be returned in remaining payload registers or **data**
- *   field.
+ * The MMIO based communication is mainly used during driver initialization
+ * phase to setup the `CTB based communication`_ that will be used afterwards.
   */
 
-#define GUC_MAX_MMIO_MSG_LEN		8
+#define GUC_MAX_MMIO_MSG_LEN		4
+
+/**
+ * DOC: MMIO HXG Message
+ *
+ * Format of the MMIO messages follows definitions of `HXG Message`_.
+ *
+ *  +---+-------+--------------------------------------------------------------+
+ *  |   | Bits  | Description                                                  |
+ *  +===+=======+==============================================================+
+ *  | 0 |  31:0 |  +--------------------------------------------------------+  |
+ *  +---+-------+  |                                                        |  |
+ *  |...|       |  |  Embedded `HXG Message`_                               |  |
+ *  +---+-------+  |                                                        |  |
+ *  | n |  31:0 |  +--------------------------------------------------------+  |
+ *  +---+-------+--------------------------------------------------------------+
+ */
 
  #endif /* _ABI_GUC_COMMUNICATION_MMIO_ABI_H */
drivers/gpu/drm/i915/gt/uc/intel_guc.c +72 -35
index f147cb389a20..6661dcb02239 100644
@@ -219,24 +219,19 @@ static u32 guc_ctl_log_params_flags(struct intel_guc *guc)
 
  	BUILD_BUG_ON(!CRASH_BUFFER_SIZE);
  	BUILD_BUG_ON(!IS_ALIGNED(CRASH_BUFFER_SIZE, UNIT));
-	BUILD_BUG_ON(!DPC_BUFFER_SIZE);
-	BUILD_BUG_ON(!IS_ALIGNED(DPC_BUFFER_SIZE, UNIT));
-	BUILD_BUG_ON(!ISR_BUFFER_SIZE);
-	BUILD_BUG_ON(!IS_ALIGNED(ISR_BUFFER_SIZE, UNIT));
+	BUILD_BUG_ON(!DEBUG_BUFFER_SIZE);
+	BUILD_BUG_ON(!IS_ALIGNED(DEBUG_BUFFER_SIZE, UNIT));
 
  	BUILD_BUG_ON((CRASH_BUFFER_SIZE / UNIT - 1) >
  			(GUC_LOG_CRASH_MASK >> GUC_LOG_CRASH_SHIFT));
-	BUILD_BUG_ON((DPC_BUFFER_SIZE / UNIT - 1) >
-			(GUC_LOG_DPC_MASK >> GUC_LOG_DPC_SHIFT));
-	BUILD_BUG_ON((ISR_BUFFER_SIZE / UNIT - 1) >
-			(GUC_LOG_ISR_MASK >> GUC_LOG_ISR_SHIFT));
+	BUILD_BUG_ON((DEBUG_BUFFER_SIZE / UNIT - 1) >
+			(GUC_LOG_DEBUG_MASK >> GUC_LOG_DEBUG_SHIFT));
 
  	flags = GUC_LOG_VALID |
  		GUC_LOG_NOTIFY_ON_HALF_FULL |
  		FLAG |
  		((CRASH_BUFFER_SIZE / UNIT - 1) << GUC_LOG_CRASH_SHIFT) |
-		((DPC_BUFFER_SIZE / UNIT - 1) << GUC_LOG_DPC_SHIFT) |
-		((ISR_BUFFER_SIZE / UNIT - 1) << GUC_LOG_ISR_SHIFT) |
+		((DEBUG_BUFFER_SIZE / UNIT - 1) << GUC_LOG_DEBUG_SHIFT) |
  		(offset << GUC_LOG_BUF_ADDR_SHIFT);
 
  	#undef UNIT
@@ -376,29 +371,27 @@ void intel_guc_fini(struct intel_guc *guc)
  /*
   * This function implements the MMIO based host to GuC interface.
   */
-int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len,
+int intel_guc_send_mmio(struct intel_guc *guc, const u32 *request, u32 len,
  			u32 *response_buf, u32 response_buf_size)
  {
+	struct drm_i915_private *i915 = guc_to_gt(guc)->i915;
  	struct intel_uncore *uncore = guc_to_gt(guc)->uncore;
-	u32 status;
+	u32 header;
  	int i;
  	int ret;
 
  	GEM_BUG_ON(!len);
  	GEM_BUG_ON(len > guc->send_regs.count);
 
-	/* We expect only action code */
-	GEM_BUG_ON(*action & ~INTEL_GUC_MSG_CODE_MASK);
-
-	/* If CT is available, we expect to use MMIO only during init/fini */
-	GEM_BUG_ON(*action != INTEL_GUC_ACTION_REGISTER_COMMAND_TRANSPORT_BUFFER &&
-		   *action != INTEL_GUC_ACTION_DEREGISTER_COMMAND_TRANSPORT_BUFFER);
+	GEM_BUG_ON(FIELD_GET(GUC_HXG_MSG_0_ORIGIN, request[0]) != GUC_HXG_ORIGIN_HOST);
+	GEM_BUG_ON(FIELD_GET(GUC_HXG_MSG_0_TYPE, request[0]) != GUC_HXG_TYPE_REQUEST);
 
  	mutex_lock(&guc->send_mutex);
  	intel_uncore_forcewake_get(uncore, guc->send_regs.fw_domains);
 
+retry:
  	for (i = 0; i < len; i++)
-		intel_uncore_write(uncore, guc_send_reg(guc, i), action[i]);
+		intel_uncore_write(uncore, guc_send_reg(guc, i), request[i]);
 
  	intel_uncore_posting_read(uncore, guc_send_reg(guc, i - 1));
 
@@ -410,30 +403,74 @@ int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len,
  	 */
  	ret = __intel_wait_for_register_fw(uncore,
  					   guc_send_reg(guc, 0),
-					   INTEL_GUC_MSG_TYPE_MASK,
-					   INTEL_GUC_MSG_TYPE_RESPONSE <<
-					   INTEL_GUC_MSG_TYPE_SHIFT,
-					   10, 10, &status);
-	/* If GuC explicitly returned an error, convert it to -EIO */
-	if (!ret && !INTEL_GUC_MSG_IS_RESPONSE_SUCCESS(status))
-		ret = -EIO;
+					   GUC_HXG_MSG_0_ORIGIN,
+					   FIELD_PREP(GUC_HXG_MSG_0_ORIGIN,
+						      GUC_HXG_ORIGIN_GUC),
+					   10, 10, &header);
+	if (unlikely(ret)) {
+timeout:
+		drm_err(&i915->drm, "mmio request %#x: no reply %x\n",
+			request[0], header);
+		goto out;
+	}
 
-	if (ret) {
-		DRM_ERROR("MMIO: GuC action %#x failed with error %d %#x\n",
-			  action[0], ret, status);
+	if (FIELD_GET(GUC_HXG_MSG_0_TYPE, header) == GUC_HXG_TYPE_NO_RESPONSE_BUSY) {
+#define done ({ header = intel_uncore_read(uncore, guc_send_reg(guc, 0)); \
+		FIELD_GET(GUC_HXG_MSG_0_ORIGIN, header) != GUC_HXG_ORIGIN_GUC || \
+		FIELD_GET(GUC_HXG_MSG_0_TYPE, header) != GUC_HXG_TYPE_NO_RESPONSE_BUSY; })
+
+		ret = wait_for(done, 1000);
+		if (unlikely(ret))
+			goto timeout;
+		if (unlikely(FIELD_GET(GUC_HXG_MSG_0_ORIGIN, header) !=
+				       GUC_HXG_ORIGIN_GUC))
+			goto proto;
+#undef done
+	}
+
+	if (FIELD_GET(GUC_HXG_MSG_0_TYPE, header) == GUC_HXG_TYPE_NO_RESPONSE_RETRY) {
+		u32 reason = FIELD_GET(GUC_HXG_RETRY_MSG_0_REASON, header);
+
+		drm_dbg(&i915->drm, "mmio request %#x: retrying, reason %u\n",
+			request[0], reason);
+		goto retry;
+	}
+
+	if (FIELD_GET(GUC_HXG_MSG_0_TYPE, header) == GUC_HXG_TYPE_RESPONSE_FAILURE) {
+		u32 hint = FIELD_GET(GUC_HXG_FAILURE_MSG_0_HINT, header);
+		u32 error = FIELD_GET(GUC_HXG_FAILURE_MSG_0_ERROR, header);
+
+		drm_err(&i915->drm, "mmio request %#x: failure %x/%u\n",
+			request[0], error, hint);
+		ret = -ENXIO;
+		goto out;
+	}
+
+	if (FIELD_GET(GUC_HXG_MSG_0_TYPE, header) != GUC_HXG_TYPE_RESPONSE_SUCCESS) {
+proto:
+		drm_err(&i915->drm, "mmio request %#x: unexpected reply %#x\n",
+			request[0], header);
+		ret = -EPROTO;
  		goto out;
  	}
 
  	if (response_buf) {
-		int count = min(response_buf_size, guc->send_regs.count - 1);
+		int count = min(response_buf_size, guc->send_regs.count);
 
-		for (i = 0; i < count; i++)
+		GEM_BUG_ON(!count);
+
+		response_buf[0] = header;
+
+		for (i = 1; i < count; i++)
  			response_buf[i] = intel_uncore_read(uncore,
-							    guc_send_reg(guc, i + 1));
-	}
+							    guc_send_reg(guc, i));
 
-	/* Use data from the GuC response as our return value */
-	ret = INTEL_GUC_MSG_TO_DATA(status);
+		/* Use number of copied dwords as our return value */
+		ret = count;
+	} else {
+		/* Use data from the GuC response as our return value */
+		ret = FIELD_GET(GUC_HXG_RESPONSE_MSG_0_DATA0, header);
+	}
 
  out:
  	intel_uncore_forcewake_put(uncore, guc->send_regs.fw_domains);
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +4 -41
index 9abfbc6edbd6..b82145652d57 100644
@@ -24,10 +24,6 @@
   *      +---------------------------------------+
   *      | guc_gt_system_info                    |
   *      +---------------------------------------+
- *      | guc_clients_info                      |
- *      +---------------------------------------+
- *      | guc_ct_pool_entry[size]               |
- *      +---------------------------------------+
   *      | padding                               |
   *      +---------------------------------------+ <== 4K aligned
   *      | private data                          |
@@ -39,8 +35,6 @@ struct __guc_ads_blob {
  	struct guc_ads ads;
  	struct guc_policies policies;
  	struct guc_gt_system_info system_info;
-	struct guc_clients_info clients_info;
-	struct guc_ct_pool_entry ct_pool[GUC_CT_POOL_SIZE];
  } __packed;
 
  static u32 guc_ads_private_data_size(struct intel_guc *guc)
@@ -59,38 +53,15 @@ static u32 guc_ads_blob_size(struct intel_guc *guc)
  	       guc_ads_private_data_size(guc);
  }
 
-static void guc_policy_init(struct guc_policy *policy)
-{
-	policy->execution_quantum = POLICY_DEFAULT_EXECUTION_QUANTUM_US;
-	policy->preemption_time = POLICY_DEFAULT_PREEMPTION_TIME_US;
-	policy->fault_time = POLICY_DEFAULT_FAULT_TIME_US;
-	policy->policy_flags = 0;
-}
-
  static void guc_policies_init(struct guc_policies *policies)
  {
-	struct guc_policy *policy;
-	u32 p, i;
-
-	policies->dpc_promote_time = POLICY_DEFAULT_DPC_PROMOTE_TIME_US;
-	policies->max_num_work_items = POLICY_MAX_NUM_WI;
-
-	for (p = 0; p < GUC_CLIENT_PRIORITY_NUM; p++) {
-		for (i = 0; i < GUC_MAX_ENGINE_CLASSES; i++) {
-			policy = &policies->policy[p][i];
-
-			guc_policy_init(policy);
-		}
-	}
-
+	policies->dpc_promote_time = GLOBAL_POLICY_DEFAULT_DPC_PROMOTE_TIME_US;
+	policies->max_num_work_items = GLOBAL_POLICY_MAX_NUM_WI;
+	/* Disable automatic resets as not yet supported. */
+	policies->global_flags = GLOBAL_POLICY_DISABLE_ENGINE_RESET;
  	policies->is_valid = 1;
  }
 
-static void guc_ct_pool_entries_init(struct guc_ct_pool_entry *pool, u32 num)
-{
-	memset(pool, 0, num * sizeof(*pool));
-}
-
  static void guc_mapping_table_init(struct intel_gt *gt,
  				   struct guc_gt_system_info *system_info)
  {
@@ -178,17 +149,9 @@ static void __guc_ads_init(struct intel_guc *guc)
 
  	base = intel_guc_ggtt_offset(guc, guc->ads_vma);
 
-	/* Clients info  */
-	guc_ct_pool_entries_init(blob->ct_pool, ARRAY_SIZE(blob->ct_pool));
-
-	blob->clients_info.clients_num = 1;
-	blob->clients_info.ct_pool_addr = base + ptr_offset(blob, ct_pool);
-	blob->clients_info.ct_pool_count = ARRAY_SIZE(blob->ct_pool);
-
  	/* ADS */
  	blob->ads.scheduler_policies = base + ptr_offset(blob, policies);
  	blob->ads.gt_system_info = base + ptr_offset(blob, system_info);
-	blob->ads.clients_info = base + ptr_offset(blob, clients_info);
 
  	/* Private Data */
  	blob->ads.private_data = base + guc_ads_private_data_offset(guc);
drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +169 -187
index 8f7b148fef58..43409044528e 100644
@@ -103,61 +103,66 @@ void intel_guc_ct_init_early(struct intel_guc_ct *ct)
  static inline const char *guc_ct_buffer_type_to_str(u32 type)
  {
  	switch (type) {
-	case INTEL_GUC_CT_BUFFER_TYPE_SEND:
+	case GUC_CTB_TYPE_HOST2GUC:
  		return "SEND";
-	case INTEL_GUC_CT_BUFFER_TYPE_RECV:
+	case GUC_CTB_TYPE_GUC2HOST:
  		return "RECV";
  	default:
  		return "<invalid>";
  	}
  }
 
-static void guc_ct_buffer_desc_init(struct guc_ct_buffer_desc *desc,
-				    u32 cmds_addr, u32 size)
+static void guc_ct_buffer_desc_init(struct guc_ct_buffer_desc *desc)
  {
  	memset(desc, 0, sizeof(*desc));
-	desc->addr = cmds_addr;
-	desc->size = size;
-	desc->owner = CTB_OWNER_HOST;
  }
 
-static void guc_ct_buffer_reset(struct intel_guc_ct_buffer *ctb, u32 cmds_addr)
+static void guc_ct_buffer_reset(struct intel_guc_ct_buffer *ctb)
  {
-	guc_ct_buffer_desc_init(ctb->desc, cmds_addr, ctb->size);
+	ctb->broken = false;
+	guc_ct_buffer_desc_init(ctb->desc);
  }
 
  static void guc_ct_buffer_init(struct intel_guc_ct_buffer *ctb,
  			       struct guc_ct_buffer_desc *desc,
-			       u32 *cmds, u32 size)
+			       u32 *cmds, u32 size_in_bytes)
  {
-	GEM_BUG_ON(size % 4);
+	GEM_BUG_ON(size_in_bytes % 4);
 
  	ctb->desc = desc;
  	ctb->cmds = cmds;
-	ctb->size = size;
+	ctb->size = size_in_bytes / 4;
 
-	guc_ct_buffer_reset(ctb, 0);
+	guc_ct_buffer_reset(ctb);
  }
 
-static int guc_action_register_ct_buffer(struct intel_guc *guc,
-					 u32 desc_addr,
-					 u32 type)
+static int guc_action_register_ct_buffer(struct intel_guc *guc, u32 type,
+					 u32 desc_addr, u32 buff_addr, u32 size)
  {
-	u32 action[] = {
-		INTEL_GUC_ACTION_REGISTER_COMMAND_TRANSPORT_BUFFER,
-		desc_addr,
-		sizeof(struct guc_ct_buffer_desc),
-		type
+	u32 request[HOST2GUC_REGISTER_CTB_REQUEST_MSG_LEN] = {
+		FIELD_PREP(GUC_HXG_MSG_0_ORIGIN, GUC_HXG_ORIGIN_HOST) |
+		FIELD_PREP(GUC_HXG_MSG_0_TYPE, GUC_HXG_TYPE_REQUEST) |
+		FIELD_PREP(GUC_HXG_REQUEST_MSG_0_ACTION, GUC_ACTION_HOST2GUC_REGISTER_CTB),
+		FIELD_PREP(HOST2GUC_REGISTER_CTB_REQUEST_MSG_1_SIZE, size / SZ_4K - 1) |
+		FIELD_PREP(HOST2GUC_REGISTER_CTB_REQUEST_MSG_1_TYPE, type),
+		FIELD_PREP(HOST2GUC_REGISTER_CTB_REQUEST_MSG_2_DESC_ADDR, desc_addr),
+		FIELD_PREP(HOST2GUC_REGISTER_CTB_REQUEST_MSG_3_BUFF_ADDR, buff_addr),
  	};
 
-	/* Can't use generic send(), CT registration must go over MMIO */
-	return intel_guc_send_mmio(guc, action, ARRAY_SIZE(action), NULL, 0);
+	GEM_BUG_ON(type != GUC_CTB_TYPE_HOST2GUC && type != GUC_CTB_TYPE_GUC2HOST);
+	GEM_BUG_ON(size % SZ_4K);
+
+	/* CT registration must go over MMIO */
+	return intel_guc_send_mmio(guc, request, ARRAY_SIZE(request), NULL, 0);
  }
 
-static int ct_register_buffer(struct intel_guc_ct *ct, u32 desc_addr, u32 type)
+static int ct_register_buffer(struct intel_guc_ct *ct, u32 type,
+			      u32 desc_addr, u32 buff_addr, u32 size)
  {
-	int err = guc_action_register_ct_buffer(ct_to_guc(ct), desc_addr, type);
+	int err;
 
+	err = guc_action_register_ct_buffer(ct_to_guc(ct), type,
+					    desc_addr, buff_addr, size);
  	if (unlikely(err))
  		CT_ERROR(ct, "Failed to register %s buffer (err=%d)\n",
  			 guc_ct_buffer_type_to_str(type), err);
@@ -166,14 +171,17 @@ static int ct_register_buffer(struct intel_guc_ct *ct, u32 desc_addr, u32 type)
 
  static int guc_action_deregister_ct_buffer(struct intel_guc *guc, u32 type)
  {
-	u32 action[] = {
-		INTEL_GUC_ACTION_DEREGISTER_COMMAND_TRANSPORT_BUFFER,
-		CTB_OWNER_HOST,
-		type
+	u32 request[HOST2GUC_DEREGISTER_CTB_REQUEST_MSG_LEN] = {
+		FIELD_PREP(GUC_HXG_MSG_0_ORIGIN, GUC_HXG_ORIGIN_HOST) |
+		FIELD_PREP(GUC_HXG_MSG_0_TYPE, GUC_HXG_TYPE_REQUEST) |
+		FIELD_PREP(GUC_HXG_REQUEST_MSG_0_ACTION, GUC_ACTION_HOST2GUC_DEREGISTER_CTB),
+		FIELD_PREP(HOST2GUC_DEREGISTER_CTB_REQUEST_MSG_1_TYPE, type),
  	};
 
-	/* Can't use generic send(), CT deregistration must go over MMIO */
-	return intel_guc_send_mmio(guc, action, ARRAY_SIZE(action), NULL, 0);
+	GEM_BUG_ON(type != GUC_CTB_TYPE_HOST2GUC && type != GUC_CTB_TYPE_GUC2HOST);
+
+	/* CT deregistration must go over MMIO */
+	return intel_guc_send_mmio(guc, request, ARRAY_SIZE(request), NULL, 0);
  }
 
  static int ct_deregister_buffer(struct intel_guc_ct *ct, u32 type)
@@ -261,7 +269,7 @@ void intel_guc_ct_fini(struct intel_guc_ct *ct)
  int intel_guc_ct_enable(struct intel_guc_ct *ct)
  {
  	struct intel_guc *guc = ct_to_guc(ct);
-	u32 base, cmds;
+	u32 base, desc, cmds;
  	void *blob;
  	int err;
 
@@ -277,23 +285,26 @@ int intel_guc_ct_enable(struct intel_guc_ct *ct)
  	GEM_BUG_ON(blob != ct->ctbs.send.desc);
 
  	/* (re)initialize descriptors */
-	cmds = base + ptrdiff(ct->ctbs.send.cmds, blob);
-	guc_ct_buffer_reset(&ct->ctbs.send, cmds);
-
-	cmds = base + ptrdiff(ct->ctbs.recv.cmds, blob);
-	guc_ct_buffer_reset(&ct->ctbs.recv, cmds);
+	guc_ct_buffer_reset(&ct->ctbs.send);
+	guc_ct_buffer_reset(&ct->ctbs.recv);
 
  	/*
  	 * Register both CT buffers starting with RECV buffer.
  	 * Descriptors are in first half of the blob.
  	 */
-	err = ct_register_buffer(ct, base + ptrdiff(ct->ctbs.recv.desc, blob),
-				 INTEL_GUC_CT_BUFFER_TYPE_RECV);
+	desc = base + ptrdiff(ct->ctbs.recv.desc, blob);
+	cmds = base + ptrdiff(ct->ctbs.recv.cmds, blob);
+	err = ct_register_buffer(ct, GUC_CTB_TYPE_GUC2HOST,
+				 desc, cmds, ct->ctbs.recv.size * 4);
+
  	if (unlikely(err))
  		goto err_out;
 
-	err = ct_register_buffer(ct, base + ptrdiff(ct->ctbs.send.desc, blob),
-				 INTEL_GUC_CT_BUFFER_TYPE_SEND);
+	desc = base + ptrdiff(ct->ctbs.send.desc, blob);
+	cmds = base + ptrdiff(ct->ctbs.send.cmds, blob);
+	err = ct_register_buffer(ct, GUC_CTB_TYPE_HOST2GUC,
+				 desc, cmds, ct->ctbs.send.size * 4);
+
  	if (unlikely(err))
  		goto err_deregister;
 
@@ -302,7 +313,7 @@ int intel_guc_ct_enable(struct intel_guc_ct *ct)
  	return 0;
 
  err_deregister:
-	ct_deregister_buffer(ct, INTEL_GUC_CT_BUFFER_TYPE_RECV);
+	ct_deregister_buffer(ct, GUC_CTB_TYPE_GUC2HOST);
  err_out:
  	CT_PROBE_ERROR(ct, "Failed to enable CTB (%pe)\n", ERR_PTR(err));
  	return err;
@@ -321,8 +332,8 @@ void intel_guc_ct_disable(struct intel_guc_ct *ct)
  	ct->enabled = false;
 
  	if (intel_guc_is_fw_running(guc)) {
-		ct_deregister_buffer(ct, INTEL_GUC_CT_BUFFER_TYPE_SEND);
-		ct_deregister_buffer(ct, INTEL_GUC_CT_BUFFER_TYPE_RECV);
+		ct_deregister_buffer(ct, GUC_CTB_TYPE_HOST2GUC);
+		ct_deregister_buffer(ct, GUC_CTB_TYPE_GUC2HOST);
  	}
  }
 
@@ -354,24 +365,6 @@ static void write_barrier(struct intel_guc_ct *ct)
  	}
  }
 
-/**
- * DOC: CTB Host to GuC request
- *
- * Format of the CTB Host to GuC request message is as follows::
- *
- *      +------------+---------+---------+---------+---------+
- *      |   msg[0]   |   [1]   |   [2]   |   ...   |  [n-1]  |
- *      +------------+---------+---------+---------+---------+
- *      |   MESSAGE  |       MESSAGE PAYLOAD                 |
- *      +   HEADER   +---------+---------+---------+---------+
- *      |            |    0    |    1    |   ...   |    n    |
- *      +============+=========+=========+=========+=========+
- *      |  len >= 1  |  FENCE  |     request specific data   |
- *      +------+-----+---------+---------+---------+---------+
- *
- *                   ^-----------------len-------------------^
- */
-
  static int ct_write(struct intel_guc_ct *ct,
  		    const u32 *action,
  		    u32 len /* in dwords */,
@@ -384,20 +377,22 @@ static int ct_write(struct intel_guc_ct *ct,
  	u32 size = ctb->size;
  	u32 used;
  	u32 header;
+	u32 hxg;
  	u32 *cmds = ctb->cmds;
  	unsigned int i;
 
-	if (unlikely(desc->is_in_error))
+	if (unlikely(ctb->broken))
  		return -EPIPE;
 
-	if (unlikely(!IS_ALIGNED(head | tail, 4) ||
-		     (tail | head) >= size))
+	if (unlikely(desc->status))
  		goto corrupted;
 
-	/* later calculations will be done in dwords */
-	head /= 4;
-	tail /= 4;
-	size /= 4;
+	if (unlikely((tail | head) >= size)) {
+		CT_ERROR(ct, "Invalid offsets head=%u tail=%u (size=%u)\n",
+			 head, tail, size);
+		desc->status |= GUC_CTB_STATUS_OVERFLOW;
+		goto corrupted;
+	}
 
  	/*
  	 * tail == head condition indicates empty. GuC FW does not support
@@ -413,22 +408,25 @@ static int ct_write(struct intel_guc_ct *ct,
  		return -ENOSPC;
 
  	/*
-	 * Write the message. The format is the following:
-	 * DW0: header (including action code)
-	 * DW1: fence
-	 * DW2+: action data
+	 * dw0: CT header (including fence)
+	 * dw1: HXG header (including action code)
+	 * dw2+: action data
  	 */
-	header = (len << GUC_CT_MSG_LEN_SHIFT) |
-		 GUC_CT_MSG_SEND_STATUS |
-		 (action[0] << GUC_CT_MSG_ACTION_SHIFT);
+	header = FIELD_PREP(GUC_CTB_MSG_0_FORMAT, GUC_CTB_FORMAT_HXG) |
+		 FIELD_PREP(GUC_CTB_MSG_0_NUM_DWORDS, len) |
+		 FIELD_PREP(GUC_CTB_MSG_0_FENCE, fence);
 
-	CT_DEBUG(ct, "writing %*ph %*ph %*ph\n",
-		 4, &header, 4, &fence, 4 * (len - 1), &action[1]);
+	hxg = FIELD_PREP(GUC_HXG_MSG_0_TYPE, GUC_HXG_TYPE_REQUEST) |
+	      FIELD_PREP(GUC_HXG_REQUEST_MSG_0_ACTION |
+			 GUC_HXG_REQUEST_MSG_0_DATA0, action[0]);
+
+	CT_DEBUG(ct, "writing (tail %u) %*ph %*ph %*ph\n",
+		 tail, 4, &header, 4, &hxg, 4 * (len - 1), &action[1]);
 
  	cmds[tail] = header;
  	tail = (tail + 1) % size;
 
-	cmds[tail] = fence;
+	cmds[tail] = hxg;
  	tail = (tail + 1) % size;
 
  	for (i = 1; i < len; i++) {
@@ -443,14 +441,15 @@ static int ct_write(struct intel_guc_ct *ct,
  	 */
  	write_barrier(ct);
 
-	/* now update desc tail (back in bytes) */
-	desc->tail = tail * 4;
+	/* now update descriptor */
+	WRITE_ONCE(desc->tail, tail);
+
  	return 0;
 
  corrupted:
-	CT_ERROR(ct, "Corrupted descriptor addr=%#x head=%u tail=%u size=%u\n",
-		 desc->addr, desc->head, desc->tail, desc->size);
-	desc->is_in_error = 1;
+	CT_ERROR(ct, "Corrupted descriptor head=%u tail=%u status=%#x\n",
+		 desc->head, desc->tail, desc->status);
+	ctb->broken = true;
  	return -EPIPE;
  }
 
@@ -477,7 +476,9 @@ static int wait_for_ct_request_update(struct ct_request *req, u32 *status)
  	 * up to that length of time, then switch to a slower sleep-wait loop.
  	 * No GuC command should ever take longer than 10ms.
  	 */
-#define done INTEL_GUC_MSG_IS_RESPONSE(READ_ONCE(req->status))
+#define done \
+	(FIELD_GET(GUC_HXG_MSG_0_ORIGIN, READ_ONCE(req->status)) == \
+	 GUC_HXG_ORIGIN_GUC)
  	err = wait_for_us(done, 10);
  	if (err)
  		err = wait_for(done, 10);
@@ -532,21 +533,21 @@ static int ct_send(struct intel_guc_ct *ct,
  	if (unlikely(err))
  		goto unlink;
 
-	if (!INTEL_GUC_MSG_IS_RESPONSE_SUCCESS(*status)) {
+	if (FIELD_GET(GUC_HXG_MSG_0_TYPE, *status) != GUC_HXG_TYPE_RESPONSE_SUCCESS) {
  		err = -EIO;
  		goto unlink;
  	}
 
  	if (response_buf) {
  		/* There shall be no data in the status */
-		WARN_ON(INTEL_GUC_MSG_TO_DATA(request.status));
+		WARN_ON(FIELD_GET(GUC_HXG_RESPONSE_MSG_0_DATA0, request.status));
  		/* Return actual response len */
  		err = request.response_len;
  	} else {
  		/* There shall be no response payload */
  		WARN_ON(request.response_len);
  		/* Return data decoded from the status dword */
-		err = INTEL_GUC_MSG_TO_DATA(*status);
+		err = FIELD_GET(GUC_HXG_RESPONSE_MSG_0_DATA0, *status);
  	}
 
  unlink:
@@ -583,21 +584,6 @@ int intel_guc_ct_send(struct intel_guc_ct *ct, const u32 *action, u32 len,
  	return ret;
  }
 
-static inline unsigned int ct_header_get_len(u32 header)
-{
-	return (header >> GUC_CT_MSG_LEN_SHIFT) & GUC_CT_MSG_LEN_MASK;
-}
-
-static inline unsigned int ct_header_get_action(u32 header)
-{
-	return (header >> GUC_CT_MSG_ACTION_SHIFT) & GUC_CT_MSG_ACTION_MASK;
-}
-
-static inline bool ct_header_is_response(u32 header)
-{
-	return !!(header & GUC_CT_MSG_IS_RESPONSE);
-}
-
  static struct ct_incoming_msg *ct_alloc_msg(u32 num_dwords)
  {
  	struct ct_incoming_msg *msg;
@@ -630,17 +616,18 @@ static int ct_read(struct intel_guc_ct *ct, struct ct_incoming_msg **msg)
  	unsigned int i;
  	u32 header;
 
-	if (unlikely(desc->is_in_error))
+	if (unlikely(ctb->broken))
  		return -EPIPE;
 
-	if (unlikely(!IS_ALIGNED(head | tail, 4) ||
-		     (tail | head) >= size))
+	if (unlikely(desc->status))
  		goto corrupted;
 
-	/* later calculations will be done in dwords */
-	head /= 4;
-	tail /= 4;
-	size /= 4;
+	if (unlikely((tail | head) >= size)) {
+		CT_ERROR(ct, "Invalid offsets head=%u tail=%u (size=%u)\n",
+			 head, tail, size);
+		desc->status |= GUC_CTB_STATUS_OVERFLOW;
+		goto corrupted;
+	}
 
  	/* tail == head condition indicates empty */
  	available = tail - head;
@@ -659,7 +646,7 @@ static int ct_read(struct intel_guc_ct *ct, struct ct_incoming_msg **msg)
  	head = (head + 1) % size;
 
  	/* message len with header */
-	len = ct_header_get_len(header) + 1;
+	len = FIELD_GET(GUC_CTB_MSG_0_NUM_DWORDS, header) + GUC_CTB_MSG_MIN_LEN;
  	if (unlikely(len > (u32)available)) {
  		CT_ERROR(ct, "Incomplete message %*ph %*ph %*ph\n",
  			 4, &header,
@@ -667,6 +654,7 @@ static int ct_read(struct intel_guc_ct *ct, struct ct_incoming_msg **msg)
  			      size - head : available - 1), &cmds[head],
  			 4 * (head + available - 1 > size ?
  			      available - 1 - size + head : 0), &cmds[0]);
+		desc->status |= GUC_CTB_STATUS_UNDERFLOW;
  		goto corrupted;
  	}
 
@@ -689,65 +677,36 @@ static int ct_read(struct intel_guc_ct *ct, struct ct_incoming_msg **msg)
  	}
  	CT_DEBUG(ct, "received %*ph\n", 4 * len, (*msg)->msg);
 
-	desc->head = head * 4;
+	/* now update descriptor */
+	WRITE_ONCE(desc->head, head);
+
  	return available - len;
 
  corrupted:
-	CT_ERROR(ct, "Corrupted descriptor addr=%#x head=%u tail=%u size=%u\n",
-		 desc->addr, desc->head, desc->tail, desc->size);
-	desc->is_in_error = 1;
+	CT_ERROR(ct, "Corrupted descriptor head=%u tail=%u status=%#x\n",
+		 desc->head, desc->tail, desc->status);
+	ctb->broken = true;
  	return -EPIPE;
  }
 
-/**
- * DOC: CTB GuC to Host response
- *
- * Format of the CTB GuC to Host response message is as follows::
- *
- *      +------------+---------+---------+---------+---------+---------+
- *      |   msg[0]   |   [1]   |   [2]   |   [3]   |   ...   |  [n-1]  |
- *      +------------+---------+---------+---------+---------+---------+
- *      |   MESSAGE  |       MESSAGE PAYLOAD                           |
- *      +   HEADER   +---------+---------+---------+---------+---------+
- *      |            |    0    |    1    |    2    |   ...   |    n    |
- *      +============+=========+=========+=========+=========+=========+
- *      |  len >= 2  |  FENCE  |  STATUS |   response specific data    |
- *      +------+-----+---------+---------+---------+---------+---------+
- *
- *                   ^-----------------------len-----------------------^
- */
-
  static int ct_handle_response(struct intel_guc_ct *ct, struct ct_incoming_msg *response)
  {
-	u32 header = response->msg[0];
-	u32 len = ct_header_get_len(header);
-	u32 fence;
-	u32 status;
-	u32 datalen;
+	u32 len = FIELD_GET(GUC_CTB_MSG_0_NUM_DWORDS, response->msg[0]);
+	u32 fence = FIELD_GET(GUC_CTB_MSG_0_FENCE, response->msg[0]);
+	const u32 *hxg = &response->msg[GUC_CTB_MSG_MIN_LEN];
+	const u32 *data = &hxg[GUC_HXG_MSG_MIN_LEN];
+	u32 datalen = len - GUC_HXG_MSG_MIN_LEN;
  	struct ct_request *req;
  	unsigned long flags;
  	bool found = false;
  	int err = 0;
 
-	GEM_BUG_ON(!ct_header_is_response(header));
-
-	/* Response payload shall at least include fence and status */
-	if (unlikely(len < 2)) {
-		CT_ERROR(ct, "Corrupted response (len %u)\n", len);
-		return -EPROTO;
-	}
-
-	fence = response->msg[1];
-	status = response->msg[2];
-	datalen = len - 2;
-
-	/* Format of the status follows RESPONSE message */
-	if (unlikely(!INTEL_GUC_MSG_IS_RESPONSE(status))) {
-		CT_ERROR(ct, "Corrupted response (status %#x)\n", status);
-		return -EPROTO;
-	}
+	GEM_BUG_ON(len < GUC_HXG_MSG_MIN_LEN);
+	GEM_BUG_ON(FIELD_GET(GUC_HXG_MSG_0_ORIGIN, hxg[0]) != GUC_HXG_ORIGIN_GUC);
+	GEM_BUG_ON(FIELD_GET(GUC_HXG_MSG_0_TYPE, hxg[0]) != GUC_HXG_TYPE_RESPONSE_SUCCESS &&
+		   FIELD_GET(GUC_HXG_MSG_0_TYPE, hxg[0]) != GUC_HXG_TYPE_RESPONSE_FAILURE);
 
-	CT_DEBUG(ct, "response fence %u status %#x\n", fence, status);
+	CT_DEBUG(ct, "response fence %u status %#x\n", fence, hxg[0]);
 
  	spin_lock_irqsave(&ct->requests.lock, flags);
  	list_for_each_entry(req, &ct->requests.pending, link) {
@@ -763,9 +722,9 @@ static int ct_handle_response(struct intel_guc_ct *ct, struct ct_incoming_msg *r
  			err = -EMSGSIZE;
  		}
  		if (datalen)
-			memcpy(req->response_buf, response->msg + 3, 4 * datalen);
+			memcpy(req->response_buf, data, 4 * datalen);
  		req->response_len = datalen;
-		WRITE_ONCE(req->status, status);
+		WRITE_ONCE(req->status, hxg[0]);
  		found = true;
  		break;
  	}
@@ -786,14 +745,16 @@ static int ct_handle_response(struct intel_guc_ct *ct, struct ct_incoming_msg *r
  static int ct_process_request(struct intel_guc_ct *ct, struct ct_incoming_msg *request)
  {
  	struct intel_guc *guc = ct_to_guc(ct);
-	u32 header, action, len;
+	const u32 *hxg;
  	const u32 *payload;
+	u32 hxg_len, action, len;
  	int ret;
 
-	header = request->msg[0];
-	payload = &request->msg[1];
-	action = ct_header_get_action(header);
-	len = ct_header_get_len(header);
+	hxg = &request->msg[GUC_CTB_MSG_MIN_LEN];
+	hxg_len = request->size - GUC_CTB_MSG_MIN_LEN;
+	payload = &hxg[GUC_HXG_MSG_MIN_LEN];
+	action = FIELD_GET(GUC_HXG_EVENT_MSG_0_ACTION, hxg[0]);
+	len = hxg_len - GUC_HXG_MSG_MIN_LEN;
 
  	CT_DEBUG(ct, "request %x %*ph\n", action, 4 * len, payload);
 
@@ -855,29 +816,12 @@ static void ct_incoming_request_worker_func(struct work_struct *w)
  		queue_work(system_unbound_wq, &ct->requests.worker);
  }
 
-/**
- * DOC: CTB GuC to Host request
- *
- * Format of the CTB GuC to Host request message is as follows::
- *
- *      +------------+---------+---------+---------+---------+---------+
- *      |   msg[0]   |   [1]   |   [2]   |   [3]   |   ...   |  [n-1]  |
- *      +------------+---------+---------+---------+---------+---------+
- *      |   MESSAGE  |       MESSAGE PAYLOAD                           |
- *      +   HEADER   +---------+---------+---------+---------+---------+
- *      |            |    0    |    1    |    2    |   ...   |    n    |
- *      +============+=========+=========+=========+=========+=========+
- *      |     len    |            request specific data                |
- *      +------+-----+---------+---------+---------+---------+---------+
- *
- *                   ^-----------------------len-----------------------^
- */
-
-static int ct_handle_request(struct intel_guc_ct *ct, struct ct_incoming_msg *request)
+static int ct_handle_event(struct intel_guc_ct *ct, struct ct_incoming_msg *request)
  {
+	const u32 *hxg = &request->msg[GUC_CTB_MSG_MIN_LEN];
  	unsigned long flags;
 
-	GEM_BUG_ON(ct_header_is_response(request->msg[0]));
+	GEM_BUG_ON(FIELD_GET(GUC_HXG_MSG_0_TYPE, hxg[0]) != GUC_HXG_TYPE_EVENT);
 
  	spin_lock_irqsave(&ct->requests.lock, flags);
  	list_add_tail(&request->link, &ct->requests.incoming);
@@ -887,15 +831,53 @@ static int ct_handle_request(struct intel_guc_ct *ct, struct ct_incoming_msg *re
  	return 0;
  }
 
-static void ct_handle_msg(struct intel_guc_ct *ct, struct ct_incoming_msg *msg)
+static int ct_handle_hxg(struct intel_guc_ct *ct, struct ct_incoming_msg *msg)
  {
-	u32 header = msg->msg[0];
+	u32 origin, type;
+	u32 *hxg;
  	int err;
 
-	if (ct_header_is_response(header))
+	if (unlikely(msg->size < GUC_CTB_HXG_MSG_MIN_LEN))
+		return -EBADMSG;
+
+	hxg = &msg->msg[GUC_CTB_MSG_MIN_LEN];
+
+	origin = FIELD_GET(GUC_HXG_MSG_0_ORIGIN, hxg[0]);
+	if (unlikely(origin != GUC_HXG_ORIGIN_GUC)) {
+		err = -EPROTO;
+		goto failed;
+	}
+
+	type = FIELD_GET(GUC_HXG_MSG_0_TYPE, hxg[0]);
+	switch (type) {
+	case GUC_HXG_TYPE_EVENT:
+		err = ct_handle_event(ct, msg);
+		break;
+	case GUC_HXG_TYPE_RESPONSE_SUCCESS:
+	case GUC_HXG_TYPE_RESPONSE_FAILURE:
  		err = ct_handle_response(ct, msg);
+		break;
+	default:
+		err = -EOPNOTSUPP;
+	}
+
+	if (unlikely(err)) {
+failed:
+		CT_ERROR(ct, "Failed to handle HXG message (%pe) %*ph\n",
+			 ERR_PTR(err), 4 * GUC_HXG_MSG_MIN_LEN, hxg);
+	}
+	return err;
+}
+
+static void ct_handle_msg(struct intel_guc_ct *ct, struct ct_incoming_msg *msg)
+{
+	u32 format = FIELD_GET(GUC_CTB_MSG_0_FORMAT, msg->msg[0]);
+	int err;
+
+	if (format == GUC_CTB_FORMAT_HXG)
+		err = ct_handle_hxg(ct, msg);
  	else
-		err = ct_handle_request(ct, msg);
+		err = -EOPNOTSUPP;
 
  	if (unlikely(err)) {
  		CT_ERROR(ct, "Failed to process CT message (%pe) %*ph\n",
drivers/gpu/drm/i915/gt/uc/intel_guc_ct.h +4 -2
index cb222f202301..1ae2dde6db93 100644
@@ -31,13 +31,15 @@ struct intel_guc;
   * @lock: protects access to the commands buffer and buffer descriptor
   * @desc: pointer to the buffer descriptor
   * @cmds: pointer to the commands buffer
- * @size: size of the commands buffer
+ * @size: size of the commands buffer in dwords
+ * @broken: flag to indicate if descriptor data is broken
   */
  struct intel_guc_ct_buffer {
  	spinlock_t lock;
  	struct guc_ct_buffer_desc *desc;
  	u32 *cmds;
  	u32 size;
+	bool broken;
  };
 
 
@@ -59,7 +61,7 @@ struct intel_guc_ct {
  	struct tasklet_struct receive_tasklet;
 
  	struct {
-		u32 last_fence; /* last fence used to send request */
+		u16 last_fence; /* last fence used to send request */
 
  		spinlock_t lock; /* protects pending requests list */
  		struct list_head pending; /* requests waiting for response */
drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +11 -64
index e9a9d85e2aa3..617ec601648d 100644
@@ -81,10 +81,8 @@
  #define   GUC_LOG_ALLOC_IN_MEGABYTE	(1 << 3)
  #define   GUC_LOG_CRASH_SHIFT		4
  #define   GUC_LOG_CRASH_MASK		(0x3 << GUC_LOG_CRASH_SHIFT)
-#define   GUC_LOG_DPC_SHIFT		6
-#define   GUC_LOG_DPC_MASK	        (0x7 << GUC_LOG_DPC_SHIFT)
-#define   GUC_LOG_ISR_SHIFT		9
-#define   GUC_LOG_ISR_MASK	        (0x7 << GUC_LOG_ISR_SHIFT)
+#define   GUC_LOG_DEBUG_SHIFT		6
+#define   GUC_LOG_DEBUG_MASK	        (0xF << GUC_LOG_DEBUG_SHIFT)
  #define   GUC_LOG_BUF_ADDR_SHIFT	12
 
  #define GUC_CTL_WA			1
@@ -247,32 +245,14 @@ struct guc_stage_desc {
 
  /* Scheduling policy settings */
 
-/* Reset engine upon preempt failure */
-#define POLICY_RESET_ENGINE		(1<<0)
-/* Preempt to idle on quantum expiry */
-#define POLICY_PREEMPT_TO_IDLE		(1<<1)
-
-#define POLICY_MAX_NUM_WI 15
-#define POLICY_DEFAULT_DPC_PROMOTE_TIME_US 500000
-#define POLICY_DEFAULT_EXECUTION_QUANTUM_US 1000000
-#define POLICY_DEFAULT_PREEMPTION_TIME_US 500000
-#define POLICY_DEFAULT_FAULT_TIME_US 250000
-
-struct guc_policy {
-	/* Time for one workload to execute. (in micro seconds) */
-	u32 execution_quantum;
-	/* Time to wait for a preemption request to completed before issuing a
-	 * reset. (in micro seconds). */
-	u32 preemption_time;
-	/* How much time to allow to run after the first fault is observed.
-	 * Then preempt afterwards. (in micro seconds) */
-	u32 fault_time;
-	u32 policy_flags;
-	u32 reserved[8];
-} __packed;
+#define GLOBAL_POLICY_MAX_NUM_WI 15
+
+/* Don't reset an engine upon preemption failure */
+#define GLOBAL_POLICY_DISABLE_ENGINE_RESET				BIT(0)
+
+#define GLOBAL_POLICY_DEFAULT_DPC_PROMOTE_TIME_US 500000
 
  struct guc_policies {
-	struct guc_policy policy[GUC_CLIENT_PRIORITY_NUM][GUC_MAX_ENGINE_CLASSES];
  	u32 submission_queue_depth[GUC_MAX_ENGINE_CLASSES];
  	/* In micro seconds. How much time to allow before DPC processing is
  	 * called back via interrupt (to prevent DPC queue drain starving).
@@ -286,6 +266,7 @@ struct guc_policies {
  	 * idle. */
  	u32 max_num_work_items;
 
+	u32 global_flags;
  	u32 reserved[4];
  } __packed;
 
@@ -311,29 +292,13 @@ struct guc_gt_system_info {
  	u32 generic_gt_sysinfo[GUC_GENERIC_GT_SYSINFO_MAX];
  } __packed;
 
-/* Clients info */
-struct guc_ct_pool_entry {
-	struct guc_ct_buffer_desc desc;
-	u32 reserved[7];
-} __packed;
-
-#define GUC_CT_POOL_SIZE	2
-
-struct guc_clients_info {
-	u32 clients_num;
-	u32 reserved0[13];
-	u32 ct_pool_addr;
-	u32 ct_pool_count;
-	u32 reserved[4];
-} __packed;
-
  /* GuC Additional Data Struct */
  struct guc_ads {
  	struct guc_mmio_reg_set reg_state_list[GUC_MAX_ENGINE_CLASSES][GUC_MAX_INSTANCES_PER_CLASS];
  	u32 reserved0;
  	u32 scheduler_policies;
  	u32 gt_system_info;
-	u32 clients_info;
+	u32 reserved1;
  	u32 control_data;
  	u32 golden_context_lrca[GUC_MAX_ENGINE_CLASSES];
  	u32 eng_state_size[GUC_MAX_ENGINE_CLASSES];
@@ -344,8 +309,7 @@ struct guc_ads {
  /* GuC logging structures */
 
  enum guc_log_buffer_type {
-	GUC_ISR_LOG_BUFFER,
-	GUC_DPC_LOG_BUFFER,
+	GUC_DEBUG_LOG_BUFFER,
  	GUC_CRASH_DUMP_LOG_BUFFER,
  	GUC_MAX_LOG_BUFFER
  };
@@ -414,23 +378,6 @@ struct guc_shared_ctx_data {
  	struct guc_ctx_report preempt_ctx_report[GUC_MAX_ENGINES_NUM];
  } __packed;
 
-#define __INTEL_GUC_MSG_GET(T, m) \
-	(((m) & INTEL_GUC_MSG_ ## T ## _MASK) >> INTEL_GUC_MSG_ ## T ## _SHIFT)
-#define INTEL_GUC_MSG_TO_TYPE(m)	__INTEL_GUC_MSG_GET(TYPE, m)
-#define INTEL_GUC_MSG_TO_DATA(m)	__INTEL_GUC_MSG_GET(DATA, m)
-#define INTEL_GUC_MSG_TO_CODE(m)	__INTEL_GUC_MSG_GET(CODE, m)
-
-#define __INTEL_GUC_MSG_TYPE_IS(T, m) \
-	(INTEL_GUC_MSG_TO_TYPE(m) == INTEL_GUC_MSG_TYPE_ ## T)
-#define INTEL_GUC_MSG_IS_REQUEST(m)	__INTEL_GUC_MSG_TYPE_IS(REQUEST, m)
-#define INTEL_GUC_MSG_IS_RESPONSE(m)	__INTEL_GUC_MSG_TYPE_IS(RESPONSE, m)
-
-#define INTEL_GUC_MSG_IS_RESPONSE_SUCCESS(m) \
-	 (typecheck(u32, (m)) && \
-	  ((m) & (INTEL_GUC_MSG_TYPE_MASK | INTEL_GUC_MSG_CODE_MASK)) == \
-	  ((INTEL_GUC_MSG_TYPE_RESPONSE << INTEL_GUC_MSG_TYPE_SHIFT) | \
-	   (INTEL_GUC_RESPONSE_STATUS_SUCCESS << INTEL_GUC_MSG_CODE_SHIFT)))
-
  /* This action will be programmed in C1BC - SOFT_SCRATCH_15_REG */
  enum intel_guc_recv_message {
  	INTEL_GUC_RECV_MSG_CRASH_DUMP_POSTED = BIT(1),
drivers/gpu/drm/i915/gt/uc/intel_guc_log.c +10 -19
index c36d5eb5bbb9..ac0931f0374b 100644
@@ -197,10 +197,8 @@ static bool guc_check_log_buf_overflow(struct intel_guc_log *log,
  static unsigned int guc_get_log_buffer_size(enum guc_log_buffer_type type)
  {
  	switch (type) {
-	case GUC_ISR_LOG_BUFFER:
-		return ISR_BUFFER_SIZE;
-	case GUC_DPC_LOG_BUFFER:
-		return DPC_BUFFER_SIZE;
+	case GUC_DEBUG_LOG_BUFFER:
+		return DEBUG_BUFFER_SIZE;
  	case GUC_CRASH_DUMP_LOG_BUFFER:
  		return CRASH_BUFFER_SIZE;
  	default:
@@ -245,7 +243,7 @@ static void guc_read_update_log_buffer(struct intel_guc_log *log)
  	src_data += PAGE_SIZE;
  	dst_data += PAGE_SIZE;
 
-	for (type = GUC_ISR_LOG_BUFFER; type < GUC_MAX_LOG_BUFFER; type++) {
+	for (type = GUC_DEBUG_LOG_BUFFER; type < GUC_MAX_LOG_BUFFER; type++) {
  		/*
  		 * Make a copy of the state structure, inside GuC log buffer
  		 * (which is uncached mapped), on the stack to avoid reading
@@ -463,21 +461,16 @@ int intel_guc_log_create(struct intel_guc_log *log)
  	 *  +===============================+ 00B
  	 *  |    Crash dump state header    |
  	 *  +-------------------------------+ 32B
-	 *  |       DPC state header        |
+	 *  |      Debug state header       |
  	 *  +-------------------------------+ 64B
-	 *  |       ISR state header        |
-	 *  +-------------------------------+ 96B
  	 *  |                               |
  	 *  +===============================+ PAGE_SIZE (4KB)
  	 *  |        Crash Dump logs        |
  	 *  +===============================+ + CRASH_SIZE
-	 *  |           DPC logs            |
-	 *  +===============================+ + DPC_SIZE
-	 *  |           ISR logs            |
-	 *  +===============================+ + ISR_SIZE
+	 *  |          Debug logs           |
+	 *  +===============================+ + DEBUG_SIZE
  	 */
-	guc_log_size = PAGE_SIZE + CRASH_BUFFER_SIZE + DPC_BUFFER_SIZE +
-			ISR_BUFFER_SIZE;
+	guc_log_size = PAGE_SIZE + CRASH_BUFFER_SIZE + DEBUG_BUFFER_SIZE;
 
  	vma = intel_guc_allocate_vma(guc, guc_log_size);
  	if (IS_ERR(vma)) {
@@ -675,10 +668,8 @@ static const char *
  stringify_guc_log_type(enum guc_log_buffer_type type)
  {
  	switch (type) {
-	case GUC_ISR_LOG_BUFFER:
-		return "ISR";
-	case GUC_DPC_LOG_BUFFER:
-		return "DPC";
+	case GUC_DEBUG_LOG_BUFFER:
+		return "DEBUG";
  	case GUC_CRASH_DUMP_LOG_BUFFER:
  		return "CRASH";
  	default:
@@ -708,7 +699,7 @@ void intel_guc_log_info(struct intel_guc_log *log, struct drm_printer *p)
 
  	drm_printf(p, "\tRelay full count: %u\n", log->relay.full_count);
 
-	for (type = GUC_ISR_LOG_BUFFER; type < GUC_MAX_LOG_BUFFER; type++) {
+	for (type = GUC_DEBUG_LOG_BUFFER; type < GUC_MAX_LOG_BUFFER; type++) {
  		drm_printf(p, "\t%s:\tflush count %10u, overflow count %10u\n",
  			   stringify_guc_log_type(type),
  			   log->stats[type].flush,
drivers/gpu/drm/i915/gt/uc/intel_guc_log.h +2 -4
index 11fccd0b2294..ac1ee1d5ce10 100644
@@ -17,12 +17,10 @@ struct intel_guc;
 
  #ifdef CONFIG_DRM_I915_DEBUG_GUC
  #define CRASH_BUFFER_SIZE	SZ_2M
-#define DPC_BUFFER_SIZE		SZ_8M
-#define ISR_BUFFER_SIZE		SZ_8M
+#define DEBUG_BUFFER_SIZE	SZ_16M
  #else
  #define CRASH_BUFFER_SIZE	SZ_8K
-#define DPC_BUFFER_SIZE		SZ_32K
-#define ISR_BUFFER_SIZE		SZ_32K
+#define DEBUG_BUFFER_SIZE	SZ_64K
  #endif
 
  /*
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +6 -13
index df647c9a8d56..9f23e9de3237 100644
@@ -48,19 +48,19 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,
   * firmware as TGL.
   */
  #define INTEL_UC_FIRMWARE_DEFS(fw_def, guc_def, huc_def) \
-	fw_def(ALDERLAKE_S, 0, guc_def(tgl, 49, 0, 1), huc_def(tgl,  7, 5, 0)) \
-	fw_def(ROCKETLAKE,  0, guc_def(tgl, 49, 0, 1), huc_def(tgl,  7, 5, 0)) \
-	fw_def(TIGERLAKE,   0, guc_def(tgl, 49, 0, 1), huc_def(tgl,  7, 5, 0)) \
-	fw_def(JASPERLAKE,  0, guc_def(ehl, 49, 0, 1), huc_def(ehl,  9, 0, 0)) \
-	fw_def(ELKHARTLAKE, 0, guc_def(ehl, 49, 0, 1), huc_def(ehl,  9, 0, 0)) \
-	fw_def(ICELAKE,     0, guc_def(icl, 49, 0, 1), huc_def(icl,  9, 0, 0)) \
-	fw_def(COMETLAKE,   5, guc_def(cml, 49, 0, 1), huc_def(cml,  4, 0, 0)) \
-	fw_def(COMETLAKE,   0, guc_def(kbl, 49, 0, 1), huc_def(kbl,  4, 0, 0)) \
-	fw_def(COFFEELAKE,  0, guc_def(kbl, 49, 0, 1), huc_def(kbl,  4, 0, 0)) \
-	fw_def(GEMINILAKE,  0, guc_def(glk, 49, 0, 1), huc_def(glk,  4, 0, 0)) \
-	fw_def(KABYLAKE,    0, guc_def(kbl, 49, 0, 1), huc_def(kbl,  4, 0, 0)) \
-	fw_def(BROXTON,     0, guc_def(bxt, 49, 0, 1), huc_def(bxt,  2, 0, 0)) \
-	fw_def(SKYLAKE,     0, guc_def(skl, 49, 0, 1), huc_def(skl,  2, 0, 0))
+	fw_def(ALDERLAKE_S, 0, guc_def(tgl, 62, 0, 0), huc_def(tgl,  7, 5, 0)) \
+	fw_def(ROCKETLAKE,  0, guc_def(tgl, 62, 0, 0), huc_def(tgl,  7, 5, 0)) \
+	fw_def(TIGERLAKE,   0, guc_def(tgl, 62, 0, 0), huc_def(tgl,  7, 5, 0)) \
+	fw_def(JASPERLAKE,  0, guc_def(ehl, 62, 0, 0), huc_def(ehl,  9, 0, 0)) \
+	fw_def(ELKHARTLAKE, 0, guc_def(ehl, 62, 0, 0), huc_def(ehl,  9, 0, 0)) \
+	fw_def(ICELAKE,     0, guc_def(icl, 62, 0, 0), huc_def(icl,  9, 0, 0)) \

drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw, · line 66

Quoted 10 lines
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +7 -0
+	fw_def(COMETLAKE,   5, guc_def(cml, 62, 0, 0), huc_def(cml,  4, 0, 0)) \
+	fw_def(COMETLAKE,   0, guc_def(kbl, 62, 0, 0), huc_def(kbl,  4, 0, 0)) \
+	fw_def(COFFEELAKE,  0, guc_def(kbl, 62, 0, 0), huc_def(kbl,  4, 0, 0)) \
+	fw_def(GEMINILAKE,  0, guc_def(glk, 62, 0, 0), huc_def(glk,  4, 0, 0)) \
+	fw_def(KABYLAKE,    0, guc_def(kbl, 62, 0, 0), huc_def(kbl,  4, 0, 0)) \
+	fw_def(BROXTON,     0, guc_def(bxt, 62, 0, 0), huc_def(bxt,  2, 0, 0)) \
+	fw_def(SKYLAKE,     0, guc_def(skl, 62, 0, 0), huc_def(skl,  2, 0, 0))
 
  #define __MAKE_UC_FW_PATH(prefix_, name_, major_, minor_, patch_) \
  	"i915/" \

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw

Re: [PATCH 2/3] drm/i915/guc: Update firmware to v62.0.0

Quoted 249 lines · Daniele Ceraolo Spurio
Quoted 246 lines · Matthew Brost

From: Michal Wajdeczko <[email protected]>

Most of the changes to the 62.0.0 firmware revolved around CTB communication channel. Conform to the new (stable) CTB protocol.

v2:
  (Michal)
   Add values back to kernel DOC for actions
  (Docs)
   Add 'CT buffer' back in to fix warning

---
  .../gpu/drm/i915/gt/uc/abi/guc_actions_abi.h  | 107 ++++++ .../gt/uc/abi/guc_communication_ctb_abi.h     | 126 +++++-- .../gt/uc/abi/guc_communication_mmio_abi.h    |  65 ++-- drivers/gpu/drm/i915/gt/uc/intel_guc.c        | 107 ++++-- drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c    |  45 +-- drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c     | 356 +++++++++--------- drivers/gpu/drm/i915/gt/uc/intel_guc_ct.h     |   6 +- drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h   |  75 +--- drivers/gpu/drm/i915/gt/uc/intel_guc_log.c    |  29 +- drivers/gpu/drm/i915/gt/uc/intel_guc_log.h    |   6 +- drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c      |  26 +-

  11 files changed, 527 insertions(+), 421 deletions(-)
drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h +0 -0
index 90efef8a73e4..2d6198e63ebe 100644
@@ -6,6 +6,113 @@
   #ifndef _ABI_GUC_ACTIONS_ABI_H
   #define _ABI_GUC_ACTIONS_ABI_H

  +/**
+ * DOC: HOST2GUC_REGISTER_CTB
+ *
+ * This message is used as part of the CTB based communication_ setup.
+ *
+ * This message must be sent as MMIO HXG Message_.
+ *
+ *
+---+-------+--------------------------------------------------------------+

+ *  |   | Bits  |
Description                                                  |
+ *
+===+=======+==============================================================+

+ *  | 0 |    31 | ORIGIN = GUC_HXG_ORIGIN_HOST_                                |
+ *  |

+-------+--------------------------------------------------------------+
+ *  |   | 30:28 | TYPE =
GUC_HXG_TYPE_REQUEST_                                 |
+ *  |  
+-------+--------------------------------------------------------------+
+ *  |   | 27:16 | DATA0 =
MBZ                                                  |
+ *  |  
+-------+--------------------------------------------------------------+
+ *  |   |  15:0 | ACTION = _`GUC_ACTION_HOST2GUC_REGISTER_CTB` =
0x4505        |

+ *
+---+-------+--------------------------------------------------------------+

+ *  | 1 | 31:12 | RESERVED =
MBZ                                               |
+ *  |

+-------+--------------------------------------------------------------+
+ *  |   |  11:8 | **TYPE** - type for the `CT
Buffer`_                         |
+ *  |   |      
|                                                              |
+ *  |   |       |   - _`GUC_CTB_TYPE_HOST2GUC` =
0                             |
+ *  |   |       |   - _`GUC_CTB_TYPE_GUC2HOST` =
1                             |
+ *  |  
+-------+--------------------------------------------------------------+
+ *  |   |   7:0 | **SIZE** - size of the `CT Buffer`_ in 4K units
minus 1      |

+ *
+---+-------+--------------------------------------------------------------+

+ *  | 2 |  31:0 | **DESC_ADDR** - GGTT address of the CTB Descriptor_        |
+ *
+---+-------+--------------------------------------------------------------+

+ *  | 3 |  31:0 | **BUFF_ADDF** - GGTT address of the CT Buffer_             |
+ *
+---+-------+--------------------------------------------------------------+

+ *
+ *
+---+-------+--------------------------------------------------------------+

+ *  |   | Bits  |
Description                                                  |
+ *
+===+=======+==============================================================+

+ *  | 0 |    31 | ORIGIN = GUC_HXG_ORIGIN_GUC_                                 |
+ *  |

+-------+--------------------------------------------------------------+
+ *  |   | 30:28 | TYPE =
GUC_HXG_TYPE_RESPONSE_SUCCESS_                        |
+ *  |  
+-------+--------------------------------------------------------------+
+ *  |   |  27:0 | DATA0 =
MBZ                                                  |

+ *
+---+-------+--------------------------------------------------------------+

+ */

drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h +3 -0
+#define GUC_ACTION_HOST2GUC_REGISTER_CTB        0x4505
+
+#define HOST2GUC_REGISTER_CTB_REQUEST_MSG_LEN       

(GUC_HXG_REQUEST_MSG_MIN_LEN + 3u)
+#define HOST2GUC_REGISTER_CTB_REQUEST_MSG_0_MBZ
GUC_HXG_REQUEST_MSG_0_DATA0

drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h +6 -0
+#define HOST2GUC_REGISTER_CTB_REQUEST_MSG_1_MBZ        (0xfffff << 12)
+#define HOST2GUC_REGISTER_CTB_REQUEST_MSG_1_TYPE    (0xf << 8)
+#define   GUC_CTB_TYPE_HOST2GUC                0u
+#define   GUC_CTB_TYPE_GUC2HOST                1u
+#define HOST2GUC_REGISTER_CTB_REQUEST_MSG_1_SIZE    (0xff << 0)
+#define HOST2GUC_REGISTER_CTB_REQUEST_MSG_2_DESC_ADDR   

GUC_HXG_REQUEST_MSG_n_DATAn
+#define HOST2GUC_REGISTER_CTB_REQUEST_MSG_3_BUFF_ADDR GUC_HXG_REQUEST_MSG_n_DATAn

drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h +2 -0
+
+#define HOST2GUC_REGISTER_CTB_RESPONSE_MSG_LEN       

GUC_HXG_RESPONSE_MSG_MIN_LEN
+#define HOST2GUC_REGISTER_CTB_RESPONSE_MSG_0_MBZ
GUC_HXG_RESPONSE_MSG_0_DATA0

drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h +5 -0
+
+/**
+ * DOC: HOST2GUC_DEREGISTER_CTB
+ *
+ * This message is used as part of the `CTB based communication`_

teardown.
+ *
+ * This message must be sent as MMIO HXG Message_.
+ *
+ *
+---+-------+--------------------------------------------------------------+

+ *  |   | Bits  |
Description                                                  |
+ *
+===+=======+==============================================================+

+ *  | 0 |    31 | ORIGIN = GUC_HXG_ORIGIN_HOST_                                |
+ *  |

+-------+--------------------------------------------------------------+
+ *  |   | 30:28 | TYPE =
GUC_HXG_TYPE_REQUEST_                                 |
+ *  |  
+-------+--------------------------------------------------------------+
+ *  |   | 27:16 | DATA0 =
MBZ                                                  |
+ *  |  
+-------+--------------------------------------------------------------+
+ *  |   |  15:0 | ACTION = _`GUC_ACTION_HOST2GUC_DEREGISTER_CTB` =
0x4506      |

+ *
+---+-------+--------------------------------------------------------------+

+ *  | 1 | 31:12 | RESERVED =
MBZ                                               |
+ *  |

+-------+--------------------------------------------------------------+
+ *  |   |  11:8 | **TYPE** - type of the `CT
Buffer`_                          |
+ *  |   |      
|                                                              |
+ *  |   |       | see
`GUC_ACTION_HOST2GUC_REGISTER_CTB`_                      |
+ *  |  
+-------+--------------------------------------------------------------+
+ *  |   |   7:0 | RESERVED =
MBZ                                               |

+ *
+---+-------+--------------------------------------------------------------+

+ *
+ *
+---+-------+--------------------------------------------------------------+

+ *  |   | Bits  |
Description                                                  |
+ *
+===+=======+==============================================================+

+ *  | 0 |    31 | ORIGIN = GUC_HXG_ORIGIN_GUC_                                 |
+ *  |

+-------+--------------------------------------------------------------+
+ *  |   | 30:28 | TYPE =
GUC_HXG_TYPE_RESPONSE_SUCCESS_                        |
+ *  |  
+-------+--------------------------------------------------------------+
+ *  |   |  27:0 | DATA0 =
MBZ                                                  |

+ *
+---+-------+--------------------------------------------------------------+

+ */

drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h +3 -0
+#define GUC_ACTION_HOST2GUC_DEREGISTER_CTB        0x4506
+
+#define HOST2GUC_DEREGISTER_CTB_REQUEST_MSG_LEN       

(GUC_HXG_REQUEST_MSG_MIN_LEN + 1u) +#define HOST2GUC_DEREGISTER_CTB_REQUEST_MSG_0_MBZ GUC_HXG_REQUEST_MSG_0_DATA0

drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h +5 -0
+#define HOST2GUC_DEREGISTER_CTB_REQUEST_MSG_1_MBZ    (0xfffff << 12)
+#define HOST2GUC_DEREGISTER_CTB_REQUEST_MSG_1_TYPE    (0xf << 8)
+#define HOST2GUC_DEREGISTER_CTB_REQUEST_MSG_1_MBZ2    (0xff << 0)
+
+#define HOST2GUC_DEREGISTER_CTB_RESPONSE_MSG_LEN   

GUC_HXG_RESPONSE_MSG_MIN_LEN
+#define HOST2GUC_DEREGISTER_CTB_RESPONSE_MSG_0_MBZ GUC_HXG_RESPONSE_MSG_0_DATA0

drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h +3 -0
+
+/* legacy definitions */
+

  enum intel_guc_action {
      INTEL_GUC_ACTION_DEFAULT = 0x0, INTEL_GUC_ACTION_REQUEST_PREEMPTION = 0x2, diff --git a/drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h b/drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h index d38935f47ecf..29fc93a8b5be 100644

drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h +3 -0
@@ -7,6 +7,110 @@
   #define _ABI_GUC_COMMUNICATION_CTB_ABI_H
     #include <linux/types.h>
+#include <linux/build_bug.h>
+
+#include "guc_messages_abi.h"
Quoted 8 lines

drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h line 17

Quoted 5 lines
drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h +5 -0
+
+/**
+ * DOC: CT Buffer
+ *
+ * Circular buffer used to send / receive CTBs (H2G or G2H)

nit: the CTB is not used to send CTBs, but to send messages. Can fix while pushing.

and to be more precisely, not H2G or G2H messages, but
" to send generic CTB Message_ "
as H2G or G2H (again more precisely CTB HXG Message_) is just a specific type of message

Quoted 1,468 lines

For the rest I couldn't spot anything that didn't match what was already reviewed, so:

Daniele

Quoted 1,459 lines
drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h +8 -0
+ */
+
+/**
+ * DOC: CTB Descriptor
+ *
+ * 
+---+-------+--------------------------------------------------------------+
 
+ *  |   | Bits  |

Description                                                  |
+ *
+===+=======+==============================================================+

+ *  | 0 |  31:0 | **HEAD** - offset (in dwords) to the last dword that was     |
+ *  |   |       | read from the `CT
Buffer`_.                                  |
+ *  |   |       | It can only be updated by the receiver.                      |
+ *
+---+-------+--------------------------------------------------------------+

+ *  | 1 |  31:0 | **TAIL** - offset (in dwords) to the last dword that was     |
+ *  |   |       | written to the `CT
Buffer`_.                                 |
+ *  |   |       | It can only be updated by the sender.                        |
+ *
+---+-------+--------------------------------------------------------------+

+ *  | 2 |  31:0 | **STATUS** - status of the
CTB                               |
+ *  |   |

|                                                              |
+ *  |   |       |   - _`GUC_CTB_STATUS_NO_ERROR` = 0 (normal
operation)        |
+ *  |   |       |   - _`GUC_CTB_STATUS_OVERFLOW` = 1 (head/tail too
large)     |
+ *  |   |       |   - _`GUC_CTB_STATUS_UNDERFLOW` = 2 (truncated
message)      |
+ *  |   |       |   - _`GUC_CTB_STATUS_MISMATCH` = 4 (head/tail
modified)      |

+ *
+---+-------+--------------------------------------------------------------+

+ *  |...|       | RESERVED =
MBZ                                               |
+ *
+---+-------+--------------------------------------------------------------+

+ *  | 15|  31:0 | RESERVED =
MBZ                                               |
+ *
+---+-------+--------------------------------------------------------------+

+ */

drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h +19 -0
+
+struct guc_ct_buffer_desc {
+    u32 head;
+    u32 tail;
+    u32 status;
+#define GUC_CTB_STATUS_NO_ERROR                0
+#define GUC_CTB_STATUS_OVERFLOW                (1 << 0)
+#define GUC_CTB_STATUS_UNDERFLOW            (1 << 1)
+#define GUC_CTB_STATUS_MISMATCH                (1 << 2)
+    u32 reserved[13];
+} __packed;
+static_assert(sizeof(struct guc_ct_buffer_desc) == 64);
+
+/**
+ * DOC: CTB Message
+ *
+ * 
+---+-------+--------------------------------------------------------------+
 
+ *  |   | Bits  |

Description                                                  |
+ *
+===+=======+==============================================================+

+ *  | 0 | 31:16 | **FENCE** - message
identifier                               |
+ *  |

+-------+--------------------------------------------------------------+
+ *  |   | 15:12 | **FORMAT** - format of the CTB
message                       |
+ *  |   |       |  - _`GUC_CTB_FORMAT_HXG` = 0 - see `CTB HXG
Message`_        |
+ *  |  
+-------+--------------------------------------------------------------+
+ *  |   |  11:8 |
**RESERVED**                                                 |
+ *  |  
+-------+--------------------------------------------------------------+
+ *  |   |   7:0 | **NUM_DWORDS** - length of the CTB message (w/o
header)      |

+ *
+---+-------+--------------------------------------------------------------+

+ *  | 1 |  31:0 | optional (depends on
FORMAT)                                 |
+ *

+---+-------+                                                             
|
+ *  |...|      
|                                                              |
+ * 
+---+-------+                                                             
|
+ *  | n |  31:0
|                                                              |

+ *
+---+-------+--------------------------------------------------------------+

+ */

drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h +15 -0
+
+#define GUC_CTB_MSG_MIN_LEN            1u
+#define GUC_CTB_MSG_MAX_LEN            256u
+#define GUC_CTB_MSG_0_FENCE            (0xffff << 16)
+#define GUC_CTB_MSG_0_FORMAT            (0xf << 12)
+#define   GUC_CTB_FORMAT_HXG            0u
+#define GUC_CTB_MSG_0_RESERVED            (0xf << 8)
+#define GUC_CTB_MSG_0_NUM_DWORDS        (0xff << 0)
+
+/**
+ * DOC: CTB HXG Message
+ *
+ * 
+---+-------+--------------------------------------------------------------+
 
+ *  |   | Bits  |

Description                                                  |
+ *
+===+=======+==============================================================+

+ *  | 0 | 31:16 |
FENCE                                                        |
+ *  |

+-------+--------------------------------------------------------------+
+ *  |   | 15:12 | FORMAT =
GUC_CTB_FORMAT_HXG_                                 |
+ *  |  
+-------+--------------------------------------------------------------+
+ *  |   |  11:8 | RESERVED =
MBZ                                               |
+ *  |  
+-------+--------------------------------------------------------------+
+ *  |   |   7:0 | NUM_DWORDS = length (in dwords) of the embedded HXG
message  |

+ *
+---+-------+--------------------------------------------------------------+

+ *  | 1 |  31:0 | +--------------------------------------------------------+  |
+ *  +---+-------+

|                                                        |  |
+ *  |...|       |  |  Embedded `HXG
Message`_                               |  |
+ *  +---+-------+ 
|                                                        |  |
+ *  | n |  31:0 | 
+--------------------------------------------------------+  |

+ *
+---+-------+--------------------------------------------------------------+

+ */

drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h +2 -0
+
+#define GUC_CTB_HXG_MSG_MIN_LEN        (GUC_CTB_MSG_MIN_LEN +

GUC_HXG_MSG_MIN_LEN)
+#define GUC_CTB_HXG_MSG_MAX_LEN        GUC_CTB_MSG_MAX_LEN /**
   * DOC: CTB based communication

drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h +0 -0
@@ -60,28 +164,6 @@
    * - **flags**, holds various bits to control message handling
    */

  -/*
- * Describes single command transport buffer.
- * Used by both guc-master and clients.
- */

drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h +0 -18
-struct guc_ct_buffer_desc {
-    u32 addr;        /* gfx address */
-    u64 host_private;    /* host private data */
-    u32 size;        /* size in bytes */
-    u32 head;        /* offset updated by GuC*/
-    u32 tail;        /* offset updated by owner */
-    u32 is_in_error;    /* error indicator */
-    u32 reserved1;
-    u32 reserved2;
-    u32 owner;        /* id of the channel owner */
-    u32 owner_sub_id;    /* owner-defined field for extra tracking */
-    u32 reserved[5];
-} __packed;
-
-/* Type of command transport buffer */
-#define INTEL_GUC_CT_BUFFER_TYPE_SEND    0x0u
-#define INTEL_GUC_CT_BUFFER_TYPE_RECV    0x1u
-

  /*
   * Definition of the command transport message header (DW0) *
diff --git a/drivers/gpu/drm/i915/gt/uc/abi/guc_communication_mmio_abi.h b/drivers/gpu/drm/i915/gt/uc/abi/guc_communication_mmio_abi.h index be066a62e9e0..bbf1ddb77434 100644

drivers/gpu/drm/i915/gt/uc/abi/guc_communication_mmio_abi.h +1 -2
@@ -7,46 +7,43 @@
   #define _ABI_GUC_COMMUNICATION_MMIO_ABI_H
     /**
- * DOC: MMIO based communication
+ * DOC: GuC MMIO based communication
    *
- * The MMIO based communication between Host and GuC uses software

scratch
- * registers, where first register holds data treated as message header,
- * and other registers are used to hold message payload.
+ * The MMIO based communication between Host and GuC relies on special
+ * hardware registers which format could be defined by the software
+ * (so called scratch registers).
   *
- * For Gen9+, GuC uses software scratch registers 0xC180-0xC1B8,
- * but no H2G command takes more than 8 parameters and the GuC FW
- * itself uses an 8-element array to store the H2G message.
+ * Each MMIO based message, both Host to GuC (H2G) and GuC to Host (G2H)
+ * messages, which maximum length depends on number of available scratch
+ * registers, is directly written into those scratch registers. *
- *      +-----------+---------+---------+---------+
- *      |  MMIO[0]  | MMIO[1] |   ...   | MMIO[n] |
- *      +-----------+---------+---------+---------+
- *      | header    |      optional payload       |
- *      +======+====+=========+=========+=========+

- *      | 31:28|type|         |         |         |
- *      +------+----+         |         |         |
- *      | 27:16|data|         |         |         |
- *      +------+----+         |         |         |

- *      |  15:0|code|         |         |         |
- *      +------+----+---------+---------+---------+
+ * For Gen9+, there are 16 software scratch registers 0xC180-0xC1B8,
+ * but no H2G command takes more than 4 parameters and the GuC firmware
+ * itself uses an 4-element array to store the H2G message. *
- * The message header consists of:
+ * For Gen11+, there are additional 4 registers 0x190240-0x19024C, which
+ * are, regardless on lower count, preferred over legacy ones. *
- * - **type**, indicates message type
- * - **code**, indicates message code, is specific for **type**
- * - **data**, indicates message data, optional, depends on **code**
- *
- * The following message **types** are supported:
- *
- * - **REQUEST**, indicates Host-to-GuC request, requested GuC action code
- *   must be priovided in **code** field. Optional action specific parameters
- *   can be provided in remaining payload registers or **data** field.
- *
- * - **RESPONSE**, indicates GuC-to-Host response from earlier GuC request,
- *   action response status will be provided in **code** field. Optional
- *   response data can be returned in remaining payload registers or **data**
- *   field.
+ * The MMIO based communication is mainly used during driver initialization
+ * phase to setup the CTB based communication_ that will be used afterwards.
   */
  -#define GUC_MAX_MMIO_MSG_LEN        8

drivers/gpu/drm/i915/gt/uc/abi/guc_communication_mmio_abi.h +10 -0
+#define GUC_MAX_MMIO_MSG_LEN        4
+
+/**
+ * DOC: MMIO HXG Message
+ *
+ * Format of the MMIO messages follows definitions of `HXG Message`_.
+ *
+ * 
+---+-------+--------------------------------------------------------------+
 
+ *  |   | Bits  |

Description                                                  |
+ *
+===+=======+==============================================================+

+ *  | 0 |  31:0 | +--------------------------------------------------------+  |
+ *  +---+-------+

|                                                        |  |
+ *  |...|       |  |  Embedded `HXG
Message`_                               |  |
+ *  +---+-------+ 
|                                                        |  |
+ *  | n |  31:0 | 
+--------------------------------------------------------+  |

+ *
+---+-------+--------------------------------------------------------------+

+ */
    #endif /* _ABI_GUC_COMMUNICATION_MMIO_ABI_H */

drivers/gpu/drm/i915/gt/uc/intel_guc.c +2 -4
index f147cb389a20..6661dcb02239 100644
@@ -219,24 +219,19 @@ static u32 guc_ctl_log_params_flags(struct
 intel_guc *guc)
         BUILD_BUG_ON(!CRASH_BUFFER_SIZE);
       BUILD_BUG_ON(!IS_ALIGNED(CRASH_BUFFER_SIZE, UNIT));
-    BUILD_BUG_ON(!DPC_BUFFER_SIZE);
-    BUILD_BUG_ON(!IS_ALIGNED(DPC_BUFFER_SIZE, UNIT));
-    BUILD_BUG_ON(!ISR_BUFFER_SIZE);
-    BUILD_BUG_ON(!IS_ALIGNED(ISR_BUFFER_SIZE, UNIT));
+    BUILD_BUG_ON(!DEBUG_BUFFER_SIZE);
+    BUILD_BUG_ON(!IS_ALIGNED(DEBUG_BUFFER_SIZE, UNIT));

        BUILD_BUG_ON((CRASH_BUFFER_SIZE / UNIT - 1) > (GUC_LOG_CRASH_MASK >> GUC_LOG_CRASH_SHIFT)); -    BUILD_BUG_ON((DPC_BUFFER_SIZE / UNIT - 1) >
-            (GUC_LOG_DPC_MASK >> GUC_LOG_DPC_SHIFT));
-    BUILD_BUG_ON((ISR_BUFFER_SIZE / UNIT - 1) >
-            (GUC_LOG_ISR_MASK >> GUC_LOG_ISR_SHIFT));
+    BUILD_BUG_ON((DEBUG_BUFFER_SIZE / UNIT - 1) >
+            (GUC_LOG_DEBUG_MASK >> GUC_LOG_DEBUG_SHIFT)); flags = GUC_LOG_VALID | GUC_LOG_NOTIFY_ON_HALF_FULL |
          FLAG |
          ((CRASH_BUFFER_SIZE / UNIT - 1) << GUC_LOG_CRASH_SHIFT) | -        ((DPC_BUFFER_SIZE / UNIT - 1) << GUC_LOG_DPC_SHIFT) | -        ((ISR_BUFFER_SIZE / UNIT - 1) << GUC_LOG_ISR_SHIFT) | +        ((DEBUG_BUFFER_SIZE / UNIT - 1) << GUC_LOG_DEBUG_SHIFT) | (offset << GUC_LOG_BUF_ADDR_SHIFT);
        #undef UNIT

drivers/gpu/drm/i915/gt/uc/intel_guc.c +3 -2
@@ -376,29 +371,27 @@ void intel_guc_fini(struct intel_guc *guc)
   /*
    * This function implements the MMIO based host to GuC interface.
    */
-int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32
 len,
+int intel_guc_send_mmio(struct intel_guc *guc, const u32 *request,
 u32 len,
               u32 *response_buf, u32 response_buf_size)
   {
+    struct drm_i915_private *i915 = guc_to_gt(guc)->i915;
       struct intel_uncore *uncore = guc_to_gt(guc)->uncore;
-    u32 status;
+    u32 header;
       int i;
       int ret;
         GEM_BUG_ON(!len);
       GEM_BUG_ON(len > guc->send_regs.count);

  -    /* We expect only action code */
-    GEM_BUG_ON(*action & ~INTEL_GUC_MSG_CODE_MASK);
-
-    /* If CT is available, we expect to use MMIO only during init/fini */
-    GEM_BUG_ON(*action != INTEL_GUC_ACTION_REGISTER_COMMAND_TRANSPORT_BUFFER &&
-           *action != INTEL_GUC_ACTION_DEREGISTER_COMMAND_TRANSPORT_BUFFER);
+    GEM_BUG_ON(FIELD_GET(GUC_HXG_MSG_0_ORIGIN, request[0]) != GUC_HXG_ORIGIN_HOST);
+    GEM_BUG_ON(FIELD_GET(GUC_HXG_MSG_0_TYPE, request[0]) != GUC_HXG_TYPE_REQUEST);
        mutex_lock(&guc->send_mutex); intel_uncore_forcewake_get(uncore, guc->send_regs.fw_domains); +retry:
      for (i = 0; i < len; i++)
-        intel_uncore_write(uncore, guc_send_reg(guc, i), action[i]); +        intel_uncore_write(uncore, guc_send_reg(guc, i), request[i]); intel_uncore_posting_read(uncore, guc_send_reg(guc, i - 1)); @@ -410,30 +403,74 @@ int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len,
       */
      ret = __intel_wait_for_register_fw(uncore, guc_send_reg(guc, 0),
-                       INTEL_GUC_MSG_TYPE_MASK,
-                       INTEL_GUC_MSG_TYPE_RESPONSE <<
-                       INTEL_GUC_MSG_TYPE_SHIFT,
-                       10, 10, &status);
-    /* If GuC explicitly returned an error, convert it to -EIO */ -    if (!ret && !INTEL_GUC_MSG_IS_RESPONSE_SUCCESS(status)) -        ret = -EIO;
+                       GUC_HXG_MSG_0_ORIGIN,
+                       FIELD_PREP(GUC_HXG_MSG_0_ORIGIN,
+                              GUC_HXG_ORIGIN_GUC),
+                       10, 10, &header);
+    if (unlikely(ret)) {
+timeout:
+        drm_err(&i915->drm, "mmio request %#x: no reply %x\n", +            request[0], header);
+        goto out;
+    }
  -    if (ret) {
-        DRM_ERROR("MMIO: GuC action %#x failed with error %d %#x\n", -              action[0], ret, status);
+    if (FIELD_GET(GUC_HXG_MSG_0_TYPE, header) == GUC_HXG_TYPE_NO_RESPONSE_BUSY) {
+#define done ({ header = intel_uncore_read(uncore, guc_send_reg(guc, 0)); \
+        FIELD_GET(GUC_HXG_MSG_0_ORIGIN, header) != GUC_HXG_ORIGIN_GUC || \
+        FIELD_GET(GUC_HXG_MSG_0_TYPE, header) != GUC_HXG_TYPE_NO_RESPONSE_BUSY; })

drivers/gpu/drm/i915/gt/uc/intel_guc.c +11 -0
+
+        ret = wait_for(done, 1000);
+        if (unlikely(ret))
+            goto timeout;
+        if (unlikely(FIELD_GET(GUC_HXG_MSG_0_ORIGIN, header) !=
+                       GUC_HXG_ORIGIN_GUC))
+            goto proto;
+#undef done
+    }
+
+    if (FIELD_GET(GUC_HXG_MSG_0_TYPE, header) ==

GUC_HXG_TYPE_NO_RESPONSE_RETRY) {
+        u32 reason = FIELD_GET(GUC_HXG_RETRY_MSG_0_REASON, header);

drivers/gpu/drm/i915/gt/uc/intel_guc.c +7 -0
+
+        drm_dbg(&i915->drm, "mmio request %#x: retrying, reason %u\n",
+            request[0], reason);
+        goto retry;
+    }
+
+    if (FIELD_GET(GUC_HXG_MSG_0_TYPE, header) ==

GUC_HXG_TYPE_RESPONSE_FAILURE) {
+        u32 hint = FIELD_GET(GUC_HXG_FAILURE_MSG_0_HINT, header); +        u32 error = FIELD_GET(GUC_HXG_FAILURE_MSG_0_ERROR, header);

drivers/gpu/drm/i915/gt/uc/intel_guc.c +8 -0
+
+        drm_err(&i915->drm, "mmio request %#x: failure %x/%u\n",
+            request[0], error, hint);
+        ret = -ENXIO;
+        goto out;
+    }
+
+    if (FIELD_GET(GUC_HXG_MSG_0_TYPE, header) !=

GUC_HXG_TYPE_RESPONSE_SUCCESS) {
+proto:
+        drm_err(&i915->drm, "mmio request %#x: unexpected reply %#x\n", +            request[0], header);
+        ret = -EPROTO;
          goto out;
      }
        if (response_buf) {
-        int count = min(response_buf_size, guc->send_regs.count - 1); +        int count = min(response_buf_size, guc->send_regs.count); -        for (i = 0; i < count; i++)
+        GEM_BUG_ON(!count);

drivers/gpu/drm/i915/gt/uc/intel_guc.c +4 -0
+
+        response_buf[0] = header;
+
+        for (i = 1; i < count; i++)

              response_buf[i] = intel_uncore_read(uncore, -                                guc_send_reg(guc, i + 1)); -    }
+                                guc_send_reg(guc, i));
  -    /* Use data from the GuC response as our return value */ -    ret = INTEL_GUC_MSG_TO_DATA(status);
+        /* Use number of copied dwords as our return value */ +        ret = count;
+    } else {
+        /* Use data from the GuC response as our return value */ +        ret = FIELD_GET(GUC_HXG_RESPONSE_MSG_0_DATA0, header); +    }
    out:
      intel_uncore_forcewake_put(uncore, guc->send_regs.fw_domains);

drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +4 -27
index 9abfbc6edbd6..b82145652d57 100644
@@ -24,10 +24,6 @@
    *      +---------------------------------------+
    *      | guc_gt_system_info                    |
    *      +---------------------------------------+
- *      | guc_clients_info                      |
- *      +---------------------------------------+
- *      | guc_ct_pool_entry[size]               |
- *      +---------------------------------------+
    *      | padding                               |
    *      +---------------------------------------+ <== 4K aligned
    *      | private data                          |
@@ -39,8 +35,6 @@ struct __guc_ads_blob {
       struct guc_ads ads;
       struct guc_policies policies;
       struct guc_gt_system_info system_info;
-    struct guc_clients_info clients_info;
-    struct guc_ct_pool_entry ct_pool[GUC_CT_POOL_SIZE];
   } __packed;
     static u32 guc_ads_private_data_size(struct intel_guc *guc)
@@ -59,38 +53,15 @@ static u32 guc_ads_blob_size(struct intel_guc *guc)
              guc_ads_private_data_size(guc);
   }
   -static void guc_policy_init(struct guc_policy *policy)
-{
-    policy->execution_quantum = POLICY_DEFAULT_EXECUTION_QUANTUM_US;
-    policy->preemption_time = POLICY_DEFAULT_PREEMPTION_TIME_US;
-    policy->fault_time = POLICY_DEFAULT_FAULT_TIME_US;
-    policy->policy_flags = 0;
-}
-
   static void guc_policies_init(struct guc_policies *policies)
   {
-    struct guc_policy *policy;
-    u32 p, i;
-
-    policies->dpc_promote_time = POLICY_DEFAULT_DPC_PROMOTE_TIME_US;
-    policies->max_num_work_items = POLICY_MAX_NUM_WI;
-
-    for (p = 0; p < GUC_CLIENT_PRIORITY_NUM; p++) {
-        for (i = 0; i < GUC_MAX_ENGINE_CLASSES; i++) {
-            policy = &policies->policy[p][i];
-
-            guc_policy_init(policy);
-        }
-    }
-
+    policies->dpc_promote_time =
 GLOBAL_POLICY_DEFAULT_DPC_PROMOTE_TIME_US;
+    policies->max_num_work_items = GLOBAL_POLICY_MAX_NUM_WI;
+    /* Disable automatic resets as not yet supported. */
+    policies->global_flags = GLOBAL_POLICY_DISABLE_ENGINE_RESET;
       policies->is_valid = 1;
   }

  -static void guc_ct_pool_entries_init(struct guc_ct_pool_entry *pool, u32 num)

drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +0 -4
-{
-    memset(pool, 0, num * sizeof(*pool));
-}
-

  static void guc_mapping_table_init(struct intel_gt *gt, struct guc_gt_system_info *system_info) {

drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +0 -0
@@ -178,17 +149,9 @@ static void __guc_ads_init(struct intel_guc *guc)
         base = intel_guc_ggtt_offset(guc, guc->ads_vma);

  -    /* Clients info  */
-    guc_ct_pool_entries_init(blob->ct_pool, ARRAY_SIZE(blob->ct_pool));

drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c +0 -5
-
-    blob->clients_info.clients_num = 1;
-    blob->clients_info.ct_pool_addr = base + ptr_offset(blob, ct_pool);
-    blob->clients_info.ct_pool_count = ARRAY_SIZE(blob->ct_pool);
-

      /* ADS */
      blob->ads.scheduler_policies = base + ptr_offset(blob, policies); blob->ads.gt_system_info = base + ptr_offset(blob, system_info); -    blob->ads.clients_info = base + ptr_offset(blob, clients_info); /* Private Data */
      blob->ads.private_data = base + guc_ads_private_data_offset(guc);

drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +2 -2
index 8f7b148fef58..43409044528e 100644
@@ -103,61 +103,66 @@ void intel_guc_ct_init_early(struct intel_guc_ct
 *ct)
   static inline const char *guc_ct_buffer_type_to_str(u32 type)
   {
       switch (type) {
-    case INTEL_GUC_CT_BUFFER_TYPE_SEND:
+    case GUC_CTB_TYPE_HOST2GUC:
           return "SEND";
-    case INTEL_GUC_CT_BUFFER_TYPE_RECV:
+    case GUC_CTB_TYPE_GUC2HOST:
           return "RECV";

      default:
          return "<invalid>";
      }
  }
  -static void guc_ct_buffer_desc_init(struct guc_ct_buffer_desc *desc, -                    u32 cmds_addr, u32 size)
+static void guc_ct_buffer_desc_init(struct guc_ct_buffer_desc *desc) {
      memset(desc, 0, sizeof(*desc));
-    desc->addr = cmds_addr;
-    desc->size = size;
-    desc->owner = CTB_OWNER_HOST;
  }
  -static void guc_ct_buffer_reset(struct intel_guc_ct_buffer *ctb, u32 cmds_addr)
+static void guc_ct_buffer_reset(struct intel_guc_ct_buffer *ctb) {
-    guc_ct_buffer_desc_init(ctb->desc, cmds_addr, ctb->size); +    ctb->broken = false;
+    guc_ct_buffer_desc_init(ctb->desc);
  }
    static void guc_ct_buffer_init(struct intel_guc_ct_buffer *ctb, struct guc_ct_buffer_desc *desc,
-                   u32 *cmds, u32 size)
+                   u32 *cmds, u32 size_in_bytes)
  {
-    GEM_BUG_ON(size % 4);
+    GEM_BUG_ON(size_in_bytes % 4);
        ctb->desc = desc;
      ctb->cmds = cmds;
-    ctb->size = size;
+    ctb->size = size_in_bytes / 4;
  -    guc_ct_buffer_reset(ctb, 0);
+    guc_ct_buffer_reset(ctb);
  }
  -static int guc_action_register_ct_buffer(struct intel_guc *guc, -                     u32 desc_addr,
-                     u32 type)
+static int guc_action_register_ct_buffer(struct intel_guc *guc, u32 type,
+                     u32 desc_addr, u32 buff_addr, u32 size) {
-    u32 action[] = {
-        INTEL_GUC_ACTION_REGISTER_COMMAND_TRANSPORT_BUFFER, -        desc_addr,
-        sizeof(struct guc_ct_buffer_desc),
-        type
+    u32 request[HOST2GUC_REGISTER_CTB_REQUEST_MSG_LEN] = { +        FIELD_PREP(GUC_HXG_MSG_0_ORIGIN, GUC_HXG_ORIGIN_HOST) | +        FIELD_PREP(GUC_HXG_MSG_0_TYPE, GUC_HXG_TYPE_REQUEST) | +        FIELD_PREP(GUC_HXG_REQUEST_MSG_0_ACTION, GUC_ACTION_HOST2GUC_REGISTER_CTB),
+        FIELD_PREP(HOST2GUC_REGISTER_CTB_REQUEST_MSG_1_SIZE, size / SZ_4K - 1) |
+        FIELD_PREP(HOST2GUC_REGISTER_CTB_REQUEST_MSG_1_TYPE, type), +        FIELD_PREP(HOST2GUC_REGISTER_CTB_REQUEST_MSG_2_DESC_ADDR, desc_addr),
+        FIELD_PREP(HOST2GUC_REGISTER_CTB_REQUEST_MSG_3_BUFF_ADDR, buff_addr),
      };
  -    /* Can't use generic send(), CT registration must go over MMIO */ -    return intel_guc_send_mmio(guc, action, ARRAY_SIZE(action), NULL, 0);
+    GEM_BUG_ON(type != GUC_CTB_TYPE_HOST2GUC && type != GUC_CTB_TYPE_GUC2HOST);
+    GEM_BUG_ON(size % SZ_4K);
+
+    /* CT registration must go over MMIO */
+    return intel_guc_send_mmio(guc, request, ARRAY_SIZE(request), NULL, 0);
  }
  -static int ct_register_buffer(struct intel_guc_ct *ct, u32 desc_addr, u32 type)
+static int ct_register_buffer(struct intel_guc_ct *ct, u32 type, +                  u32 desc_addr, u32 buff_addr, u32 size)
  {
-    int err = guc_action_register_ct_buffer(ct_to_guc(ct), desc_addr, type);
+    int err;
  +    err = guc_action_register_ct_buffer(ct_to_guc(ct), type, +                        desc_addr, buff_addr, size);
      if (unlikely(err))
          CT_ERROR(ct, "Failed to register %s buffer (err=%d)\n", guc_ct_buffer_type_to_str(type), err);

drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +5 -4
@@ -166,14 +171,17 @@ static int ct_register_buffer(struct
 intel_guc_ct *ct, u32 desc_addr, u32 type)
     static int guc_action_deregister_ct_buffer(struct intel_guc *guc,
 u32 type)
   {
-    u32 action[] = {
-        INTEL_GUC_ACTION_DEREGISTER_COMMAND_TRANSPORT_BUFFER,
-        CTB_OWNER_HOST,
-        type
+    u32 request[HOST2GUC_DEREGISTER_CTB_REQUEST_MSG_LEN] = {
+        FIELD_PREP(GUC_HXG_MSG_0_ORIGIN, GUC_HXG_ORIGIN_HOST) |
+        FIELD_PREP(GUC_HXG_MSG_0_TYPE, GUC_HXG_TYPE_REQUEST) |
+        FIELD_PREP(GUC_HXG_REQUEST_MSG_0_ACTION,
 GUC_ACTION_HOST2GUC_DEREGISTER_CTB),
+        FIELD_PREP(HOST2GUC_DEREGISTER_CTB_REQUEST_MSG_1_TYPE, type),
       };

  -    /* Can't use generic send(), CT deregistration must go over MMIO */
-    return intel_guc_send_mmio(guc, action, ARRAY_SIZE(action), NULL, 0);
+    GEM_BUG_ON(type != GUC_CTB_TYPE_HOST2GUC && type != GUC_CTB_TYPE_GUC2HOST);
+
+    /* CT deregistration must go over MMIO */
+    return intel_guc_send_mmio(guc, request, ARRAY_SIZE(request), NULL, 0);
  }
    static int ct_deregister_buffer(struct intel_guc_ct *ct, u32 type)

drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +1 -1
@@ -261,7 +269,7 @@ void intel_guc_ct_fini(struct intel_guc_ct *ct)
   int intel_guc_ct_enable(struct intel_guc_ct *ct)
   {
       struct intel_guc *guc = ct_to_guc(ct);
-    u32 base, cmds;
+    u32 base, desc, cmds;
       void *blob;
       int err;
   @@ -277,23 +285,26 @@ int intel_guc_ct_enable(struct intel_guc_ct *ct)

      GEM_BUG_ON(blob != ct->ctbs.send.desc);
        /* (re)initialize descriptors */
-    cmds = base + ptrdiff(ct->ctbs.send.cmds, blob);
-    guc_ct_buffer_reset(&ct->ctbs.send, cmds);
-
-    cmds = base + ptrdiff(ct->ctbs.recv.cmds, blob);
-    guc_ct_buffer_reset(&ct->ctbs.recv, cmds);
+    guc_ct_buffer_reset(&ct->ctbs.send);
+    guc_ct_buffer_reset(&ct->ctbs.recv);
        /*
       * Register both CT buffers starting with RECV buffer.
       * Descriptors are in first half of the blob.
       */
-    err = ct_register_buffer(ct, base + ptrdiff(ct->ctbs.recv.desc, blob),
-                 INTEL_GUC_CT_BUFFER_TYPE_RECV);
+    desc = base + ptrdiff(ct->ctbs.recv.desc, blob);
+    cmds = base + ptrdiff(ct->ctbs.recv.cmds, blob);
+    err = ct_register_buffer(ct, GUC_CTB_TYPE_GUC2HOST,
+                 desc, cmds, ct->ctbs.recv.size * 4);
+
      if (unlikely(err))
          goto err_out;
  -    err = ct_register_buffer(ct, base + ptrdiff(ct->ctbs.send.desc, blob),
-                 INTEL_GUC_CT_BUFFER_TYPE_SEND);
+    desc = base + ptrdiff(ct->ctbs.send.desc, blob);
+    cmds = base + ptrdiff(ct->ctbs.send.cmds, blob);
+    err = ct_register_buffer(ct, GUC_CTB_TYPE_HOST2GUC,
+                 desc, cmds, ct->ctbs.send.size * 4);
+
      if (unlikely(err))
          goto err_deregister;
  @@ -302,7 +313,7 @@ int intel_guc_ct_enable(struct intel_guc_ct *ct) return 0;
    err_deregister:
-    ct_deregister_buffer(ct, INTEL_GUC_CT_BUFFER_TYPE_RECV); +    ct_deregister_buffer(ct, GUC_CTB_TYPE_GUC2HOST); err_out:
      CT_PROBE_ERROR(ct, "Failed to enable CTB (%pe)\n", ERR_PTR(err)); return err;

drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +2 -2
@@ -321,8 +332,8 @@ void intel_guc_ct_disable(struct intel_guc_ct *ct)
       ct->enabled = false;
         if (intel_guc_is_fw_running(guc)) {
-        ct_deregister_buffer(ct, INTEL_GUC_CT_BUFFER_TYPE_SEND);
-        ct_deregister_buffer(ct, INTEL_GUC_CT_BUFFER_TYPE_RECV);
+        ct_deregister_buffer(ct, GUC_CTB_TYPE_HOST2GUC);
+        ct_deregister_buffer(ct, GUC_CTB_TYPE_GUC2HOST);
       }
   }
   @@ -354,24 +365,6 @@ static void write_barrier(struct intel_guc_ct *ct)
       }

  }
  -/**
- * DOC: CTB Host to GuC request
- *
- * Format of the CTB Host to GuC request message is as follows::
- *
- *      +------------+---------+---------+---------+---------+
- *      |   msg[0]   |   [1]   |   [2]   |   ...   |  [n-1]  |
- *      +------------+---------+---------+---------+---------+
- *      |   MESSAGE  |       MESSAGE PAYLOAD                 |
- *      +   HEADER   +---------+---------+---------+---------+
- *      |            |    0    |    1    |   ...   |    n    |
- *      +============+=========+=========+=========+=========+
- *      |  len >= 1  |  FENCE  |     request specific data   |
- *      +------+-----+---------+---------+---------+---------+
- *
- *                   ^-----------------len-------------------^
- */
-
  static int ct_write(struct intel_guc_ct *ct,
              const u32 *action,
              u32 len /* in dwords */,

drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +2 -0
@@ -384,20 +377,22 @@ static int ct_write(struct intel_guc_ct *ct,
       u32 size = ctb->size;
       u32 used;
       u32 header;
+    u32 hxg;
       u32 *cmds = ctb->cmds;
       unsigned int i;
   -    if (unlikely(desc->is_in_error))
+    if (unlikely(ctb->broken))
           return -EPIPE;

  -    if (unlikely(!IS_ALIGNED(head | tail, 4) ||
-             (tail | head) >= size))
+    if (unlikely(desc->status))
          goto corrupted;
  -    /* later calculations will be done in dwords */
-    head /= 4;
-    tail /= 4;
-    size /= 4;
+    if (unlikely((tail | head) >= size)) {
+        CT_ERROR(ct, "Invalid offsets head=%u tail=%u (size=%u)\n", +             head, tail, size);
+        desc->status |= GUC_CTB_STATUS_OVERFLOW;
+        goto corrupted;
+    }
        /*
       * tail == head condition indicates empty. GuC FW does not support

drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +13 -8
@@ -413,22 +408,25 @@ static int ct_write(struct intel_guc_ct *ct,
           return -ENOSPC;
         /*
-     * Write the message. The format is the following:
-     * DW0: header (including action code)
-     * DW1: fence
-     * DW2+: action data
+     * dw0: CT header (including fence)
+     * dw1: HXG header (including action code)
+     * dw2+: action data
        */
-    header = (len << GUC_CT_MSG_LEN_SHIFT) |
-         GUC_CT_MSG_SEND_STATUS |
-         (action[0] << GUC_CT_MSG_ACTION_SHIFT);
+    header = FIELD_PREP(GUC_CTB_MSG_0_FORMAT, GUC_CTB_FORMAT_HXG) |
+         FIELD_PREP(GUC_CTB_MSG_0_NUM_DWORDS, len) |
+         FIELD_PREP(GUC_CTB_MSG_0_FENCE, fence);
   -    CT_DEBUG(ct, "writing %*ph %*ph %*ph\n",
-         4, &header, 4, &fence, 4 * (len - 1), &action[1]);
+    hxg = FIELD_PREP(GUC_HXG_MSG_0_TYPE, GUC_HXG_TYPE_REQUEST) |
+          FIELD_PREP(GUC_HXG_REQUEST_MSG_0_ACTION |
+             GUC_HXG_REQUEST_MSG_0_DATA0, action[0]);
+
+    CT_DEBUG(ct, "writing (tail %u) %*ph %*ph %*ph\n",
+         tail, 4, &header, 4, &hxg, 4 * (len - 1), &action[1]);
         cmds[tail] = header;
       tail = (tail + 1) % size;
   -    cmds[tail] = fence;
+    cmds[tail] = hxg;
       tail = (tail + 1) % size;
         for (i = 1; i < len; i++) {
@@ -443,14 +441,15 @@ static int ct_write(struct intel_guc_ct *ct,
        */
       write_barrier(ct);

  -    /* now update desc tail (back in bytes) */
-    desc->tail = tail * 4;
+    /* now update descriptor */
+    WRITE_ONCE(desc->tail, tail);
+
      return 0;
    corrupted:
-    CT_ERROR(ct, "Corrupted descriptor addr=%#x head=%u tail=%u size=%u\n",
-         desc->addr, desc->head, desc->tail, desc->size); -    desc->is_in_error = 1;
+    CT_ERROR(ct, "Corrupted descriptor head=%u tail=%u status=%#x\n", +         desc->head, desc->tail, desc->status);
+    ctb->broken = true;
      return -EPIPE;
  }
  @@ -477,7 +476,9 @@ static int wait_for_ct_request_update(struct ct_request *req, u32 *status)
       * up to that length of time, then switch to a slower sleep-wait loop.
       * No GuC command should ever take longer than 10ms. */

drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +3 -1
-#define done INTEL_GUC_MSG_IS_RESPONSE(READ_ONCE(req->status))
+#define done \
+    (FIELD_GET(GUC_HXG_MSG_0_ORIGIN, READ_ONCE(req->status)) == \
+     GUC_HXG_ORIGIN_GUC)

      err = wait_for_us(done, 10);
      if (err)
          err = wait_for(done, 10);

drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +3 -2
@@ -532,21 +533,21 @@ static int ct_send(struct intel_guc_ct *ct,
       if (unlikely(err))
           goto unlink;
   -    if (!INTEL_GUC_MSG_IS_RESPONSE_SUCCESS(*status)) {
+    if (FIELD_GET(GUC_HXG_MSG_0_TYPE, *status) !=
 GUC_HXG_TYPE_RESPONSE_SUCCESS) {
           err = -EIO;
           goto unlink;
       }
         if (response_buf) {
           /* There shall be no data in the status */
-        WARN_ON(INTEL_GUC_MSG_TO_DATA(request.status));
+        WARN_ON(FIELD_GET(GUC_HXG_RESPONSE_MSG_0_DATA0,
 request.status));
           /* Return actual response len */
           err = request.response_len;
       } else {
           /* There shall be no response payload */
           WARN_ON(request.response_len);
           /* Return data decoded from the status dword */
-        err = INTEL_GUC_MSG_TO_DATA(*status);
+        err = FIELD_GET(GUC_HXG_RESPONSE_MSG_0_DATA0, *status);
       }

    unlink:

drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +0 -14
@@ -583,21 +584,6 @@ int intel_guc_ct_send(struct intel_guc_ct *ct,
 const u32 *action, u32 len,
       return ret;
   }
   -static inline unsigned int ct_header_get_len(u32 header)
-{
-    return (header >> GUC_CT_MSG_LEN_SHIFT) & GUC_CT_MSG_LEN_MASK;
-}
-
-static inline unsigned int ct_header_get_action(u32 header)
-{
-    return (header >> GUC_CT_MSG_ACTION_SHIFT) & GUC_CT_MSG_ACTION_MASK;
-}
-
-static inline bool ct_header_is_response(u32 header)
-{
-    return !!(header & GUC_CT_MSG_IS_RESPONSE);
-}
-
   static struct ct_incoming_msg *ct_alloc_msg(u32 num_dwords)
   {

      struct ct_incoming_msg *msg;

drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +1 -0
@@ -630,17 +616,18 @@ static int ct_read(struct intel_guc_ct *ct,
 struct ct_incoming_msg **msg)
       unsigned int i;
       u32 header;
   -    if (unlikely(desc->is_in_error))
+    if (unlikely(ctb->broken))
           return -EPIPE;

  -    if (unlikely(!IS_ALIGNED(head | tail, 4) ||
-             (tail | head) >= size))
+    if (unlikely(desc->status))
          goto corrupted;
  -    /* later calculations will be done in dwords */
-    head /= 4;
-    tail /= 4;
-    size /= 4;
+    if (unlikely((tail | head) >= size)) {
+        CT_ERROR(ct, "Invalid offsets head=%u tail=%u (size=%u)\n", +             head, tail, size);
+        desc->status |= GUC_CTB_STATUS_OVERFLOW;
+        goto corrupted;
+    }
        /* tail == head condition indicates empty */ available = tail - head;

drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +1 -1
@@ -659,7 +646,7 @@ static int ct_read(struct intel_guc_ct *ct, struct
 ct_incoming_msg **msg)
       head = (head + 1) % size;
         /* message len with header */
-    len = ct_header_get_len(header) + 1;
+    len = FIELD_GET(GUC_CTB_MSG_0_NUM_DWORDS, header) +
 GUC_CTB_MSG_MIN_LEN;
       if (unlikely(len > (u32)available)) {
           CT_ERROR(ct, "Incomplete message %*ph %*ph %*ph\n",

               4, &header,

drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +0 -0
@@ -667,6 +654,7 @@ static int ct_read(struct intel_guc_ct *ct, struct
 ct_incoming_msg **msg)
                     size - head : available - 1), &cmds[head],

               4 * (head + available - 1 > size ?
                    available - 1 - size + head : 0), &cmds[0]); +        desc->status |= GUC_CTB_STATUS_UNDERFLOW;
          goto corrupted;
      }
  @@ -689,65 +677,36 @@ static int ct_read(struct intel_guc_ct *ct, struct ct_incoming_msg **msg)
      }
      CT_DEBUG(ct, "received %*ph\n", 4 * len, (*msg)->msg); -    desc->head = head * 4;
+    /* now update descriptor */
+    WRITE_ONCE(desc->head, head);
+
      return available - len;
    corrupted:
-    CT_ERROR(ct, "Corrupted descriptor addr=%#x head=%u tail=%u size=%u\n",
-         desc->addr, desc->head, desc->tail, desc->size);
-    desc->is_in_error = 1;
+    CT_ERROR(ct, "Corrupted descriptor head=%u tail=%u status=%#x\n", +         desc->head, desc->tail, desc->status);
+    ctb->broken = true;
      return -EPIPE;
  }
  -/**
- * DOC: CTB GuC to Host response
- *
- * Format of the CTB GuC to Host response message is as follows::
- *
- *      +------------+---------+---------+---------+---------+---------+
- *      |   msg[0]   |   [1]   |   [2]   |   [3]   |   ...   |  [n-1]  |
- *      +------------+---------+---------+---------+---------+---------+
- *      |   MESSAGE  |       MESSAGE PAYLOAD                           |
- *      +   HEADER   +---------+---------+---------+---------+---------+
- *      |            |    0    |    1    |    2    |   ...   |    n    |
- *      +============+=========+=========+=========+=========+=========+
- *      |  len >= 2  |  FENCE  |  STATUS |   response specific data    |
- *      +------+-----+---------+---------+---------+---------+---------+
- *
- *                   ^-----------------------len-----------------------^
- */
-
  static int ct_handle_response(struct intel_guc_ct *ct, struct ct_incoming_msg *response)
  {
-    u32 header = response->msg[0];
-    u32 len = ct_header_get_len(header);
-    u32 fence;
-    u32 status;
-    u32 datalen;
+    u32 len = FIELD_GET(GUC_CTB_MSG_0_NUM_DWORDS, response->msg[0]); +    u32 fence = FIELD_GET(GUC_CTB_MSG_0_FENCE, response->msg[0]); +    const u32 *hxg = &response->msg[GUC_CTB_MSG_MIN_LEN];
+    const u32 *data = &hxg[GUC_HXG_MSG_MIN_LEN];
+    u32 datalen = len - GUC_HXG_MSG_MIN_LEN;
      struct ct_request *req;
      unsigned long flags;
      bool found = false;
      int err = 0;
  -    GEM_BUG_ON(!ct_header_is_response(header));

drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +2 -16
-
-    /* Response payload shall at least include fence and status */
-    if (unlikely(len < 2)) {
-        CT_ERROR(ct, "Corrupted response (len %u)\n", len);
-        return -EPROTO;
-    }
-
-    fence = response->msg[1];
-    status = response->msg[2];
-    datalen = len - 2;
-
-    /* Format of the status follows RESPONSE message */
-    if (unlikely(!INTEL_GUC_MSG_IS_RESPONSE(status))) {
-        CT_ERROR(ct, "Corrupted response (status %#x)\n", status);
-        return -EPROTO;
-    }
+    GEM_BUG_ON(len < GUC_HXG_MSG_MIN_LEN);
+    GEM_BUG_ON(FIELD_GET(GUC_HXG_MSG_0_ORIGIN, hxg[0]) !=

GUC_HXG_ORIGIN_GUC);
+    GEM_BUG_ON(FIELD_GET(GUC_HXG_MSG_0_TYPE, hxg[0]) != GUC_HXG_TYPE_RESPONSE_SUCCESS &&
+           FIELD_GET(GUC_HXG_MSG_0_TYPE, hxg[0]) != GUC_HXG_TYPE_RESPONSE_FAILURE);
  -    CT_DEBUG(ct, "response fence %u status %#x\n", fence, status); +    CT_DEBUG(ct, "response fence %u status %#x\n", fence, hxg[0]); spin_lock_irqsave(&ct->requests.lock, flags); list_for_each_entry(req, &ct->requests.pending, link) {

drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +2 -2
@@ -763,9 +722,9 @@ static int ct_handle_response(struct intel_guc_ct
 *ct, struct ct_incoming_msg *r
               err = -EMSGSIZE;
           }
           if (datalen)
-            memcpy(req->response_buf, response->msg + 3, 4 * datalen);
+            memcpy(req->response_buf, data, 4 * datalen);
           req->response_len = datalen;
-        WRITE_ONCE(req->status, status);
+        WRITE_ONCE(req->status, hxg[0]);
           found = true;
           break;

      }

drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +0 -0
@@ -786,14 +745,16 @@ static int ct_handle_response(struct

intel_guc_ct *ct, struct ct_incoming_msg *r
  static int ct_process_request(struct intel_guc_ct *ct, struct ct_incoming_msg *request)
  {
      struct intel_guc *guc = ct_to_guc(ct);
-    u32 header, action, len;
+    const u32 *hxg;
      const u32 *payload;
+    u32 hxg_len, action, len;
      int ret;
  -    header = request->msg[0];
-    payload = &request->msg[1];
-    action = ct_header_get_action(header);
-    len = ct_header_get_len(header);
+    hxg = &request->msg[GUC_CTB_MSG_MIN_LEN];
+    hxg_len = request->size - GUC_CTB_MSG_MIN_LEN;
+    payload = &hxg[GUC_HXG_MSG_MIN_LEN];
+    action = FIELD_GET(GUC_HXG_EVENT_MSG_0_ACTION, hxg[0]); +    len = hxg_len - GUC_HXG_MSG_MIN_LEN;
        CT_DEBUG(ct, "request %x %*ph\n", action, 4 * len, payload); @@ -855,29 +816,12 @@ static void ct_incoming_request_worker_func(struct work_struct *w) queue_work(system_unbound_wq, &ct->requests.worker); }
  -/**
- * DOC: CTB GuC to Host request
- *
- * Format of the CTB GuC to Host request message is as follows::
- *
- *      +------------+---------+---------+---------+---------+---------+
- *      |   msg[0]   |   [1]   |   [2]   |   [3]   |   ...   |  [n-1]  |
- *      +------------+---------+---------+---------+---------+---------+
- *      |   MESSAGE  |       MESSAGE PAYLOAD                           |
- *      +   HEADER   +---------+---------+---------+---------+---------+
- *      |            |    0    |    1    |    2    |   ...   |    n    |
- *      +============+=========+=========+=========+=========+=========+
- *      |     len    |            request specific data                |
- *      +------+-----+---------+---------+---------+---------+---------+
- *
- *                   ^-----------------------len-----------------------^
- */

drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +0 -2
-
-static int ct_handle_request(struct intel_guc_ct *ct, struct

ct_incoming_msg *request)
+static int ct_handle_event(struct intel_guc_ct *ct, struct ct_incoming_msg *request)
  {
+    const u32 *hxg = &request->msg[GUC_CTB_MSG_MIN_LEN]; unsigned long flags;
  -    GEM_BUG_ON(ct_header_is_response(request->msg[0])); +    GEM_BUG_ON(FIELD_GET(GUC_HXG_MSG_0_TYPE, hxg[0]) != GUC_HXG_TYPE_EVENT); spin_lock_irqsave(&ct->requests.lock, flags); list_add_tail(&request->link, &ct->requests.incoming);

drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +0 -0
@@ -887,15 +831,53 @@ static int ct_handle_request(struct intel_guc_ct
 *ct, struct ct_incoming_msg *re
       return 0;
   }

  -static void ct_handle_msg(struct intel_guc_ct *ct, struct ct_incoming_msg *msg)
+static int ct_handle_hxg(struct intel_guc_ct *ct, struct ct_incoming_msg *msg)
  {
-    u32 header = msg->msg[0];
+    u32 origin, type;
+    u32 *hxg;
      int err;
  -    if (ct_header_is_response(header))
+    if (unlikely(msg->size < GUC_CTB_HXG_MSG_MIN_LEN)) +        return -EBADMSG;

drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +16 -0
+
+    hxg = &msg->msg[GUC_CTB_MSG_MIN_LEN];
+
+    origin = FIELD_GET(GUC_HXG_MSG_0_ORIGIN, hxg[0]);
+    if (unlikely(origin != GUC_HXG_ORIGIN_GUC)) {
+        err = -EPROTO;
+        goto failed;
+    }
+
+    type = FIELD_GET(GUC_HXG_MSG_0_TYPE, hxg[0]);
+    switch (type) {
+    case GUC_HXG_TYPE_EVENT:
+        err = ct_handle_event(ct, msg);
+        break;
+    case GUC_HXG_TYPE_RESPONSE_SUCCESS:
+    case GUC_HXG_TYPE_RESPONSE_FAILURE:

          err = ct_handle_response(ct, msg);
+        break;
+    default:
+        err = -EOPNOTSUPP;
+    }

drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +10 -0
+
+    if (unlikely(err)) {
+failed:
+        CT_ERROR(ct, "Failed to handle HXG message (%pe) %*ph\n",
+             ERR_PTR(err), 4 * GUC_HXG_MSG_MIN_LEN, hxg);
+    }
+    return err;
+}
+
+static void ct_handle_msg(struct intel_guc_ct *ct, struct

ct_incoming_msg *msg)

drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c +6 -0
+{
+    u32 format = FIELD_GET(GUC_CTB_MSG_0_FORMAT, msg->msg[0]);
+    int err;
+
+    if (format == GUC_CTB_FORMAT_HXG)
+        err = ct_handle_hxg(ct, msg);

      else
-        err = ct_handle_request(ct, msg);
+        err = -EOPNOTSUPP;
        if (unlikely(err)) {
          CT_ERROR(ct, "Failed to process CT message (%pe) %*ph\n",

drivers/gpu/drm/i915/gt/uc/intel_guc_ct.h +3 -1
index cb222f202301..1ae2dde6db93 100644
@@ -31,13 +31,15 @@ struct intel_guc;
    * @lock: protects access to the commands buffer and buffer descriptor
    * @desc: pointer to the buffer descriptor
    * @cmds: pointer to the commands buffer
- * @size: size of the commands buffer
+ * @size: size of the commands buffer in dwords
+ * @broken: flag to indicate if descriptor data is broken
    */
   struct intel_guc_ct_buffer {
       spinlock_t lock;
       struct guc_ct_buffer_desc *desc;
       u32 *cmds;
       u32 size;
+    bool broken;
   };
     @@ -59,7 +61,7 @@ struct intel_guc_ct {
       struct tasklet_struct receive_tasklet;

        struct {
-        u32 last_fence; /* last fence used to send request */ +        u16 last_fence; /* last fence used to send request */ spinlock_t lock; /* protects pending requests list */ struct list_head pending; /* requests waiting for response */

drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +2 -4
index e9a9d85e2aa3..617ec601648d 100644
@@ -81,10 +81,8 @@
   #define   GUC_LOG_ALLOC_IN_MEGABYTE    (1 << 3)
   #define   GUC_LOG_CRASH_SHIFT        4
   #define   GUC_LOG_CRASH_MASK        (0x3 << GUC_LOG_CRASH_SHIFT)
-#define   GUC_LOG_DPC_SHIFT        6
-#define   GUC_LOG_DPC_MASK            (0x7 << GUC_LOG_DPC_SHIFT)
-#define   GUC_LOG_ISR_SHIFT        9
-#define   GUC_LOG_ISR_MASK            (0x7 << GUC_LOG_ISR_SHIFT)
+#define   GUC_LOG_DEBUG_SHIFT        6
+#define   GUC_LOG_DEBUG_MASK            (0xF << GUC_LOG_DEBUG_SHIFT)
   #define   GUC_LOG_BUF_ADDR_SHIFT    12
     #define GUC_CTL_WA            1
@@ -247,32 +245,14 @@ struct guc_stage_desc {
     /* Scheduling policy settings */

  -/* Reset engine upon preempt failure */

drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +0 -14
-#define POLICY_RESET_ENGINE        (1<<0)
-/* Preempt to idle on quantum expiry */
-#define POLICY_PREEMPT_TO_IDLE        (1<<1)
-
-#define POLICY_MAX_NUM_WI 15
-#define POLICY_DEFAULT_DPC_PROMOTE_TIME_US 500000
-#define POLICY_DEFAULT_EXECUTION_QUANTUM_US 1000000
-#define POLICY_DEFAULT_PREEMPTION_TIME_US 500000
-#define POLICY_DEFAULT_FAULT_TIME_US 250000
-
-struct guc_policy {
-    /* Time for one workload to execute. (in micro seconds) */
-    u32 execution_quantum;
-    /* Time to wait for a preemption request to completed before

issuing a
-     * reset. (in micro seconds). */
-    u32 preemption_time;
-    /* How much time to allow to run after the first fault is observed. -     * Then preempt afterwards. (in micro seconds) */
-    u32 fault_time;
-    u32 policy_flags;
-    u32 reserved[8];

drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +6 -1
-} __packed;
+#define GLOBAL_POLICY_MAX_NUM_WI 15
+
+/* Don't reset an engine upon preemption failure */
+#define GLOBAL_POLICY_DISABLE_ENGINE_RESET                BIT(0)
+
+#define GLOBAL_POLICY_DEFAULT_DPC_PROMOTE_TIME_US 500000

    struct guc_policies {
-    struct guc_policy policy[GUC_CLIENT_PRIORITY_NUM][GUC_MAX_ENGINE_CLASSES];
      u32 submission_queue_depth[GUC_MAX_ENGINE_CLASSES];
      /* In micro seconds. How much time to allow before DPC processing is
       * called back via interrupt (to prevent DPC queue drain starving).

drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +0 -0
@@ -286,6 +266,7 @@ struct guc_policies {
        * idle. */
       u32 max_num_work_items;
   +    u32 global_flags;
       u32 reserved[4];
   } __packed;
   @@ -311,29 +292,13 @@ struct guc_gt_system_info {

      u32 generic_gt_sysinfo[GUC_GENERIC_GT_SYSINFO_MAX]; } __packed;
  -/* Clients info */

drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +0 -15
-struct guc_ct_pool_entry {
-    struct guc_ct_buffer_desc desc;
-    u32 reserved[7];
-} __packed;
-
-#define GUC_CT_POOL_SIZE    2
-
-struct guc_clients_info {
-    u32 clients_num;
-    u32 reserved0[13];
-    u32 ct_pool_addr;
-    u32 ct_pool_count;
-    u32 reserved[4];
-} __packed;
-

  /* GuC Additional Data Struct */
  struct guc_ads {
      struct guc_mmio_reg_set reg_state_list[GUC_MAX_ENGINE_CLASSES][GUC_MAX_INSTANCES_PER_CLASS]; u32 reserved0;
      u32 scheduler_policies;
      u32 gt_system_info;
-    u32 clients_info;
+    u32 reserved1;
      u32 control_data;
      u32 golden_context_lrca[GUC_MAX_ENGINE_CLASSES]; u32 eng_state_size[GUC_MAX_ENGINE_CLASSES];

drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +1 -2
@@ -344,8 +309,7 @@ struct guc_ads {
   /* GuC logging structures */
     enum guc_log_buffer_type {
-    GUC_ISR_LOG_BUFFER,
-    GUC_DPC_LOG_BUFFER,
+    GUC_DEBUG_LOG_BUFFER,
       GUC_CRASH_DUMP_LOG_BUFFER,

      GUC_MAX_LOG_BUFFER
  };

drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h +0 -16
@@ -414,23 +378,6 @@ struct guc_shared_ctx_data {
       struct guc_ctx_report preempt_ctx_report[GUC_MAX_ENGINES_NUM];
   } __packed;
   -#define __INTEL_GUC_MSG_GET(T, m) \
-    (((m) & INTEL_GUC_MSG_ ## T ## _MASK) >> INTEL_GUC_MSG_ ## T ##
 _SHIFT)
-#define INTEL_GUC_MSG_TO_TYPE(m)    __INTEL_GUC_MSG_GET(TYPE, m)
-#define INTEL_GUC_MSG_TO_DATA(m)    __INTEL_GUC_MSG_GET(DATA, m)
-#define INTEL_GUC_MSG_TO_CODE(m)    __INTEL_GUC_MSG_GET(CODE, m)
-
-#define __INTEL_GUC_MSG_TYPE_IS(T, m) \
-    (INTEL_GUC_MSG_TO_TYPE(m) == INTEL_GUC_MSG_TYPE_ ## T)
-#define INTEL_GUC_MSG_IS_REQUEST(m)   
 __INTEL_GUC_MSG_TYPE_IS(REQUEST, m)
-#define INTEL_GUC_MSG_IS_RESPONSE(m)   
 __INTEL_GUC_MSG_TYPE_IS(RESPONSE, m)
-
-#define INTEL_GUC_MSG_IS_RESPONSE_SUCCESS(m) \
-     (typecheck(u32, (m)) && \
-      ((m) & (INTEL_GUC_MSG_TYPE_MASK | INTEL_GUC_MSG_CODE_MASK)) == \
-      ((INTEL_GUC_MSG_TYPE_RESPONSE << INTEL_GUC_MSG_TYPE_SHIFT) | \
-       (INTEL_GUC_RESPONSE_STATUS_SUCCESS << INTEL_GUC_MSG_CODE_SHIFT)))
-

  /* This action will be programmed in C1BC - SOFT_SCRATCH_15_REG */ enum intel_guc_recv_message { INTEL_GUC_RECV_MSG_CRASH_DUMP_POSTED = BIT(1),

drivers/gpu/drm/i915/gt/uc/intel_guc_log.c +0 -0
index c36d5eb5bbb9..ac0931f0374b 100644
@@ -197,10 +197,8 @@ static bool guc_check_log_buf_overflow(struct
 intel_guc_log *log,

  static unsigned int guc_get_log_buffer_size(enum guc_log_buffer_type type)
  {
      switch (type) {
-    case GUC_ISR_LOG_BUFFER:
-        return ISR_BUFFER_SIZE;
-    case GUC_DPC_LOG_BUFFER:
-        return DPC_BUFFER_SIZE;
+    case GUC_DEBUG_LOG_BUFFER:
+        return DEBUG_BUFFER_SIZE;
      case GUC_CRASH_DUMP_LOG_BUFFER:
          return CRASH_BUFFER_SIZE;
      default:

drivers/gpu/drm/i915/gt/uc/intel_guc_log.c +1 -0
@@ -245,7 +243,7 @@ static void guc_read_update_log_buffer(struct
 intel_guc_log *log)
       src_data += PAGE_SIZE;
       dst_data += PAGE_SIZE;
   -    for (type = GUC_ISR_LOG_BUFFER; type < GUC_MAX_LOG_BUFFER;
 type++) {
+    for (type = GUC_DEBUG_LOG_BUFFER; type < GUC_MAX_LOG_BUFFER;
 type++) {

          /*
           * Make a copy of the state structure, inside GuC log buffer
           * (which is uncached mapped), on the stack to avoid reading

drivers/gpu/drm/i915/gt/uc/intel_guc_log.c +6 -13
@@ -463,21 +461,16 @@ int intel_guc_log_create(struct intel_guc_log *log)
        *  +===============================+ 00B
        *  |    Crash dump state header    |
        *  +-------------------------------+ 32B
-     *  |       DPC state header        |
+     *  |      Debug state header       |
        *  +-------------------------------+ 64B
-     *  |       ISR state header        |
-     *  +-------------------------------+ 96B
        *  |                               |
        *  +===============================+ PAGE_SIZE (4KB)
        *  |        Crash Dump logs        |
        *  +===============================+ + CRASH_SIZE
-     *  |           DPC logs            |
-     *  +===============================+ + DPC_SIZE
-     *  |           ISR logs            |
-     *  +===============================+ + ISR_SIZE
+     *  |          Debug logs           |
+     *  +===============================+ + DEBUG_SIZE
        */
-    guc_log_size = PAGE_SIZE + CRASH_BUFFER_SIZE + DPC_BUFFER_SIZE +
-            ISR_BUFFER_SIZE;
+    guc_log_size = PAGE_SIZE + CRASH_BUFFER_SIZE + DEBUG_BUFFER_SIZE;
         vma = intel_guc_allocate_vma(guc, guc_log_size);
       if (IS_ERR(vma)) {
@@ -675,10 +668,8 @@ static const char *
   stringify_guc_log_type(enum guc_log_buffer_type type)
   {
       switch (type) {
-    case GUC_ISR_LOG_BUFFER:
-        return "ISR";
-    case GUC_DPC_LOG_BUFFER:
-        return "DPC";
+    case GUC_DEBUG_LOG_BUFFER:
+        return "DEBUG";

      case GUC_CRASH_DUMP_LOG_BUFFER:
          return "CRASH";
      default:

drivers/gpu/drm/i915/gt/uc/intel_guc_log.c +1 -0
@@ -708,7 +699,7 @@ void intel_guc_log_info(struct intel_guc_log *log,
 struct drm_printer *p)
         drm_printf(p, "\tRelay full count: %u\n", log->relay.full_count);
   -    for (type = GUC_ISR_LOG_BUFFER; type < GUC_MAX_LOG_BUFFER;
 type++) {
+    for (type = GUC_DEBUG_LOG_BUFFER; type < GUC_MAX_LOG_BUFFER;
 type++) {
           drm_printf(p, "\t%s:\tflush count %10u, overflow count %10u\n",

                 stringify_guc_log_type(type),
                 log->stats[type].flush,

drivers/gpu/drm/i915/gt/uc/intel_guc_log.h +2 -4
index 11fccd0b2294..ac1ee1d5ce10 100644
@@ -17,12 +17,10 @@ struct intel_guc;
     #ifdef CONFIG_DRM_I915_DEBUG_GUC
   #define CRASH_BUFFER_SIZE    SZ_2M
-#define DPC_BUFFER_SIZE        SZ_8M
-#define ISR_BUFFER_SIZE        SZ_8M
+#define DEBUG_BUFFER_SIZE    SZ_16M
   #else
   #define CRASH_BUFFER_SIZE    SZ_8K
-#define DPC_BUFFER_SIZE        SZ_32K
-#define ISR_BUFFER_SIZE        SZ_32K
+#define DEBUG_BUFFER_SIZE    SZ_64K
   #endif
     /*
drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +0 -8
index df647c9a8d56..9f23e9de3237 100644
@@ -48,19 +48,19 @@ void intel_uc_fw_change_status(struct intel_uc_fw
 *uc_fw,
    * firmware as TGL.
    */
   #define INTEL_UC_FIRMWARE_DEFS(fw_def, guc_def, huc_def) \
-    fw_def(ALDERLAKE_S, 0, guc_def(tgl, 49, 0, 1), huc_def(tgl,  7,
 5, 0)) \
-    fw_def(ROCKETLAKE,  0, guc_def(tgl, 49, 0, 1), huc_def(tgl,  7,
 5, 0)) \
-    fw_def(TIGERLAKE,   0, guc_def(tgl, 49, 0, 1), huc_def(tgl,  7,
 5, 0)) \
-    fw_def(JASPERLAKE,  0, guc_def(ehl, 49, 0, 1), huc_def(ehl,  9,
 0, 0)) \
-    fw_def(ELKHARTLAKE, 0, guc_def(ehl, 49, 0, 1), huc_def(ehl,  9,
 0, 0)) \
-    fw_def(ICELAKE,     0, guc_def(icl, 49, 0, 1), huc_def(icl,  9,
 0, 0)) \
-    fw_def(COMETLAKE,   5, guc_def(cml, 49, 0, 1), huc_def(cml,  4,
 0, 0)) \
-    fw_def(COMETLAKE,   0, guc_def(kbl, 49, 0, 1), huc_def(kbl,  4,

0, 0)) \
-    fw_def(COFFEELAKE,  0, guc_def(kbl, 49, 0, 1), huc_def(kbl,  4, 0, 0)) \
-    fw_def(GEMINILAKE,  0, guc_def(glk, 49, 0, 1), huc_def(glk,  4, 0, 0)) \
-    fw_def(KABYLAKE,    0, guc_def(kbl, 49, 0, 1), huc_def(kbl,  4, 0, 0)) \
-    fw_def(BROXTON,     0, guc_def(bxt, 49, 0, 1), huc_def(bxt,  2, 0, 0)) \
-    fw_def(SKYLAKE,     0, guc_def(skl, 49, 0, 1), huc_def(skl,  2, 0, 0))
+    fw_def(ALDERLAKE_S, 0, guc_def(tgl, 62, 0, 0), huc_def(tgl,  7, 5, 0)) \
+    fw_def(ROCKETLAKE,  0, guc_def(tgl, 62, 0, 0), huc_def(tgl,  7, 5, 0)) \
+    fw_def(TIGERLAKE,   0, guc_def(tgl, 62, 0, 0), huc_def(tgl,  7, 5, 0)) \
+    fw_def(JASPERLAKE,  0, guc_def(ehl, 62, 0, 0), huc_def(ehl,  9, 0, 0)) \
+    fw_def(ELKHARTLAKE, 0, guc_def(ehl, 62, 0, 0), huc_def(ehl,  9, 0, 0)) \
+    fw_def(ICELAKE,     0, guc_def(icl, 62, 0, 0), huc_def(icl,  9, 0, 0)) \
+    fw_def(COMETLAKE,   5, guc_def(cml, 62, 0, 0), huc_def(cml,  4, 0, 0)) \
+    fw_def(COMETLAKE,   0, guc_def(kbl, 62, 0, 0), huc_def(kbl,  4, 0, 0)) \
+    fw_def(COFFEELAKE,  0, guc_def(kbl, 62, 0, 0), huc_def(kbl,  4, 0, 0)) \
+    fw_def(GEMINILAKE,  0, guc_def(glk, 62, 0, 0), huc_def(glk,  4, 0, 0)) \
+    fw_def(KABYLAKE,    0, guc_def(kbl, 62, 0, 0), huc_def(kbl,  4, 0, 0)) \
+    fw_def(BROXTON,     0, guc_def(bxt, 62, 0, 0), huc_def(bxt,  2, 0, 0)) \
+    fw_def(SKYLAKE,     0, guc_def(skl, 62, 0, 0), huc_def(skl,  2, 0, 0))
    #define __MAKE_UC_FW_PATH(prefix_, name_, major_, minor_, patch_) \
      "i915/" \

#5 lore raw

PATCH 3/3 drm/i915/doc: Include GuC ABI documentation

In reply to Matthew Brost

From: Michal Wajdeczko <[email protected]>

GuC ABI documentation is now ready to be included in i915.rst

---
 Documentation/gpu/i915.rst | 8 ++++++++
 1 file changed, 8 insertions(+)
Documentation/gpu/i915.rst +8 -0
index 42ce0196930a..c7846b1d9293 100644
@@ -518,6 +518,14 @@ GuC-based command submission
 .. kernel-doc:: drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
    :doc: GuC-based command submission
 
+GuC ABI
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. kernel-doc:: drivers/gpu/drm/i915/gt/uc/abi/guc_messages_abi.h
+.. kernel-doc:: drivers/gpu/drm/i915/gt/uc/abi/guc_communication_mmio_abi.h
+.. kernel-doc:: drivers/gpu/drm/i915/gt/uc/abi/guc_communication_ctb_abi.h
+.. kernel-doc:: drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h
+
 HuC
 ---
 .. kernel-doc:: drivers/gpu/drm/i915/gt/uc/intel_huc.c
Signature · 1 line
2.28.0
#6 lore raw

[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Update firmware to v62.0.0 (rev4)

In reply to Matthew Brost
== Series Details ==

== Series Details ==

Series: Update firmware to v62.0.0 (rev4)
URL : https://patchwork.freedesktop.org/series/91106/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
20bd5d817f52 drm/i915/guc: Introduce unified HXG messages
899d9ce395b2 drm/i915/guc: Update firmware to v62.0.0
-:78: CHECK:CAMELCASE: Avoid CamelCase: <GUC_HXG_REQUEST_MSG_n_DATAn>
#78: FILE: drivers/gpu/drm/i915/gt/uc/abi/guc_actions_abi.h:60:
+#define HOST2GUC_REGISTER_CTB_REQUEST_MSG_2_DESC_ADDR	GUC_HXG_REQUEST_MSG_n_DATAn

total: 0 errors, 0 warnings, 1 checks, 1394 lines checked 386ac142a390 drm/i915/doc: Include GuC ABI documentation

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#7 lore raw

[Intel-gfx] ✗ Fi.CI.SPARSE: warning for Update firmware to v62.0.0 (rev4)

In reply to Matthew Brost
== Series Details ==

== Series Details ==

Series: Update firmware to v62.0.0 (rev4)
URL : https://patchwork.freedesktop.org/series/91106/
State : warning

== Summary ==

$ dim sparse --fast origin/drm-tip
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately.
-
+drivers/gpu/drm/i915/display/intel_display.c:1893:21:    expected struct i915_vma *[assigned] vma
+drivers/gpu/drm/i915/display/intel_display.c:1893:21:    got void [noderef] __iomem *[assigned] iomem
+drivers/gpu/drm/i915/display/intel_display.c:1893:21: warning: incorrect type in assignment (different address spaces)
+drivers/gpu/drm/i915/gem/i915_gem_ttm.c:564:38: warning: symbol 'i915_gem_ttm_obj_ops' was not declared. Should it be static?
+drivers/gpu/drm/i915/gt/intel_engine_stats.h:27:9: warning: trying to copy expression type 31
+drivers/gpu/drm/i915/gt/intel_engine_stats.h:27:9: warning: trying to copy expression type 31
+drivers/gpu/drm/i915/gt/intel_engine_stats.h:27:9: warning: trying to copy expression type 31
+drivers/gpu/drm/i915/gt/intel_engine_stats.h:32:9: warning: trying to copy expression type 31
+drivers/gpu/drm/i915/gt/intel_engine_stats.h:32:9: warning: trying to copy expression type 31
+drivers/gpu/drm/i915/gt/intel_engine_stats.h:49:9: warning: trying to copy expression type 31
+drivers/gpu/drm/i915/gt/intel_engine_stats.h:49:9: warning: trying to copy expression type 31
+drivers/gpu/drm/i915/gt/intel_engine_stats.h:49:9: warning: trying to copy expression type 31
+drivers/gpu/drm/i915/gt/intel_engine_stats.h:56:9: warning: trying to copy expression type 31
+drivers/gpu/drm/i915/gt/intel_engine_stats.h:56:9: warning: trying to copy expression type 31
+drivers/gpu/drm/i915/gt/intel_reset.c:1396:5: warning: context imbalance in 'intel_gt_reset_trylock' - different lock contexts for basic block
+drivers/gpu/drm/i915/gt/intel_ring_submission.c:1207:24: warning: Using plain integer as NULL pointer
+drivers/gpu/drm/i915/i915_perf.c:1434:15: warning: memset with byte count of 16777216
+drivers/gpu/drm/i915/i915_perf.c:1488:15: warning: memset with byte count of 16777216
+./include/asm-generic/bitops/find.h:112:45: warning: shift count is negative (-262080)
+./include/asm-generic/bitops/find.h:32:31: warning: shift count is negative (-262080)
+./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read16' - different lock contexts for basic block
+./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read32' - different lock contexts for basic block
+./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read64' - different lock contexts for basic block
+./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read8' - different lock contexts for basic block
+./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_write16' - different lock contexts for basic block
+./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_write32' - different lock contexts for basic block
+./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_write8' - different lock contexts for basic block
+./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read16' - different lock contexts for basic block
+./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read32' - different lock contexts for basic block
+./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read64' - different lock contexts for basic block
+./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read8' - different lock contexts for basic block
+./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_write16' - different lock contexts for basic block
+./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_write32' - different lock contexts for basic block
+./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_write8' - different lock contexts for basic block
+./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read16' - different lock contexts for basic block
+./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read32' - different lock contexts for basic block
+./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read64' - different lock contexts for basic block
+./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read8' - different lock contexts for basic block
+./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_write16' - different lock contexts for basic block
+./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_write32' - different lock contexts for basic block
+./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_write8' - different lock contexts for basic block
+./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read16' - different lock contexts for basic block
+./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read32' - different lock contexts for basic block
+./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read64' - different lock contexts for basic block
+./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read8' - different lock contexts for basic block
+./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_write16' - different lock contexts for basic block
+./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_write32' - different lock contexts for basic block
+./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_write8' - different lock contexts for basic block
+./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen8_write16' - different lock contexts for basic block
+./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen8_write32' - different lock contexts for basic block
+./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen8_write8' - different lock contexts for basic block

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#8 lore raw

[Intel-gfx] ✓ Fi.CI.BAT: success for Update firmware to v62.0.0 (rev4)

In reply to Matthew Brost
== Series Details ==

== Series Details ==

Series: Update firmware to v62.0.0 (rev4)
URL : https://patchwork.freedesktop.org/series/91106/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_10226 -> Patchwork_20379
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/index.html

Known issues
------------

Here are the changes found in Patchwork_20379 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@amdgpu/amd_basic@semaphore:
- fi-bdw-5557u: NOTRUN -> [SKIP][1] ([fdo#109271]) +23 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/fi-bdw-5557u/igt@amdgpu/[email protected]

* igt@amdgpu/amd_cs_nop@sync-fork-compute0:
- fi-snb-2600: NOTRUN -> [SKIP][2] ([fdo#109271]) +17 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/fi-snb-2600/igt@amdgpu/[email protected]

* igt@core_hotunplug@unbind-rebind:
- fi-bdw-5557u: NOTRUN -> [WARN][3] ([i915#2283])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/fi-bdw-5557u/igt@[email protected]

#### Possible fixes ####

* igt@gem_exec_suspend@basic-s3:
- {fi-tgl-1115g4}: [FAIL][4] ([i915#1888]) -> [PASS][5]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/fi-tgl-1115g4/igt@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/fi-tgl-1115g4/igt@[email protected]

* igt@i915_selftest@live@hangcheck:
- fi-snb-2600: [INCOMPLETE][6] ([i915#2782]) -> [PASS][7]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/fi-snb-2600/igt@i915_selftest@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/fi-snb-2600/igt@i915_selftest@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1888]: https://gitlab.freedesktop.org/drm/intel/issues/1888
[i915#2283]: https://gitlab.freedesktop.org/drm/intel/issues/2283
[i915#2782]: https://gitlab.freedesktop.org/drm/intel/issues/2782

Participating hosts (43 -> 38)
------------------------------

Missing (5): fi-ilk-m540 fi-hsw-4200u fi-bsw-cyan fi-ctg-p8600 fi-bdw-samus

Build changes
-------------

* Linux: CI_DRM_10226 -> Patchwork_20379

CI-20190529: 20190529
CI_DRM_10226: e59107e71dfda22b959337ca2dd68b1bcbe78710 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6108: be59e0579cca677566c85540219fb9545e9afadf @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_20379: 386ac142a39041acd5bd35391567056b9146e62f @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

386ac142a390 drm/i915/doc: Include GuC ABI documentation 899d9ce395b2 drm/i915/guc: Update firmware to v62.0.0 20bd5d817f52 drm/i915/guc: Introduce unified HXG messages

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/index.html

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#9 lore raw

[Intel-gfx] ✗ Fi.CI.IGT: failure for Update firmware to v62.0.0 (rev4)

In reply to Matthew Brost
== Series Details ==

== Series Details ==

Series: Update firmware to v62.0.0 (rev4)
URL : https://patchwork.freedesktop.org/series/91106/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_10226_full -> Patchwork_20379_full
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with Patchwork_20379_full absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_20379_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in Patchwork_20379_full:

### IGT changes ###

#### Possible regressions ####

* igt@kms_big_fb@linear-32bpp-rotate-180:
- shard-iclb: [PASS][1] -> [DMESG-WARN][2] +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb4/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb1/igt@[email protected]

#### Warnings ####

* igt@gem_exec_fair@basic-pace-solo@rcs0:
- shard-glk: [FAIL][3] ([i915#2842]) -> [FAIL][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-glk2/igt@gem_exec_fair@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-glk3/igt@gem_exec_fair@[email protected]

Known issues
------------

Here are the changes found in Patchwork_20379_full that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_create@create-clear:
- shard-glk: [PASS][5] -> [FAIL][6] ([i915#3160])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-glk2/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-glk3/igt@[email protected]

* igt@gem_ctx_isolation@preservation-s3@bcs0:
- shard-kbl: [PASS][7] -> [DMESG-WARN][8] ([i915#180]) +2 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl6/igt@gem_ctx_isolation@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl4/igt@gem_ctx_isolation@[email protected]

* igt@gem_ctx_persistence@engines-queued:
- shard-snb: NOTRUN -> [SKIP][9] ([fdo#109271] / [i915#1099]) +2 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-snb7/igt@[email protected]

* igt@gem_exec_fair@basic-flow@rcs0:
- shard-skl: NOTRUN -> [SKIP][10] ([fdo#109271]) +72 similar issues
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl6/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-apl: [PASS][11] -> [SKIP][12] ([fdo#109271])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-apl3/igt@gem_exec_fair@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl3/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-none-solo@rcs0:
- shard-kbl: [PASS][13] -> [FAIL][14] ([i915#2842])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl6/igt@gem_exec_fair@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl1/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-none@vecs0:
- shard-apl: NOTRUN -> [FAIL][15] ([i915#2842] / [i915#3468])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl1/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace@vecs0:
- shard-tglb: [PASS][16] -> [FAIL][17] ([i915#2842]) +2 similar issues
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-tglb3/igt@gem_exec_fair@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-tglb2/igt@gem_exec_fair@[email protected]

* igt@gem_exec_reloc@basic-wide-active@rcs0:
- shard-snb: NOTRUN -> [FAIL][18] ([i915#2389]) +2 similar issues
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-snb7/igt@gem_exec_reloc@[email protected]

* igt@gem_exec_schedule@semaphore-codependency:
- shard-snb: NOTRUN -> [SKIP][19] ([fdo#109271]) +265 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-snb7/igt@[email protected]

* igt@gem_userptr_blits@input-checking:
- shard-apl: NOTRUN -> [DMESG-WARN][20] ([i915#3002])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl1/igt@[email protected]

* igt@gem_userptr_blits@vma-merge:
- shard-snb: NOTRUN -> [FAIL][21] ([i915#2724])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-snb6/igt@[email protected]

* igt@gem_workarounds@suspend-resume:
- shard-apl: [PASS][22] -> [DMESG-WARN][23] ([i915#180]) +2 similar issues
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-apl1/igt@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl6/igt@[email protected]

* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-kbl: NOTRUN -> [SKIP][24] ([fdo#109271] / [i915#658])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl7/igt@[email protected]

* igt@i915_pm_rpm@system-suspend-modeset:
- shard-skl: [PASS][25] -> [INCOMPLETE][26] ([i915#151])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl2/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl9/igt@[email protected]

* igt@i915_selftest@live@gt_pm:
- shard-skl: NOTRUN -> [DMESG-FAIL][27] ([i915#1886] / [i915#2291])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl7/igt@i915_selftest@live@gt_pm.html

* igt@kms_big_fb@x-tiled-32bpp-rotate-180:
- shard-glk: [PASS][28] -> [DMESG-WARN][29] ([i915#118] / [i915#95])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-glk4/igt@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-glk8/igt@[email protected]

* igt@kms_chamelium@hdmi-hpd-for-each-pipe:
- shard-kbl: NOTRUN -> [SKIP][30] ([fdo#109271] / [fdo#111827]) +3 similar issues
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl7/igt@[email protected]

* igt@kms_chamelium@hdmi-mode-timings:
- shard-snb: NOTRUN -> [SKIP][31] ([fdo#109271] / [fdo#111827]) +15 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-snb6/igt@[email protected]

* igt@kms_color_chamelium@pipe-a-ctm-blue-to-red:
- shard-iclb: NOTRUN -> [SKIP][32] ([fdo#109284] / [fdo#111827])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb1/igt@[email protected]

* igt@kms_color_chamelium@pipe-d-ctm-green-to-red:
- shard-skl: NOTRUN -> [SKIP][33] ([fdo#109271] / [fdo#111827]) +5 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl7/igt@[email protected]

* igt@kms_color_chamelium@pipe-invalid-degamma-lut-sizes:
- shard-apl: NOTRUN -> [SKIP][34] ([fdo#109271] / [fdo#111827]) +10 similar issues
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl3/igt@[email protected]

* igt@kms_content_protection@atomic-dpms:
- shard-kbl: NOTRUN -> [TIMEOUT][35] ([i915#1319])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl3/igt@[email protected]

* igt@kms_content_protection@legacy:
- shard-iclb: NOTRUN -> [SKIP][36] ([fdo#109300] / [fdo#111066])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb1/igt@[email protected]

* igt@kms_cursor_crc@pipe-d-cursor-suspend:
- shard-kbl: NOTRUN -> [SKIP][37] ([fdo#109271]) +66 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl3/igt@[email protected]

* igt@kms_cursor_legacy@flip-vs-cursor-varying-size:
- shard-skl: [PASS][38] -> [FAIL][39] ([i915#2346])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl1/igt@[email protected]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl3/igt@[email protected]

* igt@kms_cursor_legacy@pipe-d-torture-bo:
- shard-skl: NOTRUN -> [SKIP][40] ([fdo#109271] / [i915#533])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl6/igt@[email protected]

* igt@kms_dp_tiled_display@basic-test-pattern-with-chamelium:
- shard-iclb: NOTRUN -> [SKIP][41] ([i915#3528])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb1/igt@[email protected]

* igt@kms_draw_crc@draw-method-xrgb2101010-pwrite-xtiled:
- shard-skl: [PASS][42] -> [DMESG-WARN][43] ([i915#1982]) +1 similar issue
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl8/igt@[email protected]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl8/igt@[email protected]

* igt@kms_fbcon_fbt@fbc-suspend:
- shard-apl: [PASS][44] -> [INCOMPLETE][45] ([i915#180] / [i915#1982])
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-apl6/igt@[email protected]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl8/igt@[email protected]
- shard-kbl: [PASS][46] -> [INCOMPLETE][47] ([i915#155] / [i915#180] / [i915#636])
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl3/igt@[email protected]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl7/igt@[email protected]

* igt@kms_flip@2x-dpms-vs-vblank-race:
- shard-iclb: NOTRUN -> [SKIP][48] ([fdo#109274])
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb1/igt@[email protected]

* igt@kms_flip@flip-vs-suspend-interruptible@c-dp1:
- shard-apl: NOTRUN -> [DMESG-WARN][49] ([i915#180]) +3 similar issues
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl8/igt@kms_flip@[email protected]

* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs:
- shard-skl: NOTRUN -> [SKIP][50] ([fdo#109271] / [i915#2672])
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl7/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs.html

* igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilercccs:
- shard-kbl: NOTRUN -> [SKIP][51] ([fdo#109271] / [i915#2672])
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl3/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-render:
- shard-iclb: NOTRUN -> [SKIP][52] ([fdo#109280])
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb1/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-render.html

* igt@kms_hdr@bpc-switch:
- shard-skl: NOTRUN -> [FAIL][53] ([i915#1188])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl10/igt@[email protected]

* igt@kms_hdr@bpc-switch-dpms:
- shard-skl: [PASS][54] -> [FAIL][55] ([i915#1188])
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl6/igt@[email protected]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl7/igt@[email protected]

* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-d-frame-sequence:
- shard-kbl: NOTRUN -> [SKIP][56] ([fdo#109271] / [i915#533])
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl3/igt@[email protected]

* igt@kms_pipe_crc_basic@read-crc-pipe-c:
- shard-skl: [PASS][57] -> [FAIL][58] ([i915#53])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl5/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl8/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-a-alpha-basic:
- shard-apl: NOTRUN -> [FAIL][59] ([fdo#108145] / [i915#265]) +1 similar issue
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl3/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb:
- shard-skl: NOTRUN -> [FAIL][60] ([fdo#108145] / [i915#265]) +1 similar issue
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl6/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-c-alpha-basic:
- shard-kbl: NOTRUN -> [FAIL][61] ([fdo#108145] / [i915#265])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl3/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-c-alpha-transparent-fb:
- shard-apl: NOTRUN -> [FAIL][62] ([i915#265])
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl3/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [PASS][63] -> [FAIL][64] ([fdo#108145] / [i915#265]) +1 similar issue
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl5/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl8/igt@[email protected]

* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-4:
- shard-skl: NOTRUN -> [SKIP][65] ([fdo#109271] / [i915#658]) +1 similar issue
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl6/igt@[email protected]

* igt@kms_psr2_sf@plane-move-sf-dmg-area-3:
- shard-apl: NOTRUN -> [SKIP][66] ([fdo#109271] / [i915#658]) +1 similar issue
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl8/igt@[email protected]

* igt@kms_psr@psr2_no_drrs:
- shard-iclb: [PASS][67] -> [SKIP][68] ([fdo#109441]) +1 similar issue
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb2/igt@kms_psr@psr2_no_drrs.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb4/igt@kms_psr@psr2_no_drrs.html

* igt@kms_setmode@basic:
- shard-snb: NOTRUN -> [FAIL][69] ([i915#31])
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-snb7/igt@[email protected]

* igt@kms_sysfs_edid_timing:
- shard-apl: NOTRUN -> [FAIL][70] ([IGT#2])
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl3/igt@kms_sysfs_edid_timing.html

* igt@kms_vblank@pipe-d-ts-continuation-modeset-rpm:
- shard-iclb: NOTRUN -> [SKIP][71] ([fdo#109278])
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb1/igt@[email protected]

* igt@kms_vblank@pipe-d-wait-idle:
- shard-apl: NOTRUN -> [SKIP][72] ([fdo#109271] / [i915#533]) +1 similar issue
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl1/igt@[email protected]

* igt@kms_writeback@writeback-invalid-parameters:
- shard-kbl: NOTRUN -> [SKIP][73] ([fdo#109271] / [i915#2437])
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl3/igt@[email protected]

* igt@nouveau_crc@pipe-a-source-rg:
- shard-iclb: NOTRUN -> [SKIP][74] ([i915#2530])
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb1/igt@[email protected]

* igt@nouveau_crc@pipe-b-ctx-flip-skip-current-frame:
- shard-apl: NOTRUN -> [SKIP][75] ([fdo#109271]) +109 similar issues
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl1/igt@[email protected]

* igt@prime_vgem@sync@vcs0:
- shard-skl: [PASS][76] -> [INCOMPLETE][77] ([i915#409])
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl4/igt@prime_vgem@[email protected]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl5/igt@prime_vgem@[email protected]

* igt@sysfs_clients@fair-3:
- shard-skl: NOTRUN -> [SKIP][78] ([fdo#109271] / [i915#2994])
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl6/igt@[email protected]

* igt@sysfs_clients@recycle:
- shard-apl: NOTRUN -> [SKIP][79] ([fdo#109271] / [i915#2994])
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl3/igt@[email protected]

* igt@sysfs_clients@sema-10:
- shard-kbl: NOTRUN -> [SKIP][80] ([fdo#109271] / [i915#2994])
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl7/igt@[email protected]

#### Possible fixes ####

* igt@gem_exec_balancer@semaphore:
- shard-glk: [DMESG-WARN][81] ([i915#118] / [i915#95]) -> [PASS][82] +2 similar issues
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-glk4/igt@[email protected]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-glk2/igt@[email protected]

* igt@gem_exec_fair@basic-none@vcs0:
- shard-kbl: [FAIL][83] ([i915#2842]) -> [PASS][84] +1 similar issue
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl4/igt@gem_exec_fair@[email protected]
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl4/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-tglb: [FAIL][85] ([i915#2842]) -> [PASS][86] +1 similar issue
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-tglb2/igt@gem_exec_fair@[email protected]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-tglb8/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace@rcs0:
- shard-glk: [FAIL][87] ([i915#2842]) -> [PASS][88]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-glk3/igt@gem_exec_fair@[email protected]
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-glk7/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-sync@rcs0:
- shard-kbl: [SKIP][89] ([fdo#109271]) -> [PASS][90]
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl3/igt@gem_exec_fair@[email protected]
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl6/igt@gem_exec_fair@[email protected]

* igt@i915_selftest@live@gt_pm:
- shard-glk: [DMESG-FAIL][91] ([i915#1886] / [i915#2291]) -> [PASS][92]
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-glk2/igt@i915_selftest@live@gt_pm.html
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-glk3/igt@i915_selftest@live@gt_pm.html

* igt@kms_cursor_legacy@flip-vs-cursor-legacy:
- shard-skl: [FAIL][93] ([i915#2346]) -> [PASS][94]
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl1/igt@[email protected]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl3/igt@[email protected]

* igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1:
- shard-skl: [FAIL][95] ([i915#79]) -> [PASS][96]
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl6/igt@kms_flip@[email protected]
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl7/igt@kms_flip@[email protected]

* igt@kms_hdr@bpc-switch-suspend:
- shard-kbl: [DMESG-WARN][97] ([i915#180]) -> [PASS][98] +3 similar issues
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl7/igt@[email protected]
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl3/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: [FAIL][99] ([fdo#108145] / [i915#265]) -> [PASS][100]
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl2/igt@[email protected]
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl4/igt@[email protected]

* igt@kms_psr2_su@page_flip:
- shard-iclb: [SKIP][101] ([fdo#109642] / [fdo#111068] / [i915#658]) -> [PASS][102]
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb6/igt@kms_psr2_su@page_flip.html
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb2/igt@kms_psr2_su@page_flip.html

* igt@kms_psr@psr2_suspend:
- shard-iclb: [SKIP][103] ([fdo#109441]) -> [PASS][104] +2 similar issues
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb5/igt@kms_psr@psr2_suspend.html
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb2/igt@kms_psr@psr2_suspend.html

* igt@kms_vblank@pipe-b-ts-continuation-dpms-rpm:
- shard-tglb: [DMESG-WARN][105] ([i915#2411] / [i915#2868]) -> [PASS][106]
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-tglb5/igt@[email protected]
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-tglb3/igt@[email protected]

* igt@perf@blocking:
- shard-skl: [FAIL][107] ([i915#1542]) -> [PASS][108] +1 similar issue
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl2/igt@[email protected]
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl4/igt@[email protected]

* igt@perf@polling-parameterized:
- shard-glk: [FAIL][109] ([i915#1542]) -> [PASS][110]
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-glk9/igt@[email protected]
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-glk4/igt@[email protected]

* igt@prime_vgem@sync@rcs0:
- shard-iclb: [INCOMPLETE][111] ([i915#409]) -> [PASS][112]
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb3/igt@prime_vgem@[email protected]
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb1/igt@prime_vgem@[email protected]

#### Warnings ####

* igt@gem_exec_fair@basic-none-rrul@rcs0:
- shard-iclb: [FAIL][113] ([i915#2842]) -> [FAIL][114] ([i915#2852])
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb5/igt@gem_exec_fair@[email protected]
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb5/igt@gem_exec_fair@[email protected]

* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-iclb: [SKIP][115] ([i915#588]) -> [SKIP][116] ([i915#658])
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb2/igt@[email protected]
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb4/igt@[email protected]

* igt@i915_pm_rc6_residency@rc6-fence:
- shard-iclb: [WARN][117] ([i915#1804] / [i915#2684]) -> [WARN][118] ([i915#2684])
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb3/igt@[email protected]
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb1/igt@[email protected]

* igt@kms_dp_dsc@basic-dsc-enable-edp:
- shard-iclb: [SKIP][119] ([fdo#109349]) -> [DMESG-WARN][120] ([i915#1226])
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb6/igt@[email protected]
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb2/igt@[email protected]

* igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1:
- shard-skl: [FAIL][121] ([i915#79]) -> [DMESG-WARN][122] ([i915#1982])
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl6/igt@kms_flip@[email protected]
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl7/igt@kms_flip@[email protected]

* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-5:
- shard-iclb: [SKIP][123] ([i915#658]) -> [SKIP][124] ([i915#2920]) +1 similar issue
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb6/igt@[email protected]
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb2/igt@[email protected]

* igt@kms_psr2_sf@plane-move-sf-dmg-area-2:
- shard-iclb: [SKIP][125] ([i915#2920]) -> [SKIP][126] ([i915#658])
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb2/igt@[email protected]
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb4/igt@[email protected]

* igt@runner@aborted:
- shard-kbl: ([FAIL][127], [FAIL][128], [FAIL][129], [FAIL][130], [FAIL][131], [FAIL][132], [FAIL][133], [FAIL][134]) ([i915#1436] / [i915#180] / [i915#1814] / [i915#2505] / [i915#3002] / [i915#3363]) -> ([FAIL][135], [FAIL][136], [FAIL][137], [FAIL][138], [FAIL][139]) ([i915#1436] / [i915#180] / [i915#1814] / [i915#3002] / [i915#3363] / [i915#92])
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl7/igt@[email protected]
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl4/igt@[email protected]
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl4/igt@[email protected]
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl4/igt@[email protected]
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl7/igt@[email protected]
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl7/igt@[email protected]
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl4/igt@[email protected]
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl6/igt@[email protected]
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl2/igt@[email protected]
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl4/igt@[email protected]
[137]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl4/igt@[email protected]
[138]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl4/igt@[email protected]
[139]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl7/igt@[email protected]
- shard-iclb: ([FAIL][140], [FAIL][141], [FAIL][142]) ([i915#2426] / [i915#3002] / [i915#409]) -> ([FAIL][143], [FAIL][144], [FAIL][145], [FAIL][146]) ([i915#1814] / [i915#3002])
[140]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb3/igt@[email protected]
[141]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb7/igt@[email protected]
[142]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb5/igt@[email protected]
[143]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb6/igt@[email protected]
[144]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb2/igt@[email protected]
[145]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb1/igt@[email protected]
[146]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb1/igt@[email protected]
- shard-apl: ([FAIL][147], [FAIL][148], [FAIL][149], [FAIL][150]) ([i915#180] / [i915#1814] / [i915#3002] / [i915#3363]) -> ([FAIL][151], [FAIL][152], [FAIL][153], [FAIL][154], [FAIL][155], [FAIL][156], [FAIL][157], [FAIL][158], [FAIL][159]) ([fdo#109271] / [i915#180] / [i915#1814] / [i915#3002] / [i915#3363])
[147]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-apl3/igt@[email protected]
[148]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-apl6/igt@[email protected]
[149]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-apl2/igt@[email protected]
[150]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-apl3/igt@[email protected]
[151]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl8/igt@[email protected]
[152]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl8/igt@[email protected]
[153]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl8/igt@[email protected]

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/index.html

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#10 lore raw

Re: [Intel-gfx] ✗ Fi.CI.IGT: failure for Update firmware to v62.0.0 (rev4)

Quoted 30 lines · Patchwork

== Series Details ==

Series: Update firmware to v62.0.0 (rev4)
URL : https://patchwork.freedesktop.org/series/91106/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_10226_full -> Patchwork_20379_full
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with Patchwork_20379_full absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_20379_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in Patchwork_20379_full:

Quoted 8 lines

### IGT changes ###

#### Possible regressions ####

* igt@kms_big_fb@linear-32bpp-rotate-180:
- shard-iclb: [PASS][1] -> [DMESG-WARN][2] +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb4/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb1/igt@[email protected]

KMS pipe state mismatch wouldn't be related to the GuC changes here.

Quoted 8 lines

#### Warnings ####

* igt@gem_exec_fair@basic-pace-solo@rcs0:
- shard-glk: [FAIL][3] ([i915#2842]) -> [FAIL][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-glk2/igt@gem_exec_fair@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-glk3/igt@gem_exec_fair@[email protected]

This test has been failing pretty much constantly on all platforms according to CI history. And the CI failure here is from a run that isn't using the GuC, so it wouldn't be caused by these changes.

Series applied to gt-next.

Matt

Quoted 423 lines

Known issues
------------

Here are the changes found in Patchwork_20379_full that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_create@create-clear:
- shard-glk: [PASS][5] -> [FAIL][6] ([i915#3160])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-glk2/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-glk3/igt@[email protected]

* igt@gem_ctx_isolation@preservation-s3@bcs0:
- shard-kbl: [PASS][7] -> [DMESG-WARN][8] ([i915#180]) +2 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl6/igt@gem_ctx_isolation@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl4/igt@gem_ctx_isolation@[email protected]

* igt@gem_ctx_persistence@engines-queued:
- shard-snb: NOTRUN -> [SKIP][9] ([fdo#109271] / [i915#1099]) +2 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-snb7/igt@[email protected]

* igt@gem_exec_fair@basic-flow@rcs0:
- shard-skl: NOTRUN -> [SKIP][10] ([fdo#109271]) +72 similar issues
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl6/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-apl: [PASS][11] -> [SKIP][12] ([fdo#109271])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-apl3/igt@gem_exec_fair@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl3/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-none-solo@rcs0:
- shard-kbl: [PASS][13] -> [FAIL][14] ([i915#2842])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl6/igt@gem_exec_fair@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl1/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-none@vecs0:
- shard-apl: NOTRUN -> [FAIL][15] ([i915#2842] / [i915#3468])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl1/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace@vecs0:
- shard-tglb: [PASS][16] -> [FAIL][17] ([i915#2842]) +2 similar issues
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-tglb3/igt@gem_exec_fair@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-tglb2/igt@gem_exec_fair@[email protected]

* igt@gem_exec_reloc@basic-wide-active@rcs0:
- shard-snb: NOTRUN -> [FAIL][18] ([i915#2389]) +2 similar issues
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-snb7/igt@gem_exec_reloc@[email protected]

* igt@gem_exec_schedule@semaphore-codependency:
- shard-snb: NOTRUN -> [SKIP][19] ([fdo#109271]) +265 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-snb7/igt@[email protected]

* igt@gem_userptr_blits@input-checking:
- shard-apl: NOTRUN -> [DMESG-WARN][20] ([i915#3002])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl1/igt@[email protected]

* igt@gem_userptr_blits@vma-merge:
- shard-snb: NOTRUN -> [FAIL][21] ([i915#2724])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-snb6/igt@[email protected]

* igt@gem_workarounds@suspend-resume:
- shard-apl: [PASS][22] -> [DMESG-WARN][23] ([i915#180]) +2 similar issues
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-apl1/igt@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl6/igt@[email protected]

* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-kbl: NOTRUN -> [SKIP][24] ([fdo#109271] / [i915#658])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl7/igt@[email protected]

* igt@i915_pm_rpm@system-suspend-modeset:
- shard-skl: [PASS][25] -> [INCOMPLETE][26] ([i915#151])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl2/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl9/igt@[email protected]

* igt@i915_selftest@live@gt_pm:
- shard-skl: NOTRUN -> [DMESG-FAIL][27] ([i915#1886] / [i915#2291])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl7/igt@i915_selftest@live@gt_pm.html

* igt@kms_big_fb@x-tiled-32bpp-rotate-180:
- shard-glk: [PASS][28] -> [DMESG-WARN][29] ([i915#118] / [i915#95])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-glk4/igt@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-glk8/igt@[email protected]

* igt@kms_chamelium@hdmi-hpd-for-each-pipe:
- shard-kbl: NOTRUN -> [SKIP][30] ([fdo#109271] / [fdo#111827]) +3 similar issues
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl7/igt@[email protected]

* igt@kms_chamelium@hdmi-mode-timings:
- shard-snb: NOTRUN -> [SKIP][31] ([fdo#109271] / [fdo#111827]) +15 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-snb6/igt@[email protected]

* igt@kms_color_chamelium@pipe-a-ctm-blue-to-red:
- shard-iclb: NOTRUN -> [SKIP][32] ([fdo#109284] / [fdo#111827])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb1/igt@[email protected]

* igt@kms_color_chamelium@pipe-d-ctm-green-to-red:
- shard-skl: NOTRUN -> [SKIP][33] ([fdo#109271] / [fdo#111827]) +5 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl7/igt@[email protected]

* igt@kms_color_chamelium@pipe-invalid-degamma-lut-sizes:
- shard-apl: NOTRUN -> [SKIP][34] ([fdo#109271] / [fdo#111827]) +10 similar issues
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl3/igt@[email protected]

* igt@kms_content_protection@atomic-dpms:
- shard-kbl: NOTRUN -> [TIMEOUT][35] ([i915#1319])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl3/igt@[email protected]

* igt@kms_content_protection@legacy:
- shard-iclb: NOTRUN -> [SKIP][36] ([fdo#109300] / [fdo#111066])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb1/igt@[email protected]

* igt@kms_cursor_crc@pipe-d-cursor-suspend:
- shard-kbl: NOTRUN -> [SKIP][37] ([fdo#109271]) +66 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl3/igt@[email protected]

* igt@kms_cursor_legacy@flip-vs-cursor-varying-size:
- shard-skl: [PASS][38] -> [FAIL][39] ([i915#2346])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl1/igt@[email protected]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl3/igt@[email protected]

* igt@kms_cursor_legacy@pipe-d-torture-bo:
- shard-skl: NOTRUN -> [SKIP][40] ([fdo#109271] / [i915#533])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl6/igt@[email protected]

* igt@kms_dp_tiled_display@basic-test-pattern-with-chamelium:
- shard-iclb: NOTRUN -> [SKIP][41] ([i915#3528])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb1/igt@[email protected]

* igt@kms_draw_crc@draw-method-xrgb2101010-pwrite-xtiled:
- shard-skl: [PASS][42] -> [DMESG-WARN][43] ([i915#1982]) +1 similar issue
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl8/igt@[email protected]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl8/igt@[email protected]

* igt@kms_fbcon_fbt@fbc-suspend:
- shard-apl: [PASS][44] -> [INCOMPLETE][45] ([i915#180] / [i915#1982])
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-apl6/igt@[email protected]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl8/igt@[email protected]
- shard-kbl: [PASS][46] -> [INCOMPLETE][47] ([i915#155] / [i915#180] / [i915#636])
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl3/igt@[email protected]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl7/igt@[email protected]

* igt@kms_flip@2x-dpms-vs-vblank-race:
- shard-iclb: NOTRUN -> [SKIP][48] ([fdo#109274])
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb1/igt@[email protected]

* igt@kms_flip@flip-vs-suspend-interruptible@c-dp1:
- shard-apl: NOTRUN -> [DMESG-WARN][49] ([i915#180]) +3 similar issues
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl8/igt@kms_flip@[email protected]

* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs:
- shard-skl: NOTRUN -> [SKIP][50] ([fdo#109271] / [i915#2672])
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl7/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytilegen12rcccs.html

* igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilercccs:
- shard-kbl: NOTRUN -> [SKIP][51] ([fdo#109271] / [i915#2672])
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl3/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-render:
- shard-iclb: NOTRUN -> [SKIP][52] ([fdo#109280])
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb1/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-cur-indfb-draw-render.html

* igt@kms_hdr@bpc-switch:
- shard-skl: NOTRUN -> [FAIL][53] ([i915#1188])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl10/igt@[email protected]

* igt@kms_hdr@bpc-switch-dpms:
- shard-skl: [PASS][54] -> [FAIL][55] ([i915#1188])
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl6/igt@[email protected]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl7/igt@[email protected]

* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-d-frame-sequence:
- shard-kbl: NOTRUN -> [SKIP][56] ([fdo#109271] / [i915#533])
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl3/igt@[email protected]

* igt@kms_pipe_crc_basic@read-crc-pipe-c:
- shard-skl: [PASS][57] -> [FAIL][58] ([i915#53])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl5/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl8/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-a-alpha-basic:
- shard-apl: NOTRUN -> [FAIL][59] ([fdo#108145] / [i915#265]) +1 similar issue
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl3/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-a-alpha-opaque-fb:
- shard-skl: NOTRUN -> [FAIL][60] ([fdo#108145] / [i915#265]) +1 similar issue
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl6/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-c-alpha-basic:
- shard-kbl: NOTRUN -> [FAIL][61] ([fdo#108145] / [i915#265])
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl3/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-c-alpha-transparent-fb:
- shard-apl: NOTRUN -> [FAIL][62] ([i915#265])
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl3/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [PASS][63] -> [FAIL][64] ([fdo#108145] / [i915#265]) +1 similar issue
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl5/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl8/igt@[email protected]

* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-4:
- shard-skl: NOTRUN -> [SKIP][65] ([fdo#109271] / [i915#658]) +1 similar issue
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl6/igt@[email protected]

* igt@kms_psr2_sf@plane-move-sf-dmg-area-3:
- shard-apl: NOTRUN -> [SKIP][66] ([fdo#109271] / [i915#658]) +1 similar issue
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl8/igt@[email protected]

* igt@kms_psr@psr2_no_drrs:
- shard-iclb: [PASS][67] -> [SKIP][68] ([fdo#109441]) +1 similar issue
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb2/igt@kms_psr@psr2_no_drrs.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb4/igt@kms_psr@psr2_no_drrs.html

* igt@kms_setmode@basic:
- shard-snb: NOTRUN -> [FAIL][69] ([i915#31])
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-snb7/igt@[email protected]

* igt@kms_sysfs_edid_timing:
- shard-apl: NOTRUN -> [FAIL][70] ([IGT#2])
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl3/igt@kms_sysfs_edid_timing.html

* igt@kms_vblank@pipe-d-ts-continuation-modeset-rpm:
- shard-iclb: NOTRUN -> [SKIP][71] ([fdo#109278])
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb1/igt@[email protected]

* igt@kms_vblank@pipe-d-wait-idle:
- shard-apl: NOTRUN -> [SKIP][72] ([fdo#109271] / [i915#533]) +1 similar issue
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl1/igt@[email protected]

* igt@kms_writeback@writeback-invalid-parameters:
- shard-kbl: NOTRUN -> [SKIP][73] ([fdo#109271] / [i915#2437])
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl3/igt@[email protected]

* igt@nouveau_crc@pipe-a-source-rg:
- shard-iclb: NOTRUN -> [SKIP][74] ([i915#2530])
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb1/igt@[email protected]

* igt@nouveau_crc@pipe-b-ctx-flip-skip-current-frame:
- shard-apl: NOTRUN -> [SKIP][75] ([fdo#109271]) +109 similar issues
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl1/igt@[email protected]

* igt@prime_vgem@sync@vcs0:
- shard-skl: [PASS][76] -> [INCOMPLETE][77] ([i915#409])
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl4/igt@prime_vgem@[email protected]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl5/igt@prime_vgem@[email protected]

* igt@sysfs_clients@fair-3:
- shard-skl: NOTRUN -> [SKIP][78] ([fdo#109271] / [i915#2994])
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl6/igt@[email protected]

* igt@sysfs_clients@recycle:
- shard-apl: NOTRUN -> [SKIP][79] ([fdo#109271] / [i915#2994])
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl3/igt@[email protected]

* igt@sysfs_clients@sema-10:
- shard-kbl: NOTRUN -> [SKIP][80] ([fdo#109271] / [i915#2994])
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl7/igt@[email protected]

#### Possible fixes ####

* igt@gem_exec_balancer@semaphore:
- shard-glk: [DMESG-WARN][81] ([i915#118] / [i915#95]) -> [PASS][82] +2 similar issues
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-glk4/igt@[email protected]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-glk2/igt@[email protected]

* igt@gem_exec_fair@basic-none@vcs0:
- shard-kbl: [FAIL][83] ([i915#2842]) -> [PASS][84] +1 similar issue
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl4/igt@gem_exec_fair@[email protected]
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl4/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-tglb: [FAIL][85] ([i915#2842]) -> [PASS][86] +1 similar issue
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-tglb2/igt@gem_exec_fair@[email protected]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-tglb8/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace@rcs0:
- shard-glk: [FAIL][87] ([i915#2842]) -> [PASS][88]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-glk3/igt@gem_exec_fair@[email protected]
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-glk7/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-sync@rcs0:
- shard-kbl: [SKIP][89] ([fdo#109271]) -> [PASS][90]
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl3/igt@gem_exec_fair@[email protected]
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl6/igt@gem_exec_fair@[email protected]

* igt@i915_selftest@live@gt_pm:
- shard-glk: [DMESG-FAIL][91] ([i915#1886] / [i915#2291]) -> [PASS][92]
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-glk2/igt@i915_selftest@live@gt_pm.html
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-glk3/igt@i915_selftest@live@gt_pm.html

* igt@kms_cursor_legacy@flip-vs-cursor-legacy:
- shard-skl: [FAIL][93] ([i915#2346]) -> [PASS][94]
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl1/igt@[email protected]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl3/igt@[email protected]

* igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1:
- shard-skl: [FAIL][95] ([i915#79]) -> [PASS][96]
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl6/igt@kms_flip@[email protected]
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl7/igt@kms_flip@[email protected]

* igt@kms_hdr@bpc-switch-suspend:
- shard-kbl: [DMESG-WARN][97] ([i915#180]) -> [PASS][98] +3 similar issues
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl7/igt@[email protected]
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl3/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: [FAIL][99] ([fdo#108145] / [i915#265]) -> [PASS][100]
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl2/igt@[email protected]
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl4/igt@[email protected]

* igt@kms_psr2_su@page_flip:
- shard-iclb: [SKIP][101] ([fdo#109642] / [fdo#111068] / [i915#658]) -> [PASS][102]
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb6/igt@kms_psr2_su@page_flip.html
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb2/igt@kms_psr2_su@page_flip.html

* igt@kms_psr@psr2_suspend:
- shard-iclb: [SKIP][103] ([fdo#109441]) -> [PASS][104] +2 similar issues
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb5/igt@kms_psr@psr2_suspend.html
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb2/igt@kms_psr@psr2_suspend.html

* igt@kms_vblank@pipe-b-ts-continuation-dpms-rpm:
- shard-tglb: [DMESG-WARN][105] ([i915#2411] / [i915#2868]) -> [PASS][106]
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-tglb5/igt@[email protected]
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-tglb3/igt@[email protected]

* igt@perf@blocking:
- shard-skl: [FAIL][107] ([i915#1542]) -> [PASS][108] +1 similar issue
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl2/igt@[email protected]
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl4/igt@[email protected]

* igt@perf@polling-parameterized:
- shard-glk: [FAIL][109] ([i915#1542]) -> [PASS][110]
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-glk9/igt@[email protected]
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-glk4/igt@[email protected]

* igt@prime_vgem@sync@rcs0:
- shard-iclb: [INCOMPLETE][111] ([i915#409]) -> [PASS][112]
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb3/igt@prime_vgem@[email protected]
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb1/igt@prime_vgem@[email protected]

#### Warnings ####

* igt@gem_exec_fair@basic-none-rrul@rcs0:
- shard-iclb: [FAIL][113] ([i915#2842]) -> [FAIL][114] ([i915#2852])
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb5/igt@gem_exec_fair@[email protected]
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb5/igt@gem_exec_fair@[email protected]

* igt@i915_pm_dc@dc3co-vpb-simulation:
- shard-iclb: [SKIP][115] ([i915#588]) -> [SKIP][116] ([i915#658])
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb2/igt@[email protected]
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb4/igt@[email protected]

* igt@i915_pm_rc6_residency@rc6-fence:
- shard-iclb: [WARN][117] ([i915#1804] / [i915#2684]) -> [WARN][118] ([i915#2684])
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb3/igt@[email protected]
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb1/igt@[email protected]

* igt@kms_dp_dsc@basic-dsc-enable-edp:
- shard-iclb: [SKIP][119] ([fdo#109349]) -> [DMESG-WARN][120] ([i915#1226])
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb6/igt@[email protected]
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb2/igt@[email protected]

* igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1:
- shard-skl: [FAIL][121] ([i915#79]) -> [DMESG-WARN][122] ([i915#1982])
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-skl6/igt@kms_flip@[email protected]
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-skl7/igt@kms_flip@[email protected]

* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-5:
- shard-iclb: [SKIP][123] ([i915#658]) -> [SKIP][124] ([i915#2920]) +1 similar issue
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb6/igt@[email protected]
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb2/igt@[email protected]

* igt@kms_psr2_sf@plane-move-sf-dmg-area-2:
- shard-iclb: [SKIP][125] ([i915#2920]) -> [SKIP][126] ([i915#658])
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb2/igt@[email protected]
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb4/igt@[email protected]

* igt@runner@aborted:
- shard-kbl: ([FAIL][127], [FAIL][128], [FAIL][129], [FAIL][130], [FAIL][131], [FAIL][132], [FAIL][133], [FAIL][134]) ([i915#1436] / [i915#180] / [i915#1814] / [i915#2505] / [i915#3002] / [i915#3363]) -> ([FAIL][135], [FAIL][136], [FAIL][137], [FAIL][138], [FAIL][139]) ([i915#1436] / [i915#180] / [i915#1814] / [i915#3002] / [i915#3363] / [i915#92])
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl7/igt@[email protected]
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl4/igt@[email protected]
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl4/igt@[email protected]
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl4/igt@[email protected]
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl7/igt@[email protected]
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl7/igt@[email protected]
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl4/igt@[email protected]
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-kbl6/igt@[email protected]
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl2/igt@[email protected]
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl4/igt@[email protected]
[137]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl4/igt@[email protected]
[138]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl4/igt@[email protected]
[139]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-kbl7/igt@[email protected]
- shard-iclb: ([FAIL][140], [FAIL][141], [FAIL][142]) ([i915#2426] / [i915#3002] / [i915#409]) -> ([FAIL][143], [FAIL][144], [FAIL][145], [FAIL][146]) ([i915#1814] / [i915#3002])
[140]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb3/igt@[email protected]
[141]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb7/igt@[email protected]
[142]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-iclb5/igt@[email protected]
[143]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb6/igt@[email protected]
[144]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb2/igt@[email protected]
[145]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb1/igt@[email protected]
[146]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-iclb1/igt@[email protected]
- shard-apl: ([FAIL][147], [FAIL][148], [FAIL][149], [FAIL][150]) ([i915#180] / [i915#1814] / [i915#3002] / [i915#3363]) -> ([FAIL][151], [FAIL][152], [FAIL][153], [FAIL][154], [FAIL][155], [FAIL][156], [FAIL][157], [FAIL][158], [FAIL][159]) ([fdo#109271] / [i915#180] / [i915#1814] / [i915#3002] / [i915#3363])
[147]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-apl3/igt@[email protected]
[148]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-apl6/igt@[email protected]
[149]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-apl2/igt@[email protected]
[150]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10226/shard-apl3/igt@[email protected]
[151]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl8/igt@[email protected]
[152]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl8/igt@[email protected]
[153]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/shard-apl8/igt@[email protected]

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20379/index.html

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 9 lines
Matt Roper
Graphics Software Engineer
VTT-OSGC Platform Enablement
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#11 lore raw
In reply to Matthew Brost

Hi

Is there a place where we can download these new firmware images?

Cheers

Mike

Quoted 36 lines · Matthew Brost

As part of enabling GuC submission [1] we need to update to the latest and greatest firmware. This series does that. All backwards compatibility breaking changes squashed into a single patch #2. Same series sent to trybot [2] forcing GuC to be enabled to ensure we haven't broke something.

v2: Address comments, looking for remaning RBs so patches can be squashed and sent for CI
v3: Delete a few unused defines, squash patches
v4: Add values back into kernel doc, fix docs warning

[1] https://patchwork.freedesktop.org/series/89844
[2] https://patchwork.freedesktop.org/series/91341

Michal Wajdeczko (3):
drm/i915/guc: Introduce unified HXG messages
drm/i915/guc: Update firmware to v62.0.0
drm/i915/doc: Include GuC ABI documentation

 Documentation/gpu/i915.rst                    |   8 +
 .../gpu/drm/i915/gt/uc/abi/guc_actions_abi.h  | 107 ++++++
 .../gt/uc/abi/guc_communication_ctb_abi.h     | 126 +++++--
 .../gt/uc/abi/guc_communication_mmio_abi.h    |  65 ++--
 .../gpu/drm/i915/gt/uc/abi/guc_messages_abi.h | 213 +++++++++++
 drivers/gpu/drm/i915/gt/uc/intel_guc.c        | 107 ++++--
 drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c    |  45 +--
 drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c     | 356 +++++++++---------
 drivers/gpu/drm/i915/gt/uc/intel_guc_ct.h     |   6 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h   |  75 +---
 drivers/gpu/drm/i915/gt/uc/intel_guc_log.c    |  29 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc_log.h    |   6 +-
 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c      |  26 +-
 13 files changed, 748 insertions(+), 421 deletions(-)
Quoted 8 lines

--
2.28.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx