Skip to content

Commit 84596e1

Browse files
mwajdeczjohnharr-intel
authored andcommitted
drm/i915/guc: Drop legacy CTB definitions
We've already switched to new HXG definitions some time ago, drop legacy CTB definitions to avoid mistakes. Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> Cc: Piotr Piórkowski <piotr.piorkowski@intel.com> Cc: John Harrison <John.C.Harrison@Intel.com> Reviewed-by: Piotr Piórkowski <piotr.piorkowski@intel.com> Signed-off-by: John Harrison <John.C.Harrison@Intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230509201103.538-1-michal.wajdeczko@intel.com
1 parent a5606b9 commit 84596e1

2 files changed

Lines changed: 1 addition & 22 deletions

File tree

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

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -167,25 +167,4 @@ static_assert(sizeof(struct guc_ct_buffer_desc) == 64);
167167
* - **flags**, holds various bits to control message handling
168168
*/
169169

170-
/*
171-
* Definition of the command transport message header (DW0)
172-
*
173-
* bit[4..0] message len (in dwords)
174-
* bit[7..5] reserved
175-
* bit[8] response (G2H only)
176-
* bit[8] write fence to desc (H2G only)
177-
* bit[9] write status to H2G buff (H2G only)
178-
* bit[10] send status back via G2H (H2G only)
179-
* bit[15..11] reserved
180-
* bit[31..16] action code
181-
*/
182-
#define GUC_CT_MSG_LEN_SHIFT 0
183-
#define GUC_CT_MSG_LEN_MASK 0x1F
184-
#define GUC_CT_MSG_IS_RESPONSE (1 << 8)
185-
#define GUC_CT_MSG_WRITE_FENCE_TO_DESC (1 << 8)
186-
#define GUC_CT_MSG_WRITE_STATUS_TO_BUFF (1 << 9)
187-
#define GUC_CT_MSG_SEND_STATUS (1 << 10)
188-
#define GUC_CT_MSG_ACTION_SHIFT 16
189-
#define GUC_CT_MSG_ACTION_MASK 0xFFFF
190-
191170
#endif /* _ABI_GUC_COMMUNICATION_CTB_ABI_H */

drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@ static int ct_send(struct intel_guc_ct *ct,
698698

699699
GEM_BUG_ON(!ct->enabled);
700700
GEM_BUG_ON(!len);
701-
GEM_BUG_ON(len & ~GUC_CT_MSG_LEN_MASK);
701+
GEM_BUG_ON(len > GUC_CTB_HXG_MSG_MAX_LEN - GUC_CTB_HDR_LEN);
702702
GEM_BUG_ON(!response_buf && response_buf_size);
703703
might_sleep();
704704

0 commit comments

Comments
 (0)