kevin/linux
1
Fork 0
Code

drm/xe/oa: Add OAC support

Browse Source 
Similar to OAR, allow userspace to execute MI_REPORT_PERF_COUNT on compute
engines of a specified exec queue.

Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240618014609.3233427-12-ashutosh.dixit@intel.com
This commit is contained in:
Ashutosh Dixit 2024-06-17 18:46:03 -07:00
parent 2f4a730fcd
commit 14e077f800
3 changed files with 75 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/xe/regs/xe_engine_regs.h
View File

@ -130,6 +130,7 @@
#define RING_CONTEXT_CONTROL(base) XE_REG((base) + 0x244, XE_REG_OPTION_MASKED) #define RING_CONTEXT_CONTROL(base) XE_REG((base) + 0x244, XE_REG_OPTION_MASKED)
#define CTX_CTRL_OAC_CONTEXT_ENABLE REG_BIT(8) #define CTX_CTRL_OAC_CONTEXT_ENABLE REG_BIT(8)
#define CTX_CTRL_RUN_ALONE REG_BIT(7)
#define CTX_CTRL_INDIRECT_RING_STATE_ENABLE REG_BIT(4) #define CTX_CTRL_INDIRECT_RING_STATE_ENABLE REG_BIT(4)
#define CTX_CTRL_INHIBIT_SYN_CTX_SWITCH REG_BIT(3) #define CTX_CTRL_INHIBIT_SYN_CTX_SWITCH REG_BIT(3)
#define CTX_CTRL_ENGINE_CTX_RESTORE_INHIBIT REG_BIT(0) #define CTX_CTRL_ENGINE_CTX_RESTORE_INHIBIT REG_BIT(0)

3
drivers/gpu/drm/xe/regs/xe_oa_regs.h
View File

@ -69,6 +69,9 @@
#define OASTATUS_COUNTER_OVERFLOW REG_BIT(2) #define OASTATUS_COUNTER_OVERFLOW REG_BIT(2)
#define OASTATUS_BUFFER_OVERFLOW REG_BIT(1) #define OASTATUS_BUFFER_OVERFLOW REG_BIT(1)
#define OASTATUS_REPORT_LOST REG_BIT(0) #define OASTATUS_REPORT_LOST REG_BIT(0)
/* OAC unit */
#define OAC_OACONTROL XE_REG(0x15114)
/* OAM unit */ /* OAM unit */
#define OAM_HEAD_POINTER_OFFSET (0x1a0) #define OAM_HEAD_POINTER_OFFSET (0x1a0)
#define OAM_TAIL_POINTER_OFFSET (0x1a4) #define OAM_TAIL_POINTER_OFFSET (0x1a4)

74
drivers/gpu/drm/xe/xe_oa.c
View File

