From patchwork Fri Feb 24 00:22:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Roper X-Patchwork-Id: 13150863 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 53F93C61DA4 for ; Fri, 24 Feb 2023 00:23:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 91C8010E383; Fri, 24 Feb 2023 00:23:26 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 41E8610E371 for ; Fri, 24 Feb 2023 00:23:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1677198204; x=1708734204; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=kAJvAfPdL1iGnoUIopHc0fChEf/F+DtbX6G4i7iA5zU=; b=aSqOG+2wLoHwNEL/CRfh4cGLlrN5wHv52oN/4p+SqMoxd55UZKmsM50P L5C8jGI5klz6aJwVwBGgyfelTGzohYqQ7+bYj+w532m467ni4CN1UQGF7 O0UIe9HEfiDgzrLPLeAhPLmUrPr9tI2JV9K/fVQi58sn9SJ5l/7PI7fg9 0a0JunvLmyunKl8mb7TR2FVOUZoLOFKeN2CA0fckf9u6D4scPQNzudl5u F8+gQ6bRMq76u+g++5c+ZkCGEamScHnVKapvAAO8jtCY15ssrus4mAyvm S7ogGGYTD8OTltLFf0NNXKR6fQWMkRw3eNOVzCxyrCkzT5dOHh3wML/OL Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10630"; a="333366874" X-IronPort-AV: E=Sophos;i="5.97,322,1669104000"; d="scan'208";a="333366874" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Feb 2023 16:23:10 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10630"; a="815547945" X-IronPort-AV: E=Sophos;i="5.97,322,1669104000"; d="scan'208";a="815547945" Received: from mdroper-desk1.fm.intel.com ([10.1.27.134]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Feb 2023 16:23:10 -0800 From: Matt Roper To: intel-gfx@lists.freedesktop.org Date: Thu, 23 Feb 2023 16:22:59 -0800 Message-Id: <20230224002300.3578985-1-matthew.d.roper@intel.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 1/2] drm/i915: Whitelist COMMON_SLICE_CHICKEN3 for UMD access X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: matthew.d.roper@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" A recommended tuning setting for both gen12 and Xe_HP platforms requires that we grant userspace r/w access to the COMMON_SLICE_CHICKEN3 register. Bspec: 73993, 73994, 31870, 68331 Cc: Dongwon Kim Signed-off-by: Matt Roper Reviewed-by: Gustavo Sousa Reviewed-by: Gustavo Sousa --- The bspec update to add COMMON_SLICE_CHICKEN3 to the tuning guide pages is still pending at the moment, but should be finalized shortly. drivers/gpu/drm/i915/gt/intel_workarounds.c | 25 ++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c index 1ef9c9fa2eff..0444c715998a 100644 --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c @@ -2194,6 +2194,10 @@ static void tgl_whitelist_build(struct intel_engine_cs *engine) /* Wa_1806527549:tgl */ whitelist_reg(w, HIZ_CHICKEN); + + /* Required by recommended tuning setting (not a workaround) */ + whitelist_reg(w, GEN11_COMMON_SLICE_CHICKEN3); + break; default: break; @@ -2227,6 +2231,9 @@ static void dg2_whitelist_build(struct intel_engine_cs *engine) RING_FORCE_TO_NONPRIV_ACCESS_RD | RING_FORCE_TO_NONPRIV_RANGE_4); + /* Required by recommended tuning setting (not a workaround) */ + whitelist_mcr_reg(w, XEHP_COMMON_SLICE_CHICKEN3); + break; case COMPUTE_CLASS: /* Wa_16011157294:dg2_g10 */ @@ -2264,6 +2271,22 @@ static void pvc_whitelist_build(struct intel_engine_cs *engine) blacklist_trtt(engine); } +static void mtl_whitelist_build(struct intel_engine_cs *engine) +{ + struct i915_wa_list *w = &engine->whitelist; + + switch (engine->class) { + case RENDER_CLASS: + /* Required by recommended tuning setting (not a workaround) */ + whitelist_mcr_reg(w, XEHP_COMMON_SLICE_CHICKEN3); + + break; + default: + break; + } + +} + void intel_engine_init_whitelist(struct intel_engine_cs *engine) { struct drm_i915_private *i915 = engine->i915; @@ -2272,7 +2295,7 @@ void intel_engine_init_whitelist(struct intel_engine_cs *engine) wa_init_start(w, engine->gt, "whitelist", engine->name); if (IS_METEORLAKE(i915)) - ; /* noop; none at this time */ + mtl_whitelist_build(engine); else if (IS_PONTEVECCHIO(i915)) pvc_whitelist_build(engine); else if (IS_DG2(i915)) From patchwork Fri Feb 24 00:23:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Roper X-Patchwork-Id: 13150862 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 50B77C61DA4 for ; Fri, 24 Feb 2023 00:23:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 753FA10E371; Fri, 24 Feb 2023 00:23:26 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id AAC0610E371 for ; Fri, 24 Feb 2023 00:23:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1677198204; x=1708734204; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tbDCjeGO0q0nMIjjQFPLoG6X8btWffIhXqU1I5AfvXQ=; b=iHq76wWiYBD6yTnrDYg2Ycumhu7w0tTtsjASrR70Q46ALkJ5rHRcHhe/ 2kYsJ6c8Ahcg6FrlwIhIFwwhzCFa+ijEPD3uiO5XCksu5uXiTW7AzS2FY ENw1mC+C7PT2Ds26rRpBxFxoBG+YTnoqMkwkMlbCTivGXdXhe+TKp+5pK 2R7T1G+n3EI+ykuXCHIz52UUc/JQksNs6B9ZzTpV6Rzk5RioPHTKau29H SESuybzS3vKACNkUV8zJJ58ITQG/fA0IlAfy01+uOzsokyEwIp09B/HKX EmXpjpCRU4LFV9n90R32XOioNVCOsr6P5pBLFwV3jSI5rPDYucZGEIhXH w==; X-IronPort-AV: E=McAfee;i="6500,9779,10630"; a="333366877" X-IronPort-AV: E=Sophos;i="5.97,322,1669104000"; d="scan'208";a="333366877" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Feb 2023 16:23:12 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10630"; a="815547964" X-IronPort-AV: E=Sophos;i="5.97,322,1669104000"; d="scan'208";a="815547964" Received: from mdroper-desk1.fm.intel.com ([10.1.27.134]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Feb 2023 16:23:12 -0800 From: Matt Roper To: intel-gfx@lists.freedesktop.org Date: Thu, 23 Feb 2023 16:23:00 -0800 Message-Id: <20230224002300.3578985-2-matthew.d.roper@intel.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230224002300.3578985-1-matthew.d.roper@intel.com> References: <20230224002300.3578985-1-matthew.d.roper@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 2/2] drm/i915: Stop whitelisting CS_CTX_TIMESTAMP on Xe_HP platforms X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: matthew.d.roper@intel.com Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Xe_HP architecture already makes the CS_CTX_TIMESTAMP readable by userspace on all engines; there's no longer a need to add it to the software-managed whitelist for the non-RCS engines. Bspec: 45545 Signed-off-by: Matt Roper Acked-by: Gustavo Sousa --- drivers/gpu/drm/i915/gt/intel_workarounds.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c index 0444c715998a..ee0649851a4c 100644 --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c @@ -2204,17 +2204,10 @@ static void tgl_whitelist_build(struct intel_engine_cs *engine) } } -static void xehpsdv_whitelist_build(struct intel_engine_cs *engine) -{ - allow_read_ctx_timestamp(engine); -} - static void dg2_whitelist_build(struct intel_engine_cs *engine) { struct i915_wa_list *w = &engine->whitelist; - allow_read_ctx_timestamp(engine); - switch (engine->class) { case RENDER_CLASS: /* @@ -2265,8 +2258,6 @@ static void blacklist_trtt(struct intel_engine_cs *engine) static void pvc_whitelist_build(struct intel_engine_cs *engine) { - allow_read_ctx_timestamp(engine); - /* Wa_16014440446:pvc */ blacklist_trtt(engine); } @@ -2301,7 +2292,7 @@ void intel_engine_init_whitelist(struct intel_engine_cs *engine) else if (IS_DG2(i915)) dg2_whitelist_build(engine); else if (IS_XEHPSDV(i915)) - xehpsdv_whitelist_build(engine); + ; /* none needed */ else if (GRAPHICS_VER(i915) == 12) tgl_whitelist_build(engine); else if (GRAPHICS_VER(i915) == 11)