From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 1A063294A4A; Thu, 3 Apr 2025 19:14:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743707670; cv=none; b=EUGZPTabX+cdJubKIFLmI9qxOYn+iIa/ojQSD0BXiY0ajS4hztnwyCaHF5G5VHf3piP2ZjtFcDTR0lDRv3V6L8y4fSu9jw9qYVZ4UYMVs4HUDsz5xDXOlRu81mZIk5HzmO7mO4eW/R/ImO5n58qayxx5GLBB9aGrwquY5IJPq+Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743707670; c=relaxed/simple; bh=ZqnBz5XLFH+VGf0r+gXS385luM/LuY22XBL7qEG8e1k=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=YzqdAmooNXaKRJx34GE2o5vkazMl9at8bOFUB1I+pRPBLwq+83UuIHUyJcMxeeFINrMjLWhyu0qG9MWkfB8n7HSANrZvsiRvBIyLWzGPF1N/T7fk9KRMRsgTAA/GeWl5qFpnI68YXNY1JsQAwm+o65onI7ooffvN0pb37PznmnE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GET6YMZI; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="GET6YMZI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 933C3C4CEE9; Thu, 3 Apr 2025 19:14:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743707669; bh=ZqnBz5XLFH+VGf0r+gXS385luM/LuY22XBL7qEG8e1k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GET6YMZI9mzphpZY/CHrqxUuDeTYiWUOaWneFwVwQoe1mLcSZIH6Kkaig3gxJzeib a1V21DR3uHBklEGnHVZYwoCuN9qenqFGuJVqsF8dh1C+Ipp51hYto7qnzC3Ppvb3Q7 dEaNSdqnzBQbmZ2hZyZ/ISZMX1ncQRyE8SGJJP8RFKgewxZc93puWsGCof3tSAMozQ WPSNLQ7FlVcbO3p188hzTorMB5oe0tjhCC/SdwYPgmORHq//pRdf4r2tIiSRxvBAI3 qpdTadh2Byir2ZJmZEJ+wgDgcT6GnPNwRbF0UYh8bEUcRFM8OE130dkct0DwzTGFpm 7zYMMcJMNz7Sg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tvrtko Ursulin , Lucas De Marchi , Matt Roper , Gustavo Sousa , Sasha Levin , thomas.hellstrom@linux.intel.com, rodrigo.vivi@intel.com, airlied@gmail.com, simona@ffwll.ch, intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.14 26/44] drm/xe/xelp: Move Wa_16011163337 from tunings to workarounds Date: Thu, 3 Apr 2025 15:12:55 -0400 Message-Id: <20250403191313.2679091-26-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250403191313.2679091-1-sashal@kernel.org> References: <20250403191313.2679091-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.14 Content-Transfer-Encoding: 8bit From: Tvrtko Ursulin [ Upstream commit d9b5d83c5a4d720af6ddbefe2825c78f0325a3fd ] Workaround database specifies 16011163337 as a workaround so lets move it there. Signed-off-by: Tvrtko Ursulin Cc: Lucas De Marchi Cc: Matt Roper Cc: Gustavo Sousa Reviewed-by: Lucas De Marchi Link: https://patchwork.freedesktop.org/patch/msgid/20250227101304.46660-3-tvrtko.ursulin@igalia.com Signed-off-by: Lucas De Marchi Signed-off-by: Sasha Levin --- drivers/gpu/drm/xe/xe_tuning.c | 8 -------- drivers/gpu/drm/xe/xe_wa.c | 7 +++++++ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_tuning.c b/drivers/gpu/drm/xe/xe_tuning.c index d449de0fb6ecb..3c78f3d715591 100644 --- a/drivers/gpu/drm/xe/xe_tuning.c +++ b/drivers/gpu/drm/xe/xe_tuning.c @@ -97,14 +97,6 @@ static const struct xe_rtp_entry_sr engine_tunings[] = { }; static const struct xe_rtp_entry_sr lrc_tunings[] = { - { XE_RTP_NAME("Tuning: ganged timer, also known as 16011163337"), - XE_RTP_RULES(GRAPHICS_VERSION_RANGE(1200, 1210), ENGINE_CLASS(RENDER)), - /* read verification is ignored due to 1608008084. */ - XE_RTP_ACTIONS(FIELD_SET_NO_READ_MASK(FF_MODE2, - FF_MODE2_GS_TIMER_MASK, - FF_MODE2_GS_TIMER_224)) - }, - /* DG2 */ { XE_RTP_NAME("Tuning: L3 cache"), diff --git a/drivers/gpu/drm/xe/xe_wa.c b/drivers/gpu/drm/xe/xe_wa.c index 570fe03764025..2553accf8c517 100644 --- a/drivers/gpu/drm/xe/xe_wa.c +++ b/drivers/gpu/drm/xe/xe_wa.c @@ -618,6 +618,13 @@ static const struct xe_rtp_entry_sr engine_was[] = { }; static const struct xe_rtp_entry_sr lrc_was[] = { + { XE_RTP_NAME("16011163337"), + XE_RTP_RULES(GRAPHICS_VERSION_RANGE(1200, 1210), ENGINE_CLASS(RENDER)), + /* read verification is ignored due to 1608008084. */ + XE_RTP_ACTIONS(FIELD_SET_NO_READ_MASK(FF_MODE2, + FF_MODE2_GS_TIMER_MASK, + FF_MODE2_GS_TIMER_224)) + }, { XE_RTP_NAME("1409342910, 14010698770, 14010443199, 1408979724, 1409178076, 1409207793, 1409217633, 1409252684, 1409347922, 1409142259"), XE_RTP_RULES(GRAPHICS_VERSION_RANGE(1200, 1210)), XE_RTP_ACTIONS(SET(COMMON_SLICE_CHICKEN3, -- 2.39.5