Skip to content

Commit 6c10ba0

Browse files
zehortigozalucasdemarchi
authored andcommitted
drm/xe/oa: Fix overflow in oa batch buffer
By default xe_bb_create_job() appends a MI_BATCH_BUFFER_END to batch buffer, this is not a problem if batch buffer is only used once but oa reuses the batch buffer for the same metric and at each call it appends a MI_BATCH_BUFFER_END, printing the warning below and then overflowing. [ 381.072016] ------------[ cut here ]------------ [ 381.072019] xe 0000:00:02.0: [drm] Assertion `bb->len * 4 + bb_prefetch(q->gt) <= size` failed! platform: LUNARLAKE subplatform: 1 graphics: Xe2_LPG / Xe2_HPG 20.04 step B0 media: Xe2_LPM / Xe2_HPM 20.00 step B0 tile: 0 VRAM 0 B GT: 0 type 1 So here checking if batch buffer already have MI_BATCH_BUFFER_END if not append it. v2: - simply fix, suggestion from Ashutosh Cc: Ashutosh Dixit <[email protected]> Signed-off-by: José Roberto de Souza <[email protected]> Reviewed-by: Ashutosh Dixit <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] (cherry picked from commit 9ba0e0f) Signed-off-by: Lucas De Marchi <[email protected]>
1 parent 9460f4b commit 6c10ba0

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/gpu/drm/xe/xe_bb.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ __xe_bb_create_job(struct xe_exec_queue *q, struct xe_bb *bb, u64 *addr)
6565
{
6666
u32 size = drm_suballoc_size(bb->bo);
6767

68-
bb->cs[bb->len++] = MI_BATCH_BUFFER_END;
68+
if (bb->len == 0 || bb->cs[bb->len - 1] != MI_BATCH_BUFFER_END)
69+
bb->cs[bb->len++] = MI_BATCH_BUFFER_END;
6970

7071
xe_gt_assert(q->gt, bb->len * 4 + bb_prefetch(q->gt) <= size);
7172

0 commit comments

Comments
 (0)