From: Greg Kroah-Hartman Date: Sun, 28 Feb 2021 16:57:58 +0000 (+0100) Subject: 5.11-stable patches X-Git-Tag: v4.4.259~74 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=143abe569283be91ccf37e3b90c2834c72987181;p=thirdparty%2Fkernel%2Fstable-queue.git 5.11-stable patches added patches: drm-i915-gt-one-more-flush-for-baytrail-clear-residuals.patch --- diff --git a/queue-5.11/drm-i915-gt-one-more-flush-for-baytrail-clear-residuals.patch b/queue-5.11/drm-i915-gt-one-more-flush-for-baytrail-clear-residuals.patch new file mode 100644 index 00000000000..070de97e019 --- /dev/null +++ b/queue-5.11/drm-i915-gt-one-more-flush-for-baytrail-clear-residuals.patch @@ -0,0 +1,61 @@ +From e627d5923cae93fa4188f4c4afba6486169a1337 Mon Sep 17 00:00:00 2001 +From: Chris Wilson +Date: Tue, 19 Jan 2021 11:07:57 +0000 +Subject: drm/i915/gt: One more flush for Baytrail clear residuals + +From: Chris Wilson + +commit e627d5923cae93fa4188f4c4afba6486169a1337 upstream. + +CI reports that Baytail requires one more invalidate after CACHE_MODE +for it to be happy. + +Fixes: ace44e13e577 ("drm/i915/gt: Clear CACHE_MODE prior to clearing residuals") +Signed-off-by: Chris Wilson +Cc: Mika Kuoppala +Cc: Akeem G Abodunrin +Reviewed-by: Mika Kuoppala +Reviewed-by: Akeem G Abodunrin +Cc: Hans de Goede +Cc: Diego Calleja +Link: https://patchwork.freedesktop.org/patch/msgid/20210119110802.22228-1-chris@chris-wilson.co.uk +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/i915/gt/gen7_renderclear.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +--- a/drivers/gpu/drm/i915/gt/gen7_renderclear.c ++++ b/drivers/gpu/drm/i915/gt/gen7_renderclear.c +@@ -353,19 +353,21 @@ static void gen7_emit_pipeline_flush(str + + static void gen7_emit_pipeline_invalidate(struct batch_chunk *batch) + { +- u32 *cs = batch_alloc_items(batch, 0, 8); ++ u32 *cs = batch_alloc_items(batch, 0, 10); + + /* ivb: Stall before STATE_CACHE_INVALIDATE */ +- *cs++ = GFX_OP_PIPE_CONTROL(4); ++ *cs++ = GFX_OP_PIPE_CONTROL(5); + *cs++ = PIPE_CONTROL_STALL_AT_SCOREBOARD | + PIPE_CONTROL_CS_STALL; + *cs++ = 0; + *cs++ = 0; ++ *cs++ = 0; + +- *cs++ = GFX_OP_PIPE_CONTROL(4); ++ *cs++ = GFX_OP_PIPE_CONTROL(5); + *cs++ = PIPE_CONTROL_STATE_CACHE_INVALIDATE; + *cs++ = 0; + *cs++ = 0; ++ *cs++ = 0; + + batch_advance(batch, cs); + } +@@ -397,6 +399,7 @@ static void emit_batch(struct i915_vma * + batch_add(&cmds, 0xffff0000); + batch_add(&cmds, i915_mmio_reg_offset(CACHE_MODE_1)); + batch_add(&cmds, 0xffff0000 | PIXEL_SUBSPAN_COLLECT_OPT_DISABLE); ++ gen7_emit_pipeline_invalidate(&cmds); + gen7_emit_pipeline_flush(&cmds); + + /* Switch to the media pipeline and our base address */ diff --git a/queue-5.11/series b/queue-5.11/series index e0f9a661687..dad8c3767fb 100644 --- a/queue-5.11/series +++ b/queue-5.11/series @@ -19,3 +19,4 @@ random-fix-the-rndreseedcrng-ioctl.patch alsa-pcm-call-sync_stop-at-disconnection.patch alsa-pcm-assure-sync-with-the-pending-stop-operation-at-suspend.patch alsa-pcm-don-t-call-sync_stop-if-it-hasn-t-been-stopped.patch +drm-i915-gt-one-more-flush-for-baytrail-clear-residuals.patch