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 2B836CCD1A5 for ; Wed, 22 Oct 2025 00:32:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B1B8B10E698; Wed, 22 Oct 2025 00:32:30 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="dwHW+Nca"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id 914FA10E698; Wed, 22 Oct 2025 00:32:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1761093149; x=1792629149; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=AKSk0SHxsHypnr8qaR6e6SwPBA0IYYy9RWMNiQxZY6Y=; b=dwHW+NcaAFf12Le5gI6LKjj6vIpnr0iVgUi2DSdsVL5wNPBDBacIF+Fu 3qrpK6SznrOxI88ZlDf3uPKhkf+YfkvMjxJX8ET8f3b+j1He7WSx+DdsT XdsF91D4GlLif3YrvK4Tx1JEXDFGl38mnTVS0c7zmcWyMazLoJkgsgSog Z/DG3VyQ91qZjTlxWpiTZCX6dZ0ricKaO+2r5eNHlsJxkptrPClGNH4z5 9g7/xWRUEmZZP3tvGGXrPEv57UDd68yfZq/0H1XjqXkfG22Dd8nJR6BYP 8iXbxQ6urQ8Q8nExEQYE0mkTtkrAgFH2bCxMXQcop0Afoz2QUhyDpTQXk Q==; X-CSE-ConnectionGUID: NiTyZMENQ0asQRDQgCdkug== X-CSE-MsgGUID: pLXrZF93Q+GVOeUcO4RwgQ== X-IronPort-AV: E=McAfee;i="6800,10657,11586"; a="85855798" X-IronPort-AV: E=Sophos;i="6.19,246,1754982000"; d="scan'208";a="85855798" 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:25 -0700 X-CSE-ConnectionGUID: X1/gTkwaSs+Z91uYxZAXTA== X-CSE-MsgGUID: M0deOqVVS+GVPjElnYw1CA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.19,246,1754982000"; d="scan'208";a="188132504" 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:21 -0700 From: Gustavo Sousa Date: Tue, 21 Oct 2025 21:28:49 -0300 Subject: [PATCH v2 24/32] drm/i915/xe3p_lpd: Introduce pixel normalizer config support MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251021-xe3p_lpd-basic-enabling-v2-24-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 To enable FBC for FP16 formats, we need to enable the pixel normalizer block. Introduce the register definitions and the initial steps for configuring the pixel normalizer block. In this patch the pixel normalizer block is kept as disabled. The follow-up patches will handle configuring the pixel normalizer block for hdr planes for FP16 formats. Bspec: 69863 Cc: Shekhar Chauhan Signed-off-by: Vinod Govindapillai Signed-off-by: Gustavo Sousa --- drivers/gpu/drm/i915/display/intel_display_types.h | 3 +++ drivers/gpu/drm/i915/display/skl_universal_plane.c | 15 +++++++++++++++ drivers/gpu/drm/i915/display/skl_universal_plane_regs.h | 11 +++++++++++ 3 files changed, 29 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h index 5ae66b7444b6..bba03791f0ea 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -679,6 +679,9 @@ struct intel_plane_state { /* surface address register */ u32 surf; + /* plane pixel normalizer config for Xe3p_LPD+ FBC FP16 */ + u32 pixel_normalizer; + /* * scaler_id * = -1 : not using a scaler diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c index 9f1111324dab..16a9c141281b 100644 --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c @@ -893,6 +893,12 @@ static void skl_write_plane_wm(struct intel_dsb *dsb, xe3_plane_min_ddb_reg_val(min_ddb, interim_ddb)); } +static void +xe3p_lpd_plane_check_pixel_normalizer(struct intel_plane_state *plane_state) +{ + plane_state->pixel_normalizer = 0; +} + static void skl_plane_disable_arm(struct intel_dsb *dsb, struct intel_plane *plane, @@ -1671,6 +1677,11 @@ icl_plane_update_arm(struct intel_dsb *dsb, icl_plane_update_sel_fetch_arm(dsb, plane, crtc_state, plane_state); + /* Only the HDR planes can have pixel normalizer */ + if (DISPLAY_VER(display) >= 35 && icl_is_hdr_plane(display, plane_id)) + intel_de_write_dsb(display, dsb, + PLANE_PIXEL_NORMALIZE(plane->pipe, plane->id), + plane_state->pixel_normalizer); /* * The control register self-arms if the plane was previously * disabled. Try to make the plane enable atomic by writing @@ -2385,6 +2396,10 @@ static int skl_plane_check(struct intel_crtc_state *crtc_state, plane_state->damage = DRM_RECT_INIT(0, 0, 0, 0); } + /* Pixel normalizer for Xe3p_LPD+ */ + if (DISPLAY_VER(display) >= 35 && icl_is_hdr_plane(display, plane->id)) + xe3p_lpd_plane_check_pixel_normalizer(plane_state); + plane_state->ctl = skl_plane_ctl(plane_state); if (DISPLAY_VER(display) >= 10) diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane_regs.h b/drivers/gpu/drm/i915/display/skl_universal_plane_regs.h index 84cf565bd653..11c713f9b237 100644 --- a/drivers/gpu/drm/i915/display/skl_universal_plane_regs.h +++ b/drivers/gpu/drm/i915/display/skl_universal_plane_regs.h @@ -456,4 +456,15 @@ _SEL_FETCH_PLANE_OFFSET_5_A, _SEL_FETCH_PLANE_OFFSET_5_B, \ _SEL_FETCH_PLANE_OFFSET_6_A, _SEL_FETCH_PLANE_OFFSET_6_B) +#define _PLANE_PIXEL_NORMALIZE_1_A 0x701a8 +#define _PLANE_PIXEL_NORMALIZE_2_A 0x702a8 +#define _PLANE_PIXEL_NORMALIZE_1_B 0x711a8 +#define _PLANE_PIXEL_NORMALIZE_2_B 0x712a8 +#define PLANE_PIXEL_NORMALIZE(pipe, plane) _MMIO_SKL_PLANE((pipe), (plane), \ + _PLANE_PIXEL_NORMALIZE_1_A, _PLANE_PIXEL_NORMALIZE_1_B, \ + _PLANE_PIXEL_NORMALIZE_2_A, _PLANE_PIXEL_NORMALIZE_2_B) +#define PLANE_PIXEL_NORMALIZE_ENABLE REG_BIT(31) +#define PLANE_PIXEL_NORMALIZE_NORM_FACTOR_MASK REG_GENMASK(15, 0) +#define PLANE_PIXEL_NORMALIZE_NORM_FACTOR(val) REG_FIELD_PREP(PLANE_PIXEL_NORMALIZE_NORM_FACTOR_MASK, (val)) + #endif /* __SKL_UNIVERSAL_PLANE_REGS_H__ */ -- 2.51.0