From b2f7e30d2e4a34fcee8111d713bef4f29dc23c77 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ville=20Syrj=C3=A4l=C3=A4?= Date: Thu, 12 Jun 2025 17:50:18 +0300 Subject: [PATCH] drm/i915/dsb: Disable the GOSUB interrupt MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Current DSB hardware is apparently a bit borked and likes to signal spurious GOSUB errors. We already have most for the workarounds for this in place, but the last part is simply not enabling the corresponding interrupt. While at it polish up the w/a comments with the w/a number, and consistently take the short blurp from the w/a page. Reviewed-by: Uma Shankar Signed-off-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20250612145018.8735-7-ville.syrjala@linux.intel.com --- drivers/gpu/drm/i915/display/intel_dsb.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dsb.c b/drivers/gpu/drm/i915/display/intel_dsb.c index aaa2a4a52edcf..53d8ae3a70e90 100644 --- a/drivers/gpu/drm/i915/display/intel_dsb.c +++ b/drivers/gpu/drm/i915/display/intel_dsb.c @@ -554,8 +554,8 @@ static void intel_dsb_gosub_align(struct intel_dsb *dsb) aligned_tail = ALIGN(tail, CACHELINE_BYTES); /* - * "The GOSUB instruction cannot be placed in - * cacheline QW slot 6 or 7 (numbered 0-7)" + * Wa_16024917128 + * "Ensure GOSUB is not placed in cacheline QW slot 6 or 7 (numbered 0-7)" */ if (aligned_tail - tail <= 2 * 8) intel_dsb_buffer_memset(&dsb->dsb_buf, dsb->free_pos, 0, @@ -618,8 +618,8 @@ void intel_dsb_gosub_finish(struct intel_dsb *dsb) intel_dsb_align_tail(dsb); /* - * "All subroutines called by the GOSUB instruction - * must end with a cacheline of NOPs" + * Wa_16024917128 + * "Ensure that all subroutines called by GOSUB end with a cacheline of NOPs" */ intel_dsb_noop(dsb, 8); @@ -667,7 +667,11 @@ static u32 dsb_error_int_en(struct intel_display *display) if (DISPLAY_VER(display) >= 14) errors |= DSB_ATS_FAULT_INT_EN; - if (DISPLAY_VER(display) >= 30) + /* + * Wa_16024917128 + * "Disable nested GOSUB interrupt (DSB_INTERRUPT bit 21)" + */ + if (0 && DISPLAY_VER(display) >= 30) errors |= DSB_GOSUB_INT_EN; return errors; -- 2.47.2