Commit 84596e1a authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by John Harrison
Browse files

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: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Piotr Piórkowski <piotr.piorkowski@intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: default avatarPiotr Piórkowski <piotr.piorkowski@intel.com>
Signed-off-by: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230509201103.538-1-michal.wajdeczko@intel.com
parent a5606b94

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

+0 −21
Original line number Diff line number Diff line
@@ -167,25 +167,4 @@ static_assert(sizeof(struct guc_ct_buffer_desc) == 64); 
 * - **flags**, holds various bits to control message handling

 */



/*

 * Definition of the command transport message header (DW0)

 *

 * bit[4..0]	message len (in dwords)

 * bit[7..5]	reserved

 * bit[8]	response (G2H only)

 * bit[8]	write fence to desc (H2G only)

 * bit[9]	write status to H2G buff (H2G only)

 * bit[10]	send status back via G2H (H2G only)

 * bit[15..11]	reserved

 * bit[31..16]	action code

 */

#define GUC_CT_MSG_LEN_SHIFT			0

#define GUC_CT_MSG_LEN_MASK			0x1F

#define GUC_CT_MSG_IS_RESPONSE			(1 << 8)

#define GUC_CT_MSG_WRITE_FENCE_TO_DESC		(1 << 8)

#define GUC_CT_MSG_WRITE_STATUS_TO_BUFF		(1 << 9)

#define GUC_CT_MSG_SEND_STATUS			(1 << 10)

#define GUC_CT_MSG_ACTION_SHIFT			16

#define GUC_CT_MSG_ACTION_MASK			0xFFFF



#endif /* _ABI_GUC_COMMUNICATION_CTB_ABI_H */

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

+1 −1
Original line number Diff line number Diff line
@@ -698,7 +698,7 @@ static int ct_send(struct intel_guc_ct *ct, 


	GEM_BUG_ON(!ct->enabled);

	GEM_BUG_ON(!len);

	GEM_BUG_ON(len & ~GUC_CT_MSG_LEN_MASK);

	GEM_BUG_ON(len > GUC_CTB_HXG_MSG_MAX_LEN - GUC_CTB_HDR_LEN);

	GEM_BUG_ON(!response_buf && response_buf_size);

	might_sleep();