From patchwork Mon Nov 4 09:12:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kandpal, Suraj" X-Patchwork-Id: 13861095 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 293ACD132A3 for ; Mon, 4 Nov 2024 09:13:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B82A010E17E; Mon, 4 Nov 2024 09:13:12 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="MOjBTIM+"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1E77D10E17E; Mon, 4 Nov 2024 09:13: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=1730711592; x=1762247592; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=5m26iK5mjh8sm3Bm1lbzlVnPOruHNYc2sdvxJXeC0mw=; b=MOjBTIM+tSLWwHP83kkC/Y7b/hJoASZq6mVt/KOwVLvB8mm3j8qBm5ZM Yd1lQaVJ8+vICq7tUydEW0b9Ne7uxwzuBqnReZVwiBfzRlqhny9m4qVRC h0Ydz2IWi8w5+IMERGrM5WVKSTzJY0FpiOn5nedSd+pYj13jKNwJELee5 0VGS8k3t/iVIp72Hd4PXlkZDAwfFK+4dOpIM3ss4ktPlZsmxtJGjs9+hz Z0dwR5ArPn61TBkQYcQ4duOcjOptWpZMLUG3CRcCHVOemRKWYcjMbuGoR bqlvV0Yax9SjcjRGfuq/oJRvzLSkNS1dkfogezeSD95bJVYfTgL0c1In8 A==; X-CSE-ConnectionGUID: SHqd6X2zRzad5GLfND6OKQ== X-CSE-MsgGUID: 8py0vjWISH6sp/vjoO+JcA== X-IronPort-AV: E=McAfee;i="6700,10204,11222"; a="30345551" X-IronPort-AV: E=Sophos;i="6.11,199,1725346800"; d="scan'208";a="30345551" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Nov 2024 01:13:11 -0800 X-CSE-ConnectionGUID: CHZuGKCORa+MfSCXttB69w== X-CSE-MsgGUID: hpaySqI8RMyGVbc7NwmVGg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,199,1725346800"; d="scan'208";a="88358817" Received: from kandpal-x299-ud4-pro.iind.intel.com ([10.190.239.10]) by orviesa003.jf.intel.com with ESMTP; 04 Nov 2024 01:13:09 -0800 From: Suraj Kandpal To: intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: jouni.hogander@intel.com, Suraj Kandpal Subject: [PATCH] drm/i915/psr: Implement WA to help reach PC10 Date: Mon, 4 Nov 2024 14:42:57 +0530 Message-Id: <20241104091257.731388-1-suraj.kandpal@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 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" To reach PC10 when PKG_C_LATENCY is configure we must do the following things 1) Enter PSR1 only when delayed_vblank < 6 lines and DC5 can be entered 2) Allow PSR2 deep sleep when DC5 can be entered 3) DC5 can be entered when all transocoder have either PSR1, PSR2 or eDP 1.5 PR ALPM enabled and VBI is disabled and flips and pushes are not happening. --v2 -Add debug prints --v3 -use crtc as variable name for intel_crtc [Jani] -use encoder as variable name for intel_encoder [Jani] -No changes in intel_dp in compute_config_late [Jani] --v4 -Remove "check" from naming [Jani] -Remove intel_encoder variable which is not necessary in compute_config_late WA: 22019444797 Signed-off-by: Suraj Kandpal --- drivers/gpu/drm/i915/display/intel_ddi.c | 3 + .../drm/i915/display/intel_display_types.h | 6 + drivers/gpu/drm/i915/display/intel_psr.c | 130 +++++++++++++++++- drivers/gpu/drm/i915/display/intel_psr.h | 1 + 4 files changed, 139 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 0535daed6a9f..8e0fb6bd6211 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -4403,6 +4403,9 @@ static int intel_ddi_compute_config_late(struct intel_encoder *encoder, port_sync_transcoders & ~BIT(crtc_state->cpu_transcoder); } + if (intel_encoder_is_dp(encoder)) + intel_psr_compute_config_late(crtc_state); + return 0; } diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h index ff6eb93337e0..dd5f3ea90e5b 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -1089,6 +1089,9 @@ struct intel_crtc_state { bool req_psr2_sdp_prior_scanline; bool has_panel_replay; bool wm_level_disabled; + bool is_wa_delayed_vblank_limit; + bool is_dpkgc_configured; + bool is_dc5_entry_possible; u32 dc3co_exitline; u16 su_y_granularity; @@ -1587,6 +1590,9 @@ struct intel_psr { #define I915_PSR_DEBUG_PANEL_REPLAY_DISABLE 0x40 u32 debug; + bool is_dpkgc_configured; + bool is_dc5_entry_possible; + bool is_wa_delayed_vblank_limit; bool sink_support; bool source_support; bool enabled; diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index a784c0b81556..b93358a82aa3 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "i915_drv.h" #include "i915_reg.h" @@ -898,6 +899,81 @@ static u8 psr_compute_idle_frames(struct intel_dp *intel_dp) return idle_frames; } +static bool +intel_psr_wa_delayed_vblank(const struct drm_display_mode *adjusted_mode) +{ + return (adjusted_mode->crtc_vblank_start - adjusted_mode->crtc_vdisplay) >= 6; +} + +/* + * PKG_C_LATENCY is configured only when DISPLAY_VER >= 20 and + * VRR is not enabled + */ +static bool intel_psr_is_dpkgc_configured(struct intel_display *display, + struct intel_crtc_state *crtc_state) +{ + if (DISPLAY_VER(display) < 20 || crtc_state->vrr.enable) + return false; + + return true; +} + +static bool wa_22019444797_psr1(const struct intel_crtc_state *crtc_state, + struct intel_psr *psr) +{ + struct intel_display *display = to_intel_display(crtc_state); + + if (DISPLAY_VER(display) == 20 && psr->is_dpkgc_configured && + (psr->is_wa_delayed_vblank_limit || !psr->is_dc5_entry_possible) && + !crtc_state->has_sel_update && !crtc_state->has_panel_replay) { + drm_dbg_kms(display->drm, + "Wa 22019444797 requirement met PSR1 disabled\n"); + return true; + } else { + return false; + } +} + +/* + * DC5 entry is only possible if vblank interrupt is disabled + * and either psr1, psr2, edp 1.5 pr alpm is enabled on all + * enabled encoders. + */ +static bool +intel_psr_is_dc5_entry_possible(struct intel_display *display, + struct intel_crtc_state *crtc_state) +{ + struct intel_crtc *crtc; + + if ((display->power.domains.target_dc_state & + DC_STATE_EN_UPTO_DC5_DC6_MASK) == 0) + return false; + + if (!crtc_state->has_psr && !crtc_state->has_sel_update && + !crtc_state->has_panel_replay) + return false; + + for_each_intel_crtc(display->drm, crtc) { + struct drm_vblank_crtc *vblank; + struct intel_encoder *encoder; + + if (!crtc->active) + continue; + + vblank = drm_crtc_vblank_crtc(&crtc->base); + + if (vblank->enabled) + return false; + + for_each_encoder_on_crtc(display->drm, &crtc->base, encoder) + if (encoder->type != INTEL_OUTPUT_EDP || + !CAN_PSR(enc_to_intel_dp(encoder))) + return false; + } + + return true; +} + static void hsw_activate_psr1(struct intel_dp *intel_dp) { struct intel_display *display = to_intel_display(intel_dp); @@ -1010,7 +1086,18 @@ static void hsw_activate_psr2(struct intel_dp *intel_dp) u32 val = EDP_PSR2_ENABLE; u32 psr_val = 0; - val |= EDP_PSR2_IDLE_FRAMES(psr_compute_idle_frames(intel_dp)); + /* + * Wa_22019444797 + * TODO: Disable idle frames when vblank gets enabled while + * PSR2 is enabled + */ + if (DISPLAY_VER(dev_priv) != 20 || + !intel_dp->psr.is_dpkgc_configured || + intel_dp->psr.is_dc5_entry_possible) + val |= EDP_PSR2_IDLE_FRAMES(psr_compute_idle_frames(intel_dp)); + else + drm_dbg_kms(display->drm, + "Wa 22019444797 requirement met PSR2 deep sleep disabled\n"); if (DISPLAY_VER(display) < 14 && !IS_ALDERLAKE_P(dev_priv)) val |= EDP_SU_TRACK_ENABLE; @@ -1692,6 +1779,20 @@ void intel_psr_compute_config(struct intel_dp *intel_dp, crtc_state->has_sel_update = intel_sel_update_config_valid(intel_dp, crtc_state); } +void intel_psr_compute_config_late(struct intel_crtc_state *crtc_state) +{ + struct intel_display *display = to_intel_display(crtc_state); + + if (DISPLAY_VER(display) == 20) { + crtc_state->is_dpkgc_configured = + intel_psr_is_dpkgc_configured(display, crtc_state); + crtc_state->is_dc5_entry_possible = + intel_psr_is_dc5_entry_possible(display, crtc_state); + crtc_state->is_wa_delayed_vblank_limit = + intel_psr_wa_delayed_vblank(&crtc_state->hw.adjusted_mode); + } +} + void intel_psr_get_config(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config) { @@ -2774,6 +2875,22 @@ int intel_psr2_sel_fetch_update(struct intel_atomic_state *state, return 0; } +static void +wa_22019444797_fill_psr_params(const struct intel_crtc_state *crtc_state, + struct intel_psr *psr) +{ + struct intel_display *display = to_intel_display(crtc_state); + + if (DISPLAY_VER(display) == 20) { + psr->is_dpkgc_configured = + crtc_state->is_dpkgc_configured; + psr->is_dc5_entry_possible = + crtc_state->is_dc5_entry_possible; + psr->is_wa_delayed_vblank_limit = + crtc_state->is_wa_delayed_vblank_limit; + } +} + void intel_psr_pre_plane_update(struct intel_atomic_state *state, struct intel_crtc *crtc) { @@ -2796,6 +2913,8 @@ void intel_psr_pre_plane_update(struct intel_atomic_state *state, mutex_lock(&psr->lock); + wa_22019444797_fill_psr_params(new_crtc_state, psr); + /* * Reasons to disable: * - PSR disabled in new state @@ -2803,6 +2922,7 @@ void intel_psr_pre_plane_update(struct intel_atomic_state *state, * - Changing between PSR versions * - Region Early Transport changing * - Display WA #1136: skl, bxt + * - Display WA_22019444797 */ needs_to_disable |= intel_crtc_needs_modeset(new_crtc_state); needs_to_disable |= !new_crtc_state->has_psr; @@ -2812,6 +2932,8 @@ void intel_psr_pre_plane_update(struct intel_atomic_state *state, psr->su_region_et_enabled; needs_to_disable |= DISPLAY_VER(i915) < 11 && new_crtc_state->wm_level_disabled; + /* TODO: Disable PSR1 when vblank gets enabled while PSR1 is enabled */ + needs_to_disable |= wa_22019444797_psr1(new_crtc_state, psr); if (psr->enabled && needs_to_disable) intel_psr_disable_locked(intel_dp); @@ -2852,6 +2974,12 @@ void intel_psr_post_plane_update(struct intel_atomic_state *state, keep_disabled |= DISPLAY_VER(display) < 11 && crtc_state->wm_level_disabled; + /* + * Wa_22019444797 + * TODO: Disable PSR1 when vblank gets enabled while PSR1 is enabled + */ + keep_disabled |= wa_22019444797_psr1(crtc_state, psr); + if (!psr->enabled && !keep_disabled) intel_psr_enable_locked(intel_dp, crtc_state); else if (psr->enabled && !crtc_state->wm_level_disabled) diff --git a/drivers/gpu/drm/i915/display/intel_psr.h b/drivers/gpu/drm/i915/display/intel_psr.h index 956be263c09e..0923a2f74901 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.h +++ b/drivers/gpu/drm/i915/display/intel_psr.h @@ -47,6 +47,7 @@ void intel_psr_init(struct intel_dp *intel_dp); void intel_psr_compute_config(struct intel_dp *intel_dp, struct intel_crtc_state *crtc_state, struct drm_connector_state *conn_state); +void intel_psr_compute_config_late(struct intel_crtc_state *crtc_state); void intel_psr_get_config(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config); void intel_psr_irq_handler(struct intel_dp *intel_dp, u32 psr_iir);