From patchwork Wed May 15 10:04:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Hogander, Jouni" X-Patchwork-Id: 13665048 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 67F19C25B7A for ; Wed, 15 May 2024 10:04:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E595110E46D; Wed, 15 May 2024 10:04:30 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="eSWbqv7x"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id AEEC210E1DD for ; Wed, 15 May 2024 10:04: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=1715767470; x=1747303470; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Rztfw0knPcnoAedzONNmTG7Cbsooa/Dmzbsa641+RPU=; b=eSWbqv7xEQH9b0phnZeF1Mc4r1G5nwGgDH6mlVMm1/3CK37DqaDELY51 pOjGZKGRs75drIa5prW01n9RraGTSmrMr4B/P0JFgNs/NjEiupnvGaqcq P2068wtAGvJtazSvxH5wyrQnB9fDAMH7zFwOsG1dIWtccji3lx2ceXB4i HUTxd8nbDrYfCD7w9+MOMqkuQGzTmJ0//Xe7ET2PmMiDXa2HA9BMSzXqf Ekh/jJyCUd4yuhZ4callQ/agY61tfUriSfl93denXEPcNsZIzmhwpWbxC kc0Vzg7xbU0egxDhCG1U4AhlYf9zlTor9Iw/HGfgLuZAmMOMJs6wnNhju A==; X-CSE-ConnectionGUID: gG/0cW6HTTOwOzmpMLWP0g== X-CSE-MsgGUID: ys2iZjjqR8aOZTLbxUIwyg== X-IronPort-AV: E=McAfee;i="6600,9927,11073"; a="11936989" X-IronPort-AV: E=Sophos;i="6.08,161,1712646000"; d="scan'208";a="11936989" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 May 2024 03:04:30 -0700 X-CSE-ConnectionGUID: id28CAnPTV+7Qj1mIFL0OQ== X-CSE-MsgGUID: M3TREznvRyCbn88on+wKPQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,161,1712646000"; d="scan'208";a="31584207" Received: from sghitax-mobl1.ger.corp.intel.com (HELO jhogande-mobl1.intel.com) ([10.251.210.177]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 May 2024 03:04:29 -0700 From: =?utf-8?q?Jouni_H=C3=B6gander?= To: intel-gfx@lists.freedesktop.org Cc: =?utf-8?q?Jouni_H=C3=B6gander?= Subject: [PATCH 1/8] drm/i915/psr: Do not use fast_wake_lines for aux less wake time Date: Wed, 15 May 2024 13:04:04 +0300 Message-Id: <20240515100411.691203-2-jouni.hogander@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240515100411.691203-1-jouni.hogander@intel.com> References: <20240515100411.691203-1-jouni.hogander@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo 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" We want to have own variables for fast wake lines and aux less wake time. It might be needed to choose if we can enable Panel Replay Selective Update or PSR2. Also currently aux less wake time is overwritten by calculated fast wake time. Fixes: da6a9836ac09 ("drm/i915/psr: Calculate aux less wake time") Signed-off-by: Jouni Högander --- drivers/gpu/drm/i915/display/intel_display_types.h | 1 + drivers/gpu/drm/i915/display/intel_psr.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h index 9678c2b157f6..95a806538cdc 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -1712,6 +1712,7 @@ struct intel_psr { /* LNL and beyond */ u8 check_entry_lines; + u8 aux_less_wake_lines; u8 silence_period_sym_clocks; u8 lfps_half_cycle_num_of_syms; } alpm_parameters; diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index 2514ac48312b..dcce2824556c 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -1345,7 +1345,7 @@ static int _lnl_compute_aux_less_alpm_params(struct intel_dp *intel_dp, if (i915->display.params.psr_safest_params) aux_less_wake_lines = ALPM_CTL_AUX_LESS_WAKE_TIME_MASK; - intel_dp->psr.alpm_parameters.fast_wake_lines = aux_less_wake_lines; + intel_dp->psr.alpm_parameters.aux_less_wake_lines = aux_less_wake_lines; intel_dp->psr.alpm_parameters.silence_period_sym_clocks = silence_period; intel_dp->psr.alpm_parameters.lfps_half_cycle_num_of_syms = lfps_half_cycle; From patchwork Wed May 15 10:04:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Hogander, Jouni" X-Patchwork-Id: 13665050 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 A6038C25B75 for ; Wed, 15 May 2024 10:04:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EBDE010E5CF; Wed, 15 May 2024 10:04:35 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="VtTz4+uN"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id 015EB10E5C4 for ; Wed, 15 May 2024 10:04:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1715767471; x=1747303471; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=A+0XGDdAQvvHRvLX6Cv+296bywcmaVG1THAdIzaND9k=; b=VtTz4+uNjLIp2or3nyiF2Sx/yNaVpmeLAnCq4fLIyOVJCXZW75HmSaig /N82w9vnseh/CD1oxZoF7yanxUEfEE1dqKXe5g5P5liYXMpl0KdS/3qvy QYZCyTTeST3YHErw654iOrd65sJ7dANsqsGXiOTTlxJmbUshhykBGhEY5 RQYT9YM14DwP1Is+01JxEUuOAOc7L1mZEJ5F7mG+/Y0u5WNT4eU/UQwjo u9HsgQOFu2GL1hispuIp+pJQ0kXHnWLYC1L0h/qkAy5aiAaCyLyRo+4Bt /A3Hlzd1PW4mLUH7vstU+xi8Y+OuDf8EmLSUXtjrpChIVQGKSr9N/VADt A==; X-CSE-ConnectionGUID: +jnTjVyET36YJHPnt8UAig== X-CSE-MsgGUID: xlm+UtoRQ3+xauuGCFz05w== X-IronPort-AV: E=McAfee;i="6600,9927,11073"; a="11936993" X-IronPort-AV: E=Sophos;i="6.08,161,1712646000"; d="scan'208";a="11936993" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 May 2024 03:04:31 -0700 X-CSE-ConnectionGUID: leIpNNdjT3eGWjymOQPgEg== X-CSE-MsgGUID: RoeRlq1tTfCFSxT82NcvAQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,161,1712646000"; d="scan'208";a="31584211" Received: from sghitax-mobl1.ger.corp.intel.com (HELO jhogande-mobl1.intel.com) ([10.251.210.177]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 May 2024 03:04:30 -0700 From: =?utf-8?q?Jouni_H=C3=B6gander?= To: intel-gfx@lists.freedesktop.org Cc: =?utf-8?q?Jouni_H=C3=B6gander?= Subject: [PATCH 2/8] drm/i915/psr: Add Early Transport status boolean into intel_psr Date: Wed, 15 May 2024 13:04:05 +0300 Message-Id: <20240515100411.691203-3-jouni.hogander@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240515100411.691203-1-jouni.hogander@intel.com> References: <20240515100411.691203-1-jouni.hogander@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo 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" Currently we are purely relying on psr2_su_region_et_valid. Add new boolean value into intel_psr struct indicating whether Early Transport is enabled or not and use it instead of psr2_su_region_et_valid for getting Early Transport status information. Signed-off-by: Jouni Högander --- drivers/gpu/drm/i915/display/intel_display_types.h | 1 + drivers/gpu/drm/i915/display/intel_psr.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h index 95a806538cdc..76f37ae76d2c 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -1703,6 +1703,7 @@ struct intel_psr { bool sel_update_enabled; bool psr2_sel_fetch_enabled; bool psr2_sel_fetch_cff_enabled; + bool su_region_et_enabled; bool req_psr2_sdp_prior_scanline; u8 sink_sync_latency; diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index dcce2824556c..79f81524119b 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -982,7 +982,7 @@ static void hsw_activate_psr2(struct intel_dp *intel_dp) PSR2_MAN_TRK_CTL(dev_priv, cpu_transcoder), 0); } - if (psr2_su_region_et_valid(intel_dp)) + if (intel_dp->psr.su_region_et_enabled) val |= LNL_EDP_PSR2_SU_REGION_ET_ENABLE; /* @@ -2053,6 +2053,7 @@ static void intel_psr_enable_locked(struct intel_dp *intel_dp, intel_dp->psr.dc3co_exit_delay = val; intel_dp->psr.dc3co_exitline = crtc_state->dc3co_exitline; intel_dp->psr.psr2_sel_fetch_enabled = crtc_state->enable_psr2_sel_fetch; + intel_dp->psr.su_region_et_enabled = crtc_state->enable_psr2_su_region_et; intel_dp->psr.psr2_sel_fetch_cff_enabled = false; intel_dp->psr.req_psr2_sdp_prior_scanline = crtc_state->req_psr2_sdp_prior_scanline; @@ -2209,6 +2210,7 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp) intel_dp->psr.panel_replay_enabled = false; intel_dp->psr.sel_update_enabled = false; intel_dp->psr.psr2_sel_fetch_enabled = false; + intel_dp->psr.su_region_et_enabled = false; intel_dp->psr.psr2_sel_fetch_cff_enabled = false; } From patchwork Wed May 15 10:04:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Hogander, Jouni" X-Patchwork-Id: 13665049 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 302FCC25B75 for ; Wed, 15 May 2024 10:04:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 881EA10E5C4; Wed, 15 May 2024 10:04:33 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="ktDy9hCQ"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id 477AF10E5C4 for ; Wed, 15 May 2024 10:04:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1715767473; x=1747303473; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=teT9co7uEocafe8v+AY/ehYlKi1SBkHiTLT32mBAg5c=; b=ktDy9hCQYLB8yNIUQSlaeAWkudyLP2fOR7SIPm1/yr9aOCRXV0wTh8VS yy60eddQ7p0awqVbzYHEi/IDa7JZwjZxFKbu971c9R+zwf86iHgtEr58v DkLAe+5rz1S5lKVJtMc8BxzoCl/NuDh2OBa3/YVWZTAXVsG0PazWjsC0W xcTY+f9u9+nkU4biYfMNLl7Iy+p9DFnyrHIynnWjI2PUO0bBDgeTDVypv u1yl1HJ8aW/3VB70aJqv6rkT9eXCvvT3yG9vW4fA293MuQhOXdK1US1fo x7phKcQuXWUQJH4fZ9PwzmcE2GK9MzjDNv+DFCJSn0z4E2C3bD9CVZDd7 g==; X-CSE-ConnectionGUID: uYsRNE4/RtKSOQ+6/U+78g== X-CSE-MsgGUID: gLe/a89LSBW8a5sOxVc3uQ== X-IronPort-AV: E=McAfee;i="6600,9927,11073"; a="11936999" X-IronPort-AV: E=Sophos;i="6.08,161,1712646000"; d="scan'208";a="11936999" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 May 2024 03:04:33 -0700 X-CSE-ConnectionGUID: LsjUeJYiTgyhgKH6XFmbrw== X-CSE-MsgGUID: ZO1TRH/VR/CStXOamcssxg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,161,1712646000"; d="scan'208";a="31584220" Received: from sghitax-mobl1.ger.corp.intel.com (HELO jhogande-mobl1.intel.com) ([10.251.210.177]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 May 2024 03:04:32 -0700 From: =?utf-8?q?Jouni_H=C3=B6gander?= To: intel-gfx@lists.freedesktop.org Cc: =?utf-8?q?Jouni_H=C3=B6gander?= Subject: [PATCH 3/8] drm/i915/psr: Get Early Transport status in intel_psr_pipe_get_config Date: Wed, 15 May 2024 13:04:06 +0300 Message-Id: <20240515100411.691203-4-jouni.hogander@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240515100411.691203-1-jouni.hogander@intel.com> References: <20240515100411.691203-1-jouni.hogander@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo 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" We are currently not getting Early Transport status information in intel_psr_pipe_get_config. Fix this. Fixes: 467e4e061c44 ("drm/i915/psr: Enable psr2 early transport as possible") Signed-off-by: Jouni Högander --- drivers/gpu/drm/i915/display/intel_psr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index 79f81524119b..71fa3dfd5b71 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -1760,6 +1760,8 @@ void intel_psr_get_config(struct intel_encoder *encoder, pipe_config->enable_psr2_sel_fetch = true; } + pipe_config->enable_psr2_su_region_et = intel_dp->psr.su_region_et_enabled; + if (DISPLAY_VER(dev_priv) >= 12) { val = intel_de_read(dev_priv, TRANS_EXITLINE(dev_priv, cpu_transcoder)); From patchwork Wed May 15 10:04:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Hogander, Jouni" X-Patchwork-Id: 13665051 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 2E89CC25B78 for ; Wed, 15 May 2024 10:04:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9795410E655; Wed, 15 May 2024 10:04:37 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="J6EZwH3E"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8FBD410E5CF for ; Wed, 15 May 2024 10:04:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1715767474; x=1747303474; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kj2kemTPoORLMeWUaQJBl8LgbHumbYtt8QKGgW1xK5Q=; b=J6EZwH3EzhS785NSz4aofg7+gr/dduPVJ89aIQu11l/pMKiQtPhVaHDr C3ReqoitUgLZLCHkkJvhT6+TOkr8JadvO8NKDM1io1QpilSkOXfrXsOo9 nztr+UM3dddR2zuv+FGoRrghy9OXiEmOkdMnSP2ocuhndVoVEOk1xx224 2m4GT58EvQJwIN6NhpLsxDEad6FpKRbZZuCwBOaUIhkckrrHY2GFe+oCh dadv/GA5yv1Nfx7G6TNuvC1YUg5vpUzjsHngmm08BK14SjeJgFEqnSbMi rla6/MEbMhBp//PMEAfUDg+jYATQbhZqdCxh4KJbDYX5MWr45Sz0uAoe8 g==; X-CSE-ConnectionGUID: QUN7uxCWRNaGMjpfrbUz8Q== X-CSE-MsgGUID: Hoi0IdHpRoWdY8+O1116hQ== X-IronPort-AV: E=McAfee;i="6600,9927,11073"; a="11937003" X-IronPort-AV: E=Sophos;i="6.08,161,1712646000"; d="scan'208";a="11937003" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 May 2024 03:04:34 -0700 X-CSE-ConnectionGUID: A93LVR2bQLChWbThIRu2Ww== X-CSE-MsgGUID: xzwakOTLQnuFomavuovFWA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,161,1712646000"; d="scan'208";a="31584229" Received: from sghitax-mobl1.ger.corp.intel.com (HELO jhogande-mobl1.intel.com) ([10.251.210.177]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 May 2024 03:04:33 -0700 From: =?utf-8?q?Jouni_H=C3=B6gander?= To: intel-gfx@lists.freedesktop.org Cc: =?utf-8?q?Jouni_H=C3=B6gander?= Subject: [PATCH 4/8] drm/i915/psr: Use enable boolean from intel_crtc_state for Early Transport Date: Wed, 15 May 2024 13:04:07 +0300 Message-Id: <20240515100411.691203-5-jouni.hogander@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240515100411.691203-1-jouni.hogander@intel.com> References: <20240515100411.691203-1-jouni.hogander@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo 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" When enabling Early Transport use intel_crtc_state->enable_psr2_su_region_et instead of psr2_su_region_et_valid. Fixes: 467e4e061c44 ("drm/i915/psr: Enable psr2 early transport as possible") Signed-off-by: Jouni Högander --- drivers/gpu/drm/i915/display/intel_psr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index 71fa3dfd5b71..4db887edc8db 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -715,7 +715,7 @@ void intel_psr_enable_sink(struct intel_dp *intel_dp, DP_ALPM_ENABLE | DP_ALPM_LOCK_ERROR_IRQ_HPD_ENABLE); - if (psr2_su_region_et_valid(intel_dp)) + if (crtc_state->enable_psr2_su_region_et) dpcd_val |= DP_PSR_ENABLE_SU_REGION_ET; } From patchwork Wed May 15 10:04:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Hogander, Jouni" X-Patchwork-Id: 13665053 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 AADC4C25B75 for ; Wed, 15 May 2024 10:04:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 15CEF10E674; Wed, 15 May 2024 10:04:41 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="lU1IJJ2o"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2305310E5CF for ; Wed, 15 May 2024 10:04:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1715767476; x=1747303476; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OayvqQA/R0yEmIsT97telra7CQp0y6UrhrdltjALOq4=; b=lU1IJJ2o1i+E9C6htJJgccyKajjQMW8KgFHYWH731N1EI5psHRHyKMxx hjBOKMnm8SG9coXecPKbg/w7Ge+vl9N9TM7nm4hlYaTmnLnlhpV+PO++Z tmLVZiRHXNMuyC3sDXziqjYgbolGrPQn6wTjTcP4EqrsNTXtWY6eStKC3 vBoelfxnEDPxAulyn5+OaKF1eAA+Ri7dkCu5LjuCI/MB7vCbGEN6g2K9I UIR5ZH4rzCFG/VGUDq/n7Fj8OxwnoRU8SP67hUzoknhfCyQYvNXiWASmL 9U/MTYiRkDCuaznBcAq0pZhIJrmdHbr1LXDGudExTXMdPV1OwqMAbVXfG w==; X-CSE-ConnectionGUID: RRWmDy97S7mEAPqxRFPdOA== X-CSE-MsgGUID: okvIyF1sR96RsjinYYpEEA== X-IronPort-AV: E=McAfee;i="6600,9927,11073"; a="11937011" X-IronPort-AV: E=Sophos;i="6.08,161,1712646000"; d="scan'208";a="11937011" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 May 2024 03:04:35 -0700 X-CSE-ConnectionGUID: MkyQiyt5RuqsyDu+BvBojQ== X-CSE-MsgGUID: G+EKo3MVSPW+fvzMe6uwqw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,161,1712646000"; d="scan'208";a="31584241" Received: from sghitax-mobl1.ger.corp.intel.com (HELO jhogande-mobl1.intel.com) ([10.251.210.177]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 May 2024 03:04:34 -0700 From: =?utf-8?q?Jouni_H=C3=B6gander?= To: intel-gfx@lists.freedesktop.org Cc: =?utf-8?q?Jouni_H=C3=B6gander?= Subject: [PATCH 5/8] drm/i915/psr: Allow setting I915_PSR_DEBUG_SU_REGION_ET_DISABLE via debugfs Date: Wed, 15 May 2024 13:04:08 +0300 Message-Id: <20240515100411.691203-6-jouni.hogander@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240515100411.691203-1-jouni.hogander@intel.com> References: <20240515100411.691203-1-jouni.hogander@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo 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" Currently setting I915_PSR_DEBUG_SU_REGION_ET_DISABLE (0x20) via psr_debug debugfs interface is not allowed. This patch allows it. Signed-off-by: Jouni Högander --- drivers/gpu/drm/i915/display/intel_psr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index 4db887edc8db..e8bed1d60fa7 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -3020,7 +3020,8 @@ int intel_psr_debug_set(struct intel_dp *intel_dp, u64 val) u32 old_mode; int ret; - if (val & ~(I915_PSR_DEBUG_IRQ | I915_PSR_DEBUG_MODE_MASK) || + if (val & ~(I915_PSR_DEBUG_IRQ | I915_PSR_DEBUG_SU_REGION_ET_DISABLE | + I915_PSR_DEBUG_MODE_MASK) || mode > I915_PSR_DEBUG_ENABLE_SEL_FETCH) { drm_dbg_kms(&dev_priv->drm, "Invalid debug mask %llx\n", val); return -EINVAL; From patchwork Wed May 15 10:04:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Hogander, Jouni" X-Patchwork-Id: 13665052 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 EBBF5C25B75 for ; Wed, 15 May 2024 10:04:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0F6AD10E669; Wed, 15 May 2024 10:04:38 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="VJFFyL2n"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6FBA410E655 for ; Wed, 15 May 2024 10:04:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1715767477; x=1747303477; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jRpSVJqJ6RIs+1nPi0GtWMti1rE4FsirR6dI0g467S8=; b=VJFFyL2nz7WfRVSEqpAnrQhNlkwq4GWQ78uPjMKgq1MxDsi8W4DGHV8c aXLCOdbcVWZRt/JtwPgNAY3/Pzts3mJBYrwQ33hoHU0KJ/f1LiiIBgEPk nG/XNe5dHJO6l1lCYygahr8QO1Q3aWGfzi634RifNQgKrCjugPSgmpINq VdOjv3s5mAOl0E0MguSOKPlmivNbQeRiJwtmqzq4Cb9xyW8mXZBSk5oEe Gt2FzdVmhCHtHPxPSMl35oGJ8EV4dI911afK2KP/iiRv1K2UmXRg+4/FA 3U60v4fqW4xLOUHzaQVCPwAPy9EuqReDWla+x0Gxl7y8kcSpt/He+hZ7D g==; X-CSE-ConnectionGUID: Fy1ONBYNTuKOaUQfxMtozg== X-CSE-MsgGUID: W786gqKtThOFdLY1AVsf1A== X-IronPort-AV: E=McAfee;i="6600,9927,11073"; a="11937017" X-IronPort-AV: E=Sophos;i="6.08,161,1712646000"; d="scan'208";a="11937017" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 May 2024 03:04:37 -0700 X-CSE-ConnectionGUID: +/D7BTXHSqOVDQXfc2hHww== X-CSE-MsgGUID: 3k2yHvYQQBqcY9aQtArNwA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,161,1712646000"; d="scan'208";a="31584250" Received: from sghitax-mobl1.ger.corp.intel.com (HELO jhogande-mobl1.intel.com) ([10.251.210.177]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 May 2024 03:04:36 -0700 From: =?utf-8?q?Jouni_H=C3=B6gander?= To: intel-gfx@lists.freedesktop.org Cc: =?utf-8?q?Jouni_H=C3=B6gander?= Subject: [PATCH 6/8] drm/i915/display: Take panel replay into account in vsc sdp unpacking Date: Wed, 15 May 2024 13:04:09 +0300 Message-Id: <20240515100411.691203-7-jouni.hogander@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240515100411.691203-1-jouni.hogander@intel.com> References: <20240515100411.691203-1-jouni.hogander@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo 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" Currently intel_dp_vsc_sdp_unpack is not taking into account Panel Replay vsc sdp. Fix this by adding vsc sdp revision 0x6 and length 0x10 into intel_dp_vsc_sdp_unpack Signed-off-by: Jouni Högander --- drivers/gpu/drm/i915/display/intel_dp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index c0a3b6d50681..67d43639b3ab 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -4435,7 +4435,8 @@ static int intel_dp_vsc_sdp_unpack(struct drm_dp_vsc_sdp *vsc, vsc->length = sdp->sdp_header.HB3; if ((sdp->sdp_header.HB2 == 0x2 && sdp->sdp_header.HB3 == 0x8) || - (sdp->sdp_header.HB2 == 0x4 && sdp->sdp_header.HB3 == 0xe)) { + (sdp->sdp_header.HB2 == 0x4 && sdp->sdp_header.HB3 == 0xe) || + (sdp->sdp_header.HB2 == 0x6 && sdp->sdp_header.HB3 == 0x10)) { /* * - HB2 = 0x2, HB3 = 0x8 * VSC SDP supporting 3D stereo + PSR @@ -4443,6 +4444,8 @@ static int intel_dp_vsc_sdp_unpack(struct drm_dp_vsc_sdp *vsc, * VSC SDP supporting 3D stereo + PSR2 with Y-coordinate of * first scan line of the SU region (applies to eDP v1.4b * and higher). + * - HB2 = 0x6, HB3 = 0x10 + * VSC SDP supporting 3D stereo + Panel Replay. */ return 0; } else if (sdp->sdp_header.HB2 == 0x5 && sdp->sdp_header.HB3 == 0x13) { From patchwork Wed May 15 10:04:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Hogander, Jouni" X-Patchwork-Id: 13665054 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 04660C25B75 for ; Wed, 15 May 2024 10:04:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 823A410E672; Wed, 15 May 2024 10:04:43 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Bs1kEIR8"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id C1FA010E648 for ; Wed, 15 May 2024 10:04:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1715767478; x=1747303478; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Xt4m+OEP29fttCyoHbwSPPQJIHd9v/lfKbUi8uL7Yfk=; b=Bs1kEIR8ovf5uW/6uRJxZZGBHqOF+4Gywik8g1S2StAUdkWd+9jlYrtx C2uMMpm2xu4m35EZV1vU11UfB4GGd0VekPcu5aoow1Ap92bUuusz/5yNw +MS2HfmA4nVvxd4kcbXQgZpAFrYzpW7gl6O37yMMJyS8RA59RO3lVh5CW uDHW84Wfq4y05w+Pz1g4FytLjja/ZGOZyJvz0Wc0O36CEB6dxqnKFTP2+ dxsdX0IP3IW6mOGBdc3ke2eyFw/OgUep8QS9jcLEeaJw7Z0Tz+qp6MX8L WPNkt5owGNFa4AApJO2pR0U+qAXT56apRuhReH7POLQ9aWQjBT/iV5l0j A==; X-CSE-ConnectionGUID: q8ariW05QYC/9ig5+l3gMQ== X-CSE-MsgGUID: uUy8SRC2Snqt5EDSgUskXA== X-IronPort-AV: E=McAfee;i="6600,9927,11073"; a="11937023" X-IronPort-AV: E=Sophos;i="6.08,161,1712646000"; d="scan'208";a="11937023" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 May 2024 03:04:38 -0700 X-CSE-ConnectionGUID: XWRSvUFaT5ysZZLznkISKQ== X-CSE-MsgGUID: SV0aMBw+SvezzB8a4LrEsg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,161,1712646000"; d="scan'208";a="31584256" Received: from sghitax-mobl1.ger.corp.intel.com (HELO jhogande-mobl1.intel.com) ([10.251.210.177]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 May 2024 03:04:37 -0700 From: =?utf-8?q?Jouni_H=C3=B6gander?= To: intel-gfx@lists.freedesktop.org Cc: =?utf-8?q?Jouni_H=C3=B6gander?= Subject: [PATCH 7/8] drm/i915/display: Skip Panel Replay on pipe comparison if no active planes Date: Wed, 15 May 2024 13:04:10 +0300 Message-Id: <20240515100411.691203-8-jouni.hogander@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240515100411.691203-1-jouni.hogander@intel.com> References: <20240515100411.691203-1-jouni.hogander@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo 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" Panel Replay is not enabled if there are no active planes. Do not compare it on pipe comparison. Otherwise we get pipe mismatch. Fixes: ac9ef327327b ("drm/i915/psr: Panel replay has to be enabled before link training") Signed-off-by: Jouni Högander --- drivers/gpu/drm/i915/display/intel_display.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 4035b3ec311d..bb8a0922a7f3 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -5318,7 +5318,9 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config, * Panel replay has to be enabled before link training. PSR doesn't have * this requirement -> check these only if using panel replay */ - if (current_config->has_panel_replay || pipe_config->has_panel_replay) { + if (current_config->active_planes && + (current_config->has_panel_replay || + pipe_config->has_panel_replay)) { PIPE_CONF_CHECK_BOOL(has_psr); PIPE_CONF_CHECK_BOOL(has_sel_update); PIPE_CONF_CHECK_BOOL(enable_psr2_sel_fetch); From patchwork Wed May 15 10:04:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Hogander, Jouni" X-Patchwork-Id: 13665055 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 A3E82C25B75 for ; Wed, 15 May 2024 10:04:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1F72B10E6AA; Wed, 15 May 2024 10:04:46 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="WLLeQ89x"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0966F10E648 for ; Wed, 15 May 2024 10:04:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1715767479; x=1747303479; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=S1S0t6XScAiYr8FJi7Am7NsynYJ8UAj3k08QiFANuHo=; b=WLLeQ89xphCx/3sP3VppdCxQy0R6x7j0m79nrfaBKoEeglFgqtWSGADf PyAuGpcNKpmj+KfxOakvGkCsc8el9670XmDQqYvYfXxTe2oqFKQk+bydv 8+l5mE4gOyDipgBkSVYFisE1JOwxsrbOr5U7dQ3ybLAPMILjpJC8BiQtJ W6lqZLbE5iwn8mwUScMmSeKCblWwXyJIjrj33bw9Kua/tyg0kFcZpjyAp c4Myx/sHf1Rkr6tbZsMNuq0FgL6zz61dPXfyKoDcuhN3IPbYFuLN2Xk4y 0eXIS+sy7cPWSxnlD1I7oe16g860wp4z3Q1aXGWkCGgX//q45O2aGvFN4 w==; X-CSE-ConnectionGUID: /kdCLapOTJ+F2jxvyG382g== X-CSE-MsgGUID: Szxh9iF4SCm+TFoMkZ46Ww== X-IronPort-AV: E=McAfee;i="6600,9927,11073"; a="11937030" X-IronPort-AV: E=Sophos;i="6.08,161,1712646000"; d="scan'208";a="11937030" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 May 2024 03:04:39 -0700 X-CSE-ConnectionGUID: 4u1j93lxR8WM3wc6snd93Q== X-CSE-MsgGUID: kBVwD1IBSAmz2OJ/YZPurQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,161,1712646000"; d="scan'208";a="31584264" Received: from sghitax-mobl1.ger.corp.intel.com (HELO jhogande-mobl1.intel.com) ([10.251.210.177]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 May 2024 03:04:38 -0700 From: =?utf-8?q?Jouni_H=C3=B6gander?= To: intel-gfx@lists.freedesktop.org Cc: =?utf-8?q?Jouni_H=C3=B6gander?= Subject: [PATCH 8/8] drm/i915/psr: Write also AUX Less Wake lines into ALPM_CTL Date: Wed, 15 May 2024 13:04:11 +0300 Message-Id: <20240515100411.691203-9-jouni.hogander@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240515100411.691203-1-jouni.hogander@intel.com> References: <20240515100411.691203-1-jouni.hogander@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo 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" Currently AUX Less Wake lines are not written into ALPM_CTL. Fix this. Fixes: 1ccbf135862b ("drm/i915/psr: Enable ALPM on source side for eDP Panel replay") Signed-off-by: Jouni Högander --- drivers/gpu/drm/i915/display/intel_psr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index e8bed1d60fa7..2e1c3ba68544 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -1860,7 +1860,8 @@ static void lnl_alpm_configure(struct intel_dp *intel_dp) if (intel_dp->psr.panel_replay_enabled && intel_dp_is_edp(intel_dp)) { alpm_ctl = ALPM_CTL_ALPM_ENABLE | ALPM_CTL_ALPM_AUX_LESS_ENABLE | - ALPM_CTL_AUX_LESS_SLEEP_HOLD_TIME_50_SYMBOLS; + ALPM_CTL_AUX_LESS_SLEEP_HOLD_TIME_50_SYMBOLS | + ALPM_CTL_AUX_LESS_WAKE_TIME(psr->alpm_parameters.aux_less_wake_lines); intel_de_write(dev_priv, PORT_ALPM_CTL(dev_priv, cpu_transcoder),