Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A67DB3403F4; Wed, 20 May 2026 17:10:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779297005; cv=none; b=d2YasJ9Am3r3TxEKrlFWZRGEIyX1RwXzb5c+KCLyT3OqJJkC9Zf61d4kLYfHBtNR1G2WuW/GaPaUFur1Yr9TvmdV5wauY0Kb774jNdYCeBeoOGiXZ9eyNv7Iu5hQG64B7Jrosa/VtJQ3DfTxv0jCTGqhZ7wE8X0IrYo/u6nVqAc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779297005; c=relaxed/simple; bh=uLWvVQnTpv/cr78+dQCjvHHPBPRYhO13CmKmT+YH5pw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=OsN6ltPKnWm/bxMgMGf/ck/+691JG5YdBj/q6DWQuIVgZ7v0VUGtLYvfobbleJFeoQ2Xi2KUOCCPXYuddlbpaLwZ6JW8AOPR4lH2Mj8g1SsYYCln0d9oX0X9OdJz5jzc6uCOLr9KFM8iAl+9b+/cUrXYDVU7dE3xf0kmw/nhv40= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=L+Qt1EPo; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="L+Qt1EPo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D586F1F000E9; Wed, 20 May 2026 17:10:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779297004; bh=dH/a8uJ88pA5fERqCUjAXVKMr1Dald4VXSQ349felOc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=L+Qt1EPoMYoz3ZG5D7mzLbBeWX3Xi6Cw/qKtF+/+UtrZCJVSaiPG5hM9UgW5Cg7aV cp6SB0JS/Ml31JXgalBVuGYERnLOOfVNXw+DQ1YzfmKN469um7ZFqojAYVqczKyTOQ TGuAbONtaPbrBPS0tEdjPsxNi2cRYzQpEUhQTdgw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Tvrtko Ursulin , Matt Roper , =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , Rodrigo Vivi , Sasha Levin Subject: [PATCH 7.0 1015/1146] drm/xe/xelp: Fix Wa_18022495364 Date: Wed, 20 May 2026 18:21:05 +0200 Message-ID: <20260520162211.202309782@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260520162148.390695140@linuxfoundation.org> References: <20260520162148.390695140@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 7.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tvrtko Ursulin [ Upstream commit 7fe6cae2f7fad2b5166b0fc096618629f9e2ebcb ] It looks I mistyped CS_DEBUG_MODE2 as CS_DEBUG_MODE1 when adding the workaround. Fix it. Signed-off-by: Tvrtko Ursulin Fixes: ca33cd271ef9 ("drm/xe/xelp: Add Wa_18022495364") Cc: Matt Roper Cc: "Thomas Hellström" Cc: Rodrigo Vivi Cc: # v6.18+ Reviewed-by: Matt Roper Signed-off-by: Thomas Hellström Link: https://patch.msgid.link/20260116095040.49335-1-tvrtko.ursulin@igalia.com Stable-dep-of: 0df99689eb79 ("drm/xe/xelp: Fix Wa_18022495364") Signed-off-by: Sasha Levin --- drivers/gpu/drm/xe/xe_lrc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/xe/xe_lrc.c b/drivers/gpu/drm/xe/xe_lrc.c index 7b70cc01fdb38..fc38cdcc37714 100644 --- a/drivers/gpu/drm/xe/xe_lrc.c +++ b/drivers/gpu/drm/xe/xe_lrc.c @@ -1202,7 +1202,7 @@ static ssize_t setup_invalidate_state_cache_wa(struct xe_lrc *lrc, if (xe_gt_WARN_ON(lrc->gt, max_len < 3)) return -ENOSPC; - *cmd++ = MI_LOAD_REGISTER_IMM | MI_LRI_NUM_REGS(1); + *cmd++ = MI_LOAD_REGISTER_IMM | MI_LRI_LRM_CS_MMIO | MI_LRI_NUM_REGS(1); *cmd++ = CS_DEBUG_MODE2(0).addr; *cmd++ = _MASKED_BIT_ENABLE(INSTRUCTION_STATE_CACHE_INVALIDATE); -- 2.53.0