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 78195C02185 for ; Mon, 20 Jan 2025 06:08:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 423B310E2F3; Mon, 20 Jan 2025 06:08:55 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Ni5hJRde"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0F73010E2F1 for ; Mon, 20 Jan 2025 06:08:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1737353334; x=1768889334; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=O8sEJs9fAaiUhs19ibIerlSbA7YZJN8GMDNN4L/EI5g=; b=Ni5hJRdeEv1wlqjSe1i8eDB9FUj4LZ+QtfNZN0BqEYg01vZ9RtrX9sW6 YQIF6BPAtoU/ACAtexraue2DsKQBUhODlviH7ZvSKPeQ/cBqR0zB8GmjM sMzL1NIvltqwhGiSYTJ2wf/5TMLRNOpaL5bKkKiwkfuLY1QzTbnxAWLN9 zU4Nuo8E/qIYv+QOcqIhjKXSQHb6ziCG5nPcgfkjCv+6zI4qyvy3WZVPq X3/tjHU1fhXAZIadWG8SYHVEaHBGBezCfCesPoG0dRnEbKCC9d37KpsyM X1NzXIDaY2q4dpRKajV6z0H/D4vfcxvmPWFGcbbM7ihtt0lNSVEA1sSmk g==; X-CSE-ConnectionGUID: PFjTtilXSee8nmPTpbYJYQ== X-CSE-MsgGUID: qPsy3cW+RMe2VUYgv5jKTA== X-IronPort-AV: E=McAfee;i="6700,10204,11320"; a="48380350" X-IronPort-AV: E=Sophos;i="6.13,218,1732608000"; d="scan'208";a="48380350" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2025 22:08:54 -0800 X-CSE-ConnectionGUID: qz4SxSG+SzCtI2PYivts2w== X-CSE-MsgGUID: 7PnWjY4XTIWFPuqV4kRn+Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="106221995" Received: from aradhyab-desk.iind.intel.com ([10.145.169.55]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2025 22:08:50 -0800 From: Aradhya Bhatia To: Matt Roper Cc: Intel XE List , Lucas De Marchi , Tejas Upadhyay , Himal Prasad Ghimiray , Ayaz A Siddiqui , Aradhya Bhatia Subject: [PATCH v3 1/2] drm/xe/xe: Add Wa_16021333562 and Wa_14016712196 Date: Mon, 20 Jan 2025 11:39:15 +0530 Message-Id: <20250120060916.778406-2-aradhya.bhatia@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250120060916.778406-1-aradhya.bhatia@intel.com> References: <20250120060916.778406-1-aradhya.bhatia@intel.com> 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" Wa_16021333562 and Wa_14016712196 are permanent workarounds that apply to multiple platforms. Wa_16021333562 applies to platforms ranging from TGL (12.00) to Xe_LPM (13.00), while Wa_14016712196 from DG2 (12.55) to Xe_LPG (12.74). Signed-off-by: Aradhya Bhatia --- drivers/gpu/drm/xe/xe_guc_ads.c | 5 +++++ drivers/gpu/drm/xe/xe_ring_ops.c | 3 +++ drivers/gpu/drm/xe/xe_wa_oob.rules | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/drivers/gpu/drm/xe/xe_guc_ads.c b/drivers/gpu/drm/xe/xe_guc_ads.c index fab259adc380..8ef044ddd682 100644 --- a/drivers/gpu/drm/xe/xe_guc_ads.c +++ b/drivers/gpu/drm/xe/xe_guc_ads.c @@ -376,6 +376,11 @@ static void guc_waklv_init(struct xe_guc_ads *ads) GUC_WORKAROUND_KLV_ID_BACK_TO_BACK_RCS_ENGINE_RESET, &offset, &remain); + if (XE_WA(gt, 16021333562)) + guc_waklv_enable_simple(ads, + GUC_WORKAROUND_KLV_BLOCK_INTERRUPTS_WHEN_MGSR_BLOCKED, + &offset, &remain); + size = guc_ads_waklv_size(ads) - remain; if (!size) return; diff --git a/drivers/gpu/drm/xe/xe_ring_ops.c b/drivers/gpu/drm/xe/xe_ring_ops.c index 9f327f27c072..22c226c30df9 100644 --- a/drivers/gpu/drm/xe/xe_ring_ops.c +++ b/drivers/gpu/drm/xe/xe_ring_ops.c @@ -192,6 +192,9 @@ static int emit_render_cache_flush(struct xe_sched_job *job, u32 *dw, int i) else if (job->q->class == XE_ENGINE_CLASS_COMPUTE) flags &= ~PIPE_CONTROL_3D_ENGINE_FLAGS; + if (XE_WA(gt, 14016712196)) + i = emit_pipe_control(dw, i, 0, PIPE_CONTROL_DEPTH_CACHE_FLUSH, 0, 0); + return emit_pipe_control(dw, i, PIPE_CONTROL0_HDC_PIPELINE_FLUSH, flags, 0, 0); } diff --git a/drivers/gpu/drm/xe/xe_wa_oob.rules b/drivers/gpu/drm/xe/xe_wa_oob.rules index 40438c3d9b72..d7f7d617d490 100644 --- a/drivers/gpu/drm/xe/xe_wa_oob.rules +++ b/drivers/gpu/drm/xe/xe_wa_oob.rules @@ -42,3 +42,7 @@ no_media_l3 MEDIA_VERSION(3000) 14022866841 GRAPHICS_VERSION(3000), GRAPHICS_STEP(A0, B0) MEDIA_VERSION(3000), MEDIA_STEP(A0, B0) +16021333562 GRAPHICS_VERSION_RANGE(1200, 1274) + MEDIA_VERSION(1300) +14016712196 GRAPHICS_VERSION(1255) + GRAPHICS_VERSION_RANGE(1270, 1274) -- 2.34.1