@ -396,6 +396,19 @@ static u32 __format_to_oactrl(const struct xe_oa_format *format, int counter_sel
REG_FIELD_PREP(OA_OACONTROL_COUNTER_SIZE_MASK, format->counter_size); REG_FIELD_PREP(OA_OACONTROL_COUNTER_SIZE_MASK, format->counter_size);
} }
static u32 __oa_ccs_select(struct xe_oa_stream *stream)
{
u32 val;
if (stream->hwe->class != XE_ENGINE_CLASS_COMPUTE)
return 0;
val = REG_FIELD_PREP(OAG_OACONTROL_OA_CCS_SELECT_MASK, stream->hwe->instance);
xe_assert(stream->oa->xe,
REG_FIELD_GET(OAG_OACONTROL_OA_CCS_SELECT_MASK, val) == stream->hwe->instance);
return val;
}
static void xe_oa_enable(struct xe_oa_stream *stream) static void xe_oa_enable(struct xe_oa_stream *stream)
{ {
const struct xe_oa_format *format = stream->oa_buffer.format; const struct xe_oa_format *format = stream->oa_buffer.format;
@ -410,7 +423,7 @@ static void xe_oa_enable(struct xe_oa_stream *stream)
regs = __oa_regs(stream); regs = __oa_regs(stream);
val = __format_to_oactrl(format, regs->oa_ctrl_counter_select_mask) | val = __format_to_oactrl(format, regs->oa_ctrl_counter_select_mask) |
OAG_OACONTROL_OA_COUNTER_ENABLE; __oa_ccs_select(stream) | OAG_OACONTROL_OA_COUNTER_ENABLE;
xe_mmio_write32(stream->gt, regs->oa_ctrl, val); xe_mmio_write32(stream->gt, regs->oa_ctrl, val);
} }
@ -694,6 +707,57 @@ static int xe_oa_configure_oar_context(struct xe_oa_stream *stream, bool enable)
return xe_oa_load_with_lri(stream, &reg_lri); return xe_oa_load_with_lri(stream, &reg_lri);
} }
static int xe_oa_configure_oac_context(struct xe_oa_stream *stream, bool enable)
{
const struct xe_oa_format *format = stream->oa_buffer.format;
struct xe_lrc *lrc = stream->exec_q->lrc[0];
u32 regs_offset = xe_lrc_regs_offset(lrc) / sizeof(u32);
u32 oacontrol = __format_to_oactrl(format, OAR_OACONTROL_COUNTER_SEL_MASK) |
(enable ? OAR_OACONTROL_COUNTER_ENABLE : 0);
struct flex regs_context[] = {
{
OACTXCONTROL(stream->hwe->mmio_base),
stream->oa->ctx_oactxctrl_offset[stream->hwe->class] + 1,
enable ? OA_COUNTER_RESUME : 0,
},
{
RING_CONTEXT_CONTROL(stream->hwe->mmio_base),
regs_offset + CTX_CONTEXT_CONTROL,
_MASKED_FIELD(CTX_CTRL_OAC_CONTEXT_ENABLE,
enable ? CTX_CTRL_OAC_CONTEXT_ENABLE : 0) |
_MASKED_FIELD(CTX_CTRL_RUN_ALONE,
enable ? CTX_CTRL_RUN_ALONE : 0),
},
};
struct xe_oa_reg reg_lri = { OAC_OACONTROL, oacontrol };
int err;
/* Set ccs select to enable programming of OAC_OACONTROL */
xe_mmio_write32(stream->gt, __oa_regs(stream)->oa_ctrl, __oa_ccs_select(stream));
/* Modify stream hwe context image with regs_context */
err = xe_oa_modify_ctx_image(stream, stream->exec_q->lrc[0],
regs_context, ARRAY_SIZE(regs_context));
if (err)
return err;
/* Apply reg_lri using LRI */
return xe_oa_load_with_lri(stream, &reg_lri);
}
static int xe_oa_configure_oa_context(struct xe_oa_stream *stream, bool enable)
{
switch (stream->hwe->class) {
case XE_ENGINE_CLASS_RENDER:
return xe_oa_configure_oar_context(stream, enable);
case XE_ENGINE_CLASS_COMPUTE:
return xe_oa_configure_oac_context(stream, enable);
default:
/* Video engines do not support MI_REPORT_PERF_COUNT */
return 0;
}
}
#define HAS_OA_BPC_REPORTING(xe) (GRAPHICS_VERx100(xe) >= 1255) #define HAS_OA_BPC_REPORTING(xe) (GRAPHICS_VERx100(xe) >= 1255)
static void xe_oa_disable_metric_set(struct xe_oa_stream *stream) static void xe_oa_disable_metric_set(struct xe_oa_stream *stream)
@ -713,7 +777,7 @@ static void xe_oa_disable_metric_set(struct xe_oa_stream *stream)
/* disable the context save/restore or OAR counters */ /* disable the context save/restore or OAR counters */
if (stream->exec_q) if (stream->exec_q)
xe_oa_configure_oar_context(stream, false); xe_oa_configure_oa_context(stream, false);
/* Make sure we disable noa to save power. */ /* Make sure we disable noa to save power. */
xe_mmio_rmw32(stream->gt, RPM_CONFIG1, GT_NOA_ENABLE, 0); xe_mmio_rmw32(stream->gt, RPM_CONFIG1, GT_NOA_ENABLE, 0);
@ -881,8 +945,9 @@ static int xe_oa_enable_metric_set(struct xe_oa_stream *stream)
xe_mmio_rmw32(stream->gt, XELPMP_SQCNT1, 0, sqcnt1); xe_mmio_rmw32(stream->gt, XELPMP_SQCNT1, 0, sqcnt1);
/* Configure OAR/OAC */
if (stream->exec_q) { if (stream->exec_q) {
ret = xe_oa_configure_oar_context(stream, true); ret = xe_oa_configure_oa_context(stream, true);
if (ret) if (ret)
return ret; return ret;
} }
@ -1556,6 +1621,9 @@ int xe_oa_stream_open_ioctl(struct drm_device *dev, u64 data, struct drm_file *f
param.exec_q = xe_exec_queue_lookup(xef, param.exec_queue_id); param.exec_q = xe_exec_queue_lookup(xef, param.exec_queue_id);
if (XE_IOCTL_DBG(oa->xe, !param.exec_q)) if (XE_IOCTL_DBG(oa->xe, !param.exec_q))
return -ENOENT; return -ENOENT;
if (param.exec_q->width > 1)
drm_dbg(&oa->xe->drm, "exec_q->width > 1, programming only exec_q->lrc[0]\n");
} }
/* /*