diff options
| author | Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> | 2023-08-17 23:18:28 +0300 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2023-12-21 19:40:20 +0300 |
| commit | aef61349ef1bf01badfa3ea955ba84048467f691 (patch) | |
| tree | 27da25605f2950c63bf5112d4d42f03601ccac94 /drivers/gpu/drm/xe/xe_ring_ops.c | |
| parent | 3d2b5d4e28d9c58ea97704fe1eb663aee2556449 (diff) | |
| download | linux-aef61349ef1bf01badfa3ea955ba84048467f691.tar.xz | |
drm/xe: add GSCCS ring ops
Like the BCS, the GSCCS doesn't have any special HW that needs handling
when emitting commands, so we can re-use the same emit_job code. To make
it clear that this is now a shared low-level function, it has been
renamed to use the "simple" postfix, instead of "copy", to indicate that
it applies to all engines that don't need any additional engine-specific
handling.
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://lore.kernel.org/r/20230817201831.1583172-5-daniele.ceraolospurio@intel.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/gpu/drm/xe/xe_ring_ops.c')
| -rw-r--r-- | drivers/gpu/drm/xe/xe_ring_ops.c | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/drivers/gpu/drm/xe/xe_ring_ops.c b/drivers/gpu/drm/xe/xe_ring_ops.c index 6346ed24e279..36058600e231 100644 --- a/drivers/gpu/drm/xe/xe_ring_ops.c +++ b/drivers/gpu/drm/xe/xe_ring_ops.c @@ -205,8 +205,9 @@ static u32 get_ppgtt_flag(struct xe_sched_job *job) return !(job->q->flags & EXEC_QUEUE_FLAG_WA) ? BIT(8) : 0; } -static void __emit_job_gen12_copy(struct xe_sched_job *job, struct xe_lrc *lrc, - u64 batch_addr, u32 seqno) +/* for engines that don't require any special HW handling (no EUs, no aux inval, etc) */ +static void __emit_job_gen12_simple(struct xe_sched_job *job, struct xe_lrc *lrc, + u64 batch_addr, u32 seqno) { u32 dw[MAX_JOB_SIZE_DW], i = 0; u32 ppgtt_flag = get_ppgtt_flag(job); @@ -374,6 +375,15 @@ static void emit_migration_job_gen12(struct xe_sched_job *job, xe_lrc_write_ring(lrc, dw, i * sizeof(*dw)); } +static void emit_job_gen12_gsc(struct xe_sched_job *job) +{ + XE_WARN_ON(job->q->width > 1); /* no parallel submission for GSCCS */ + + __emit_job_gen12_simple(job, job->q->lrc, + job->batch_addr[0], + xe_sched_job_seqno(job)); +} + static void emit_job_gen12_copy(struct xe_sched_job *job) { int i; @@ -385,9 +395,9 @@ static void emit_job_gen12_copy(struct xe_sched_job *job) } for (i = 0; i < job->q->width; ++i) - __emit_job_gen12_copy(job, job->q->lrc + i, - job->batch_addr[i], - xe_sched_job_seqno(job)); + __emit_job_gen12_simple(job, job->q->lrc + i, + job->batch_addr[i], + xe_sched_job_seqno(job)); } static void emit_job_gen12_video(struct xe_sched_job *job) @@ -411,6 +421,10 @@ static void emit_job_gen12_render_compute(struct xe_sched_job *job) xe_sched_job_seqno(job)); } +static const struct xe_ring_ops ring_ops_gen12_gsc = { + .emit_job = emit_job_gen12_gsc, +}; + static const struct xe_ring_ops ring_ops_gen12_copy = { .emit_job = emit_job_gen12_copy, }; @@ -427,6 +441,8 @@ const struct xe_ring_ops * xe_ring_ops_get(struct xe_gt *gt, enum xe_engine_class class) { switch (class) { + case XE_ENGINE_CLASS_OTHER: + return &ring_ops_gen12_gsc; case XE_ENGINE_CLASS_COPY: return &ring_ops_gen12_copy; case XE_ENGINE_CLASS_VIDEO_DECODE: |