drm/i915/guc: Update GuC debugfs to support new GuC
Update GuC debugfs to support the new GuC structures. v2: (John Harrison) - Remove intel_lrc_reg.h include from i915_debugfs.c (Michal) - Rename GuC debugfs functions Signed-off-by: John Harrison <John.C.Harrison@Intel.com> Signed-off-by: Matthew Brost <matthew.brost@intel.com> Reviewed-by: John Harrison <John.C.Harrison@Intel.com> Signed-off-by: John Harrison <John.C.Harrison@Intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20210721215101.139794-17-matthew.brost@intel.com
This commit is contained in:
parent
b97060a99b
commit
28ff6520a3
5 changed files with 107 additions and 1 deletions
|
@ -1174,3 +1174,25 @@ void intel_guc_ct_event_handler(struct intel_guc_ct *ct)
|
||||||
|
|
||||||
ct_try_receive_message(ct);
|
ct_try_receive_message(ct);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void intel_guc_ct_print_info(struct intel_guc_ct *ct,
|
||||||
|
struct drm_printer *p)
|
||||||
|
{
|
||||||
|
drm_printf(p, "CT %s\n", enableddisabled(ct->enabled));
|
||||||
|
|
||||||
|
if (!ct->enabled)
|
||||||
|
return;
|
||||||
|
|
||||||
|
drm_printf(p, "H2G Space: %u\n",
|
||||||
|
atomic_read(&ct->ctbs.send.space) * 4);
|
||||||
|
drm_printf(p, "Head: %u\n",
|
||||||
|
ct->ctbs.send.desc->head);
|
||||||
|
drm_printf(p, "Tail: %u\n",
|
||||||
|
ct->ctbs.send.desc->tail);
|
||||||
|
drm_printf(p, "G2H Space: %u\n",
|
||||||
|
atomic_read(&ct->ctbs.recv.space) * 4);
|
||||||
|
drm_printf(p, "Head: %u\n",
|
||||||
|
ct->ctbs.recv.desc->head);
|
||||||
|
drm_printf(p, "Tail: %u\n",
|
||||||
|
ct->ctbs.recv.desc->tail);
|
||||||
|
}
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
|
|
||||||
struct i915_vma;
|
struct i915_vma;
|
||||||
struct intel_guc;
|
struct intel_guc;
|
||||||
|
struct drm_printer;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* DOC: Command Transport (CT).
|
* DOC: Command Transport (CT).
|
||||||
|
@ -114,4 +115,6 @@ int intel_guc_ct_send(struct intel_guc_ct *ct, const u32 *action, u32 len,
|
||||||
u32 *response_buf, u32 response_buf_size, u32 flags);
|
u32 *response_buf, u32 response_buf_size, u32 flags);
|
||||||
void intel_guc_ct_event_handler(struct intel_guc_ct *ct);
|
void intel_guc_ct_event_handler(struct intel_guc_ct *ct);
|
||||||
|
|
||||||
|
void intel_guc_ct_print_info(struct intel_guc_ct *ct, struct drm_printer *p);
|
||||||
|
|
||||||
#endif /* _INTEL_GUC_CT_H_ */
|
#endif /* _INTEL_GUC_CT_H_ */
|
||||||
|
|
|
@ -9,6 +9,8 @@
|
||||||
#include "intel_guc.h"
|
#include "intel_guc.h"
|
||||||
#include "intel_guc_debugfs.h"
|
#include "intel_guc_debugfs.h"
|
||||||
#include "intel_guc_log_debugfs.h"
|
#include "intel_guc_log_debugfs.h"
|
||||||
|
#include "gt/uc/intel_guc_ct.h"
|
||||||
|
#include "gt/uc/intel_guc_submission.h"
|
||||||
|
|
||||||
static int guc_info_show(struct seq_file *m, void *data)
|
static int guc_info_show(struct seq_file *m, void *data)
|
||||||
{
|
{
|
||||||
|
@ -22,16 +24,35 @@ static int guc_info_show(struct seq_file *m, void *data)
|
||||||
drm_puts(&p, "\n");
|
drm_puts(&p, "\n");
|
||||||
intel_guc_log_info(&guc->log, &p);
|
intel_guc_log_info(&guc->log, &p);
|
||||||
|
|
||||||
/* Add more as required ... */
|
if (!intel_guc_submission_is_used(guc))
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
intel_guc_ct_print_info(&guc->ct, &p);
|
||||||
|
intel_guc_submission_print_info(guc, &p);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
DEFINE_GT_DEBUGFS_ATTRIBUTE(guc_info);
|
DEFINE_GT_DEBUGFS_ATTRIBUTE(guc_info);
|
||||||
|
|
||||||
|
static int guc_registered_contexts_show(struct seq_file *m, void *data)
|
||||||
|
{
|
||||||
|
struct intel_guc *guc = m->private;
|
||||||
|
struct drm_printer p = drm_seq_file_printer(m);
|
||||||
|
|
||||||
|
if (!intel_guc_submission_is_used(guc))
|
||||||
|
return -ENODEV;
|
||||||
|
|
||||||
|
intel_guc_submission_print_context_info(guc, &p);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
DEFINE_GT_DEBUGFS_ATTRIBUTE(guc_registered_contexts);
|
||||||
|
|
||||||
void intel_guc_debugfs_register(struct intel_guc *guc, struct dentry *root)
|
void intel_guc_debugfs_register(struct intel_guc *guc, struct dentry *root)
|
||||||
{
|
{
|
||||||
static const struct debugfs_gt_file files[] = {
|
static const struct debugfs_gt_file files[] = {
|
||||||
{ "guc_info", &guc_info_fops, NULL },
|
{ "guc_info", &guc_info_fops, NULL },
|
||||||
|
{ "guc_registered_contexts", &guc_registered_contexts_fops, NULL },
|
||||||
};
|
};
|
||||||
|
|
||||||
if (!intel_guc_is_supported(guc))
|
if (!intel_guc_is_supported(guc))
|
||||||
|
|
|
@ -1609,3 +1609,58 @@ int intel_guc_sched_done_process_msg(struct intel_guc *guc,
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void intel_guc_submission_print_info(struct intel_guc *guc,
|
||||||
|
struct drm_printer *p)
|
||||||
|
{
|
||||||
|
struct i915_sched_engine *sched_engine = guc->sched_engine;
|
||||||
|
struct rb_node *rb;
|
||||||
|
unsigned long flags;
|
||||||
|
|
||||||
|
if (!sched_engine)
|
||||||
|
return;
|
||||||
|
|
||||||
|
drm_printf(p, "GuC Number Outstanding Submission G2H: %u\n",
|
||||||
|
atomic_read(&guc->outstanding_submission_g2h));
|
||||||
|
drm_printf(p, "GuC tasklet count: %u\n\n",
|
||||||
|
atomic_read(&sched_engine->tasklet.count));
|
||||||
|
|
||||||
|
spin_lock_irqsave(&sched_engine->lock, flags);
|
||||||
|
drm_printf(p, "Requests in GuC submit tasklet:\n");
|
||||||
|
for (rb = rb_first_cached(&sched_engine->queue); rb; rb = rb_next(rb)) {
|
||||||
|
struct i915_priolist *pl = to_priolist(rb);
|
||||||
|
struct i915_request *rq;
|
||||||
|
|
||||||
|
priolist_for_each_request(rq, pl)
|
||||||
|
drm_printf(p, "guc_id=%u, seqno=%llu\n",
|
||||||
|
rq->context->guc_id,
|
||||||
|
rq->fence.seqno);
|
||||||
|
}
|
||||||
|
spin_unlock_irqrestore(&sched_engine->lock, flags);
|
||||||
|
drm_printf(p, "\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
void intel_guc_submission_print_context_info(struct intel_guc *guc,
|
||||||
|
struct drm_printer *p)
|
||||||
|
{
|
||||||
|
struct intel_context *ce;
|
||||||
|
unsigned long index;
|
||||||
|
|
||||||
|
xa_for_each(&guc->context_lookup, index, ce) {
|
||||||
|
drm_printf(p, "GuC lrc descriptor %u:\n", ce->guc_id);
|
||||||
|
drm_printf(p, "\tHW Context Desc: 0x%08x\n", ce->lrc.lrca);
|
||||||
|
drm_printf(p, "\t\tLRC Head: Internal %u, Memory %u\n",
|
||||||
|
ce->ring->head,
|
||||||
|
ce->lrc_reg_state[CTX_RING_HEAD]);
|
||||||
|
drm_printf(p, "\t\tLRC Tail: Internal %u, Memory %u\n",
|
||||||
|
ce->ring->tail,
|
||||||
|
ce->lrc_reg_state[CTX_RING_TAIL]);
|
||||||
|
drm_printf(p, "\t\tContext Pin Count: %u\n",
|
||||||
|
atomic_read(&ce->pin_count));
|
||||||
|
drm_printf(p, "\t\tGuC ID Ref Count: %u\n",
|
||||||
|
atomic_read(&ce->guc_id_ref));
|
||||||
|
drm_printf(p, "\t\tSchedule State: 0x%x, 0x%x\n\n",
|
||||||
|
ce->guc_state.sched_state,
|
||||||
|
atomic_read(&ce->guc_sched_state_no_lock));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
|
|
||||||
#include "intel_guc.h"
|
#include "intel_guc.h"
|
||||||
|
|
||||||
|
struct drm_printer;
|
||||||
struct intel_engine_cs;
|
struct intel_engine_cs;
|
||||||
|
|
||||||
void intel_guc_submission_init_early(struct intel_guc *guc);
|
void intel_guc_submission_init_early(struct intel_guc *guc);
|
||||||
|
@ -20,6 +21,10 @@ void intel_guc_submission_fini(struct intel_guc *guc);
|
||||||
int intel_guc_preempt_work_create(struct intel_guc *guc);
|
int intel_guc_preempt_work_create(struct intel_guc *guc);
|
||||||
void intel_guc_preempt_work_destroy(struct intel_guc *guc);
|
void intel_guc_preempt_work_destroy(struct intel_guc *guc);
|
||||||
int intel_guc_submission_setup(struct intel_engine_cs *engine);
|
int intel_guc_submission_setup(struct intel_engine_cs *engine);
|
||||||
|
void intel_guc_submission_print_info(struct intel_guc *guc,
|
||||||
|
struct drm_printer *p);
|
||||||
|
void intel_guc_submission_print_context_info(struct intel_guc *guc,
|
||||||
|
struct drm_printer *p);
|
||||||
|
|
||||||
static inline bool intel_guc_submission_is_supported(struct intel_guc *guc)
|
static inline bool intel_guc_submission_is_supported(struct intel_guc *guc)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Reference in a new issue