Commit 8b9544e0 authored by Matthew Brost's avatar Matthew Brost
Browse files

drm/xe: Add LRC ctx timestamp support functions 



LRC ctx timestamp support functions are used to determine how long a job
has run on the hardware.

v2:
 - Don't use static inlines (Jani)
 - Kernel doc
 - s/ctx_timestamp_job/ctx_job_timestamp
v6:
 - Add kernel doc for xe_lrc_update_timestamp (Lucas)
 - Call xe_lrc_ctx_timestamp() in xe_lrc_update_timestamp (Lucas)

Signed-off-by: default avatarMatthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarJonathan Cavitt <jonathan.cavitt@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240611144053.2805091-2-matthew.brost@intel.com
parent e54700f7

drivers/gpu/drm/xe/xe_lrc.c

+77 −1
Original line number Diff line number Diff line
@@ -652,6 +652,7 @@ u32 xe_lrc_pphwsp_offset(struct xe_lrc *lrc) 


#define LRC_SEQNO_PPHWSP_OFFSET 512

#define LRC_START_SEQNO_PPHWSP_OFFSET (LRC_SEQNO_PPHWSP_OFFSET + 8)

#define LRC_CTX_JOB_TIMESTAMP_OFFSET (LRC_START_SEQNO_PPHWSP_OFFSET + 8)

#define LRC_PARALLEL_PPHWSP_OFFSET 2048

#define LRC_PPHWSP_SIZE SZ_4K
@@ -680,6 +681,12 @@ static inline u32 __xe_lrc_start_seqno_offset(struct xe_lrc *lrc) 
	return xe_lrc_pphwsp_offset(lrc) + LRC_START_SEQNO_PPHWSP_OFFSET;

}



static u32 __xe_lrc_ctx_job_timestamp_offset(struct xe_lrc *lrc)

{

	/* The start seqno is stored in the driver-defined portion of PPHWSP */

	return xe_lrc_pphwsp_offset(lrc) + LRC_CTX_JOB_TIMESTAMP_OFFSET;

}



static inline u32 __xe_lrc_parallel_offset(struct xe_lrc *lrc)

{

	/* The parallel is stored in the driver-defined portion of PPHWSP */
@@ -691,6 +698,11 @@ static inline u32 __xe_lrc_regs_offset(struct xe_lrc *lrc) 
	return xe_lrc_pphwsp_offset(lrc) + LRC_PPHWSP_SIZE;

}



static u32 __xe_lrc_ctx_timestamp_offset(struct xe_lrc *lrc)

{

	return __xe_lrc_regs_offset(lrc) + CTX_TIMESTAMP * sizeof(u32);

}



static inline u32 __xe_lrc_indirect_ring_offset(struct xe_lrc *lrc)

{

	/* Indirect ring state page is at the very end of LRC */
@@ -716,11 +728,65 @@ DECL_MAP_ADDR_HELPERS(pphwsp) 
DECL_MAP_ADDR_HELPERS(seqno)

DECL_MAP_ADDR_HELPERS(regs)

DECL_MAP_ADDR_HELPERS(start_seqno)

DECL_MAP_ADDR_HELPERS(ctx_job_timestamp)

DECL_MAP_ADDR_HELPERS(ctx_timestamp)

DECL_MAP_ADDR_HELPERS(parallel)

DECL_MAP_ADDR_HELPERS(indirect_ring)



#undef DECL_MAP_ADDR_HELPERS



/**

 * xe_lrc_ctx_timestamp_ggtt_addr() - Get ctx timestamp GGTT address

 * @lrc: Pointer to the lrc.

 *

 * Returns: ctx timestamp GGTT address

 */

u32 xe_lrc_ctx_timestamp_ggtt_addr(struct xe_lrc *lrc)

{

	return __xe_lrc_ctx_timestamp_ggtt_addr(lrc);

}



/**

 * xe_lrc_ctx_timestamp() - Read ctx timestamp value

 * @lrc: Pointer to the lrc.

 *

 * Returns: ctx timestamp value

 */

u32 xe_lrc_ctx_timestamp(struct xe_lrc *lrc)

{

	struct xe_device *xe = lrc_to_xe(lrc);

	struct iosys_map map;



	map = __xe_lrc_ctx_timestamp_map(lrc);

	return xe_map_read32(xe, &map);

}



/**

 * xe_lrc_ctx_job_timestamp_ggtt_addr() - Get ctx job timestamp GGTT address

 * @lrc: Pointer to the lrc.

 *

 * Returns: ctx timestamp job GGTT address

 */

u32 xe_lrc_ctx_job_timestamp_ggtt_addr(struct xe_lrc *lrc)

{

	return __xe_lrc_ctx_job_timestamp_ggtt_addr(lrc);

}



/**

 * xe_lrc_ctx_job_timestamp() - Read ctx job timestamp value

 * @lrc: Pointer to the lrc.

 *

 * Returns: ctx timestamp job value

 */

u32 xe_lrc_ctx_job_timestamp(struct xe_lrc *lrc)

{

	struct xe_device *xe = lrc_to_xe(lrc);

	struct iosys_map map;



	map = __xe_lrc_ctx_job_timestamp_map(lrc);

	return xe_map_read32(xe, &map);

}



u32 xe_lrc_ggtt_addr(struct xe_lrc *lrc)

{

	return __xe_lrc_pphwsp_ggtt_addr(lrc);
@@ -1659,11 +1725,21 @@ void xe_lrc_snapshot_free(struct xe_lrc_snapshot *snapshot) 
	kfree(snapshot);

}



/**

 * xe_lrc_update_timestamp() - Update ctx timestamp

 * @lrc: Pointer to the lrc.

 * @old_ts: Old timestamp value

 *

 * Populate @old_ts current saved ctx timestamp, read new ctx timestamp and

 * update saved value.

 *

 * Returns: New ctx timestamp value

 */

u32 xe_lrc_update_timestamp(struct xe_lrc *lrc, u32 *old_ts)

{

	*old_ts = lrc->ctx_timestamp;



	lrc->ctx_timestamp = xe_lrc_read_ctx_reg(lrc, CTX_TIMESTAMP);

	lrc->ctx_timestamp = xe_lrc_ctx_timestamp(lrc);



	return lrc->ctx_timestamp;

}

drivers/gpu/drm/xe/xe_lrc.h

+5 −0
Original line number Diff line number Diff line
@@ -94,6 +94,11 @@ void xe_lrc_snapshot_capture_delayed(struct xe_lrc_snapshot *snapshot); 
void xe_lrc_snapshot_print(struct xe_lrc_snapshot *snapshot, struct drm_printer *p);

void xe_lrc_snapshot_free(struct xe_lrc_snapshot *snapshot);



u32 xe_lrc_ctx_timestamp_ggtt_addr(struct xe_lrc *lrc);

u32 xe_lrc_ctx_timestamp(struct xe_lrc *lrc);

u32 xe_lrc_ctx_job_timestamp_ggtt_addr(struct xe_lrc *lrc);

u32 xe_lrc_ctx_job_timestamp(struct xe_lrc *lrc);



/**

 * xe_lrc_update_timestamp - readout LRC timestamp and update cached value

 * @lrc: logical ring context for this exec queue