From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2E8D1C3DA49 for ; Tue, 16 Jul 2024 09:45:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F0AA710E619; Tue, 16 Jul 2024 09:45:18 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="YErvqWv7"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6709410E618 for ; Tue, 16 Jul 2024 09:45:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1721123118; x=1752659118; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=Oy3qMDjd5ePCWulpwJJwKbYv4OkDUH146KmVsBiQzME=; b=YErvqWv79UJ6Hgy0J4mXZGcJRa/yD7RkyqRTCRTmWz8gPfJK3X7sHRCH E1QABTcG3lk88KqepFmoO+Iy8NSykU+/lygqpWQ/e5CrGP5QndD7Ny9eT 9IY/PfhOL9GQFAZ9t39Lv8mKDMmnfHUNMLwoUB1s02sZWRJyjXeCsAlho UTjs1wot/2wCvDl+rp+xDHxP2vcZRFJFx6xgfOYMGknxiivl2MrkG2TVF ep1XheNXjLv+/LHEo5CYzyLUdQuhUkxT4lboCCgsJuq+eyz0jF86xR15N X67DA8bnXkODdDJ5XxsikV1HMAu1D7DhuWWRGfn7C89btOZgCdsf3D+yy w==; X-CSE-ConnectionGUID: opoTuPvSQkiovv9akpwYuw== X-CSE-MsgGUID: zQ2WRl1qTDChKx6i4l2iZw== X-IronPort-AV: E=McAfee;i="6700,10204,11134"; a="21462030" X-IronPort-AV: E=Sophos;i="6.09,211,1716274800"; d="scan'208";a="21462030" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jul 2024 02:45:17 -0700 X-CSE-ConnectionGUID: irWsv+twQ7aYAEq0ptVgUw== X-CSE-MsgGUID: Ag8/gYiVR3GLcy7QP+py5A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,211,1716274800"; d="scan'208";a="50024761" Received: from tejas-super-server.iind.intel.com ([10.145.169.166]) by fmviesa010.fm.intel.com with ESMTP; 16 Jul 2024 02:45:16 -0700 From: Tejas Upadhyay To: intel-xe@lists.freedesktop.org Cc: Matt Roper , Tejas Upadhyay Subject: [PATCH] drm/xe/xe2: Use XE_WA() check Date: Tue, 16 Jul 2024 15:16:35 +0530 Message-Id: <20240716094635.3427833-1-tejas.upadhyay@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" Use XE_WA as used elsewhere. Fixes: 86c5b70a9c0c ("drm/xe/xe2: Add Wa_15015404425") Signed-off-by: Tejas Upadhyay --- drivers/gpu/drm/xe/xe_mmio.c | 5 ++++- drivers/gpu/drm/xe/xe_wa_oob.rules | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/xe/xe_mmio.c b/drivers/gpu/drm/xe/xe_mmio.c index ea3c37d3e13f..1138934cf969 100644 --- a/drivers/gpu/drm/xe/xe_mmio.c +++ b/drivers/gpu/drm/xe/xe_mmio.c @@ -13,6 +13,8 @@ #include #include +#include + #include "regs/xe_bars.h" #include "regs/xe_regs.h" #include "xe_device.h" @@ -22,6 +24,7 @@ #include "xe_macros.h" #include "xe_sriov.h" #include "xe_trace.h" +#include "xe_wa.h" static void tiles_fini(void *arg) { @@ -127,7 +130,7 @@ static void mmio_flush_pending_writes(struct xe_gt *gt) struct xe_tile *tile = gt_to_tile(gt); int i; - if (tile->xe->info.platform != XE_LUNARLAKE) + if (!XE_WA(gt, 15015404425)) return; /* 4 dummy writes */ diff --git a/drivers/gpu/drm/xe/xe_wa_oob.rules b/drivers/gpu/drm/xe/xe_wa_oob.rules index 08f7336881e3..3d0e0779a833 100644 --- a/drivers/gpu/drm/xe/xe_wa_oob.rules +++ b/drivers/gpu/drm/xe/xe_wa_oob.rules @@ -30,3 +30,4 @@ 22019338487 MEDIA_VERSION(2000) GRAPHICS_VERSION(2001) 16023588340 GRAPHICS_VERSION(2001) +15015404425 GRAPHICS_VERSION(2004) -- 2.25.1