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 6604CCCD1AB for ; Wed, 22 Oct 2025 00:32:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E835410E68F; Wed, 22 Oct 2025 00:32:13 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="a+szLRav"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8B43A10E689; Wed, 22 Oct 2025 00:32:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1761093131; x=1792629131; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=+Kj2lFFZo6aSEZI/v5rM6UkkK3PvmACWoSSxpl4vGFY=; b=a+szLRavPhl0vlNlUO0WcPQYW07TwF4oSq41C66V3bpeJll911YTkItL inOOmTOyb48l0AYcF/jfsqFYKQpP61RN+BL0rZAzScfkJprMt5v6r3tSO RmfmvLYQt1XmZa2P4z2mhTMJme5bQLLa1yto7CBXuyZi4oYSzGkRCC6bj /nkb4v8nzkhvNbGT7kNKLaDXSyCsSNDyh8Jo1vKDuQfDzLSCEqwjdkbU7 Rbr9RIrcmzN7JoMU32yteZqJsk/HdNml1WjeXd8gQnv9lVIpUmotqe5Or o8chhQ/llfc39B1/cVVyNcYcGJ7TZdy4x3o3JJgotdocwVNoirA9SdhLW g==; X-CSE-ConnectionGUID: bvN7HmWnRx6ymGyIAVfUeA== X-CSE-MsgGUID: YEy3ZVTVT5GoiCSg9wu+0w== X-IronPort-AV: E=McAfee;i="6800,10657,11586"; a="85855782" X-IronPort-AV: E=Sophos;i="6.19,246,1754982000"; d="scan'208";a="85855782" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Oct 2025 17:32:11 -0700 X-CSE-ConnectionGUID: 29JHFVfXSYOfhQZXEMd4eA== X-CSE-MsgGUID: QwmStWjgS3KhGHLn00Oagg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.19,246,1754982000"; d="scan'208";a="188132472" Received: from gpacheco-mobl.amr.corp.intel.com (HELO [192.168.1.16]) ([10.124.221.26]) by fmviesa005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Oct 2025 17:32:08 -0700 From: Gustavo Sousa Date: Tue, 21 Oct 2025 21:28:45 -0300 Subject: [PATCH v2 20/32] drm/i915/xe3p_lpd: Enable system caching for FBC MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251021-xe3p_lpd-basic-enabling-v2-20-10eae6d655b8@intel.com> References: <20251021-xe3p_lpd-basic-enabling-v2-0-10eae6d655b8@intel.com> In-Reply-To: <20251021-xe3p_lpd-basic-enabling-v2-0-10eae6d655b8@intel.com> To: intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: Ankit Nautiyal , Dnyaneshwar Bhadane , Gustavo Sousa , =?utf-8?q?Jouni_H=C3=B6gander?= , Juha-pekka Heikkila , Luca Coelho , Lucas De Marchi , Matt Atwood , Matt Roper , Ravi Kumar Vodapalli , Shekhar Chauhan , Vinod Govindapillai X-Mailer: b4 0.15-dev 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Vinod Govindapillai Configure one of the FBC instances to use system caching. FBC read/write requests are tagged as cacheable till a programmed limit is reached by the hw. Bspec: 74722 Signed-off-by: Vinod Govindapillai Signed-off-by: Gustavo Sousa --- drivers/gpu/drm/i915/display/intel_fbc.c | 47 +++++++++++++++++++++++++++ drivers/gpu/drm/i915/display/intel_fbc_regs.h | 9 +++++ 2 files changed, 56 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c index af3585aeefd3..368b1ff1dc8c 100644 --- a/drivers/gpu/drm/i915/display/intel_fbc.c +++ b/drivers/gpu/drm/i915/display/intel_fbc.c @@ -126,6 +126,9 @@ struct intel_fbc { */ struct intel_fbc_state state; const char *no_fbc_reason; + + /* Only one of FBC instances can use the system cache */ + bool own_sys_cache; }; /* plane stride in pixels */ @@ -570,12 +573,51 @@ static bool ilk_fbc_is_compressing(struct intel_fbc *fbc) return intel_de_read(fbc->display, ILK_DPFC_STATUS(fbc->id)) & DPFC_COMP_SEG_MASK; } +static void nvl_fbc_program_system_cache(struct intel_fbc *fbc, bool enable) +{ + struct intel_display *display = fbc->display; + u32 cfb_offset, usage; + + lockdep_assert_held(&fbc->lock); + + usage = intel_de_read(display, NVL_FBC_SYS_CACHE_USAGE_CFG); + + /* System cache already being used by another pipe */ + if (enable && (usage & FBC_SYS_CACHE_TAG_USE_RES_SPACE)) + return; + + /* Only the fbc instance which owns system cache can disable it */ + if (!enable && !fbc->own_sys_cache) + return; + + /* + * Not programming the cache limit and cache reading enable bits explicitly + * here. The default values should take care of those and that could leave + * adjustments of those bits to the system hw policy + * + * TODO: check if we need to explicitly program these? + */ + cfb_offset = enable ? i915_gem_stolen_node_offset(fbc->compressed_fb) : 0; + usage |= FBC_SYS_CACHE_START_BASE(cfb_offset); + usage |= enable ? FBC_SYS_CACHE_TAG_USE_RES_SPACE : FBC_SYS_CACHE_TAG_DONT_CACHE; + + intel_de_write(display, NVL_FBC_SYS_CACHE_USAGE_CFG, usage); + + fbc->own_sys_cache = enable; + + drm_dbg_kms(display->drm, "System caching for FBC[%d] %s\n", + fbc->id, enable ? "configured" : "cleared"); +} + static void ilk_fbc_program_cfb(struct intel_fbc *fbc) { struct intel_display *display = fbc->display; intel_de_write(display, ILK_DPFC_CB_BASE(fbc->id), i915_gem_stolen_node_offset(fbc->compressed_fb)); + + if (DISPLAY_VER(display) >= 35) + nvl_fbc_program_system_cache(fbc, true); } static const struct intel_fbc_funcs ilk_fbc_funcs = { @@ -953,6 +995,8 @@ static void intel_fbc_program_workarounds(struct intel_fbc *fbc) static void __intel_fbc_cleanup_cfb(struct intel_fbc *fbc) { + struct intel_display *display = fbc->display; + if (WARN_ON(intel_fbc_hw_is_active(fbc))) return; @@ -960,6 +1004,9 @@ static void __intel_fbc_cleanup_cfb(struct intel_fbc *fbc) i915_gem_stolen_remove_node(fbc->compressed_llb); if (i915_gem_stolen_node_allocated(fbc->compressed_fb)) i915_gem_stolen_remove_node(fbc->compressed_fb); + + if (DISPLAY_VER(display) >= 35) + nvl_fbc_program_system_cache(fbc, false); } void intel_fbc_cleanup(struct intel_display *display) diff --git a/drivers/gpu/drm/i915/display/intel_fbc_regs.h b/drivers/gpu/drm/i915/display/intel_fbc_regs.h index 272dba7f9695..e8d2e41ede98 100644 --- a/drivers/gpu/drm/i915/display/intel_fbc_regs.h +++ b/drivers/gpu/drm/i915/display/intel_fbc_regs.h @@ -128,4 +128,13 @@ #define FBC_REND_NUKE REG_BIT(2) #define FBC_REND_CACHE_CLEAN REG_BIT(1) +#define NVL_FBC_SYS_CACHE_USAGE_CFG _MMIO(0x1344E0) +#define FBC_SYS_CACHE_START_BASE_MASK REG_GENMASK(31, 16) +#define FBC_SYS_CACHE_START_BASE(base) REG_FIELD_PREP(FBC_SYS_CACHE_START_BASE_MASK, (base)) +#define FBC_SYS_CACHEABLE_RANGE_MASK REG_GENMASK(15, 4) +#define FBC_SYS_CACHEABLE_RANGE(range) REG_FIELD_PREP(FBC_SYS_CACHEABLE_RANGE_MASK, (range)) +#define FBC_SYS_CACHE_TAG_MASK REG_GENMASK(3, 2) +#define FBC_SYS_CACHE_TAG_DONT_CACHE REG_FIELD_PREP(FBC_SYS_CACHE_TAG_MASK, 0) +#define FBC_SYS_CACHE_TAG_USE_RES_SPACE REG_FIELD_PREP(FBC_SYS_CACHE_TAG_MASK, 3) + #endif /* __INTEL_FBC_REGS__ */ -- 2.51.0