From patchwork Fri Mar 17 11:04:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Hogander, Jouni" X-Patchwork-Id: 13178893 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 28DB6C6FD1D for ; Fri, 17 Mar 2023 11:05:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EB74E10EED4; Fri, 17 Mar 2023 11:05:21 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 66F4A10EEE2 for ; Fri, 17 Mar 2023 11:05:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679051120; x=1710587120; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LzibEu+AcAuo4m/Y4qo7KPiYQOMup0QpDgYmAoU45a4=; b=UlaTmRBE/zqAWBDJOAXs/5NjssigWF6QHFaxBEIANR9R3n/G+353BR1y 9PaoBK51PmnSQJVgmRIlPzMQzoW5OP9mEXRBjeeIuaDX6IH0CtkZAW7zs EYgoOYovqcoavtQUOBx8ETknj84os62Xhg3A+fD6pR012hcp9A8d3/WvC Pa12Cb7SzwUbcx7InWpnor7ZF1MGJsAxRsHPFfXmM1+ywRNI78acGNiRh 2spFIGxrD/vbbY8Sjb0Oy6ZMT5CIabdkQR6NLkmFVhyN+0zeIO30y5osP 7MXhTG5qEE51H3vmKlQkaBxB9IlroUKKm5sfYXB39cEP+UMr0t0DOJBFU g==; X-IronPort-AV: E=McAfee;i="6600,9927,10651"; a="318634673" X-IronPort-AV: E=Sophos;i="5.98,268,1673942400"; d="scan'208";a="318634673" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2023 04:05:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10651"; a="744516977" X-IronPort-AV: E=Sophos;i="5.98,268,1673942400"; d="scan'208";a="744516977" Received: from nkiryuhi-mobl1.ccr.corp.intel.com (HELO jhogande-mobl1.ger.corp.intel.com) ([10.252.63.188]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2023 04:05:17 -0700 From: =?utf-8?q?Jouni_H=C3=B6gander?= To: intel-gfx@lists.freedesktop.org Date: Fri, 17 Mar 2023 13:04:35 +0200 Message-Id: <20230317110437.2780483-2-jouni.hogander@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230317110437.2780483-1-jouni.hogander@intel.com> References: <20230317110437.2780483-1-jouni.hogander@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH v2 1/3] drm/i915/psr: Fix Wa_16013835468 and Wa_14015648006 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" PSR WM optimization should be disabled based on any wm level being disabled. Currently it's disabled always when using delayed vblank. Bspec: 71580 Signed-off-by: Jouni Högander --- drivers/gpu/drm/i915/display/intel_display_types.h | 1 + drivers/gpu/drm/i915/display/intel_psr.c | 12 +++++------- drivers/gpu/drm/i915/display/skl_watermark.c | 7 +++++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h index c32bfba06ca1..60504c390408 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -1152,6 +1152,7 @@ struct intel_crtc_state { bool has_psr2; bool enable_psr2_sel_fetch; bool req_psr2_sdp_prior_scanline; + bool wm_level_disabled; u32 dc3co_exitline; u16 su_y_granularity; struct drm_dp_vsc_sdp psr_vsc; diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index 44610b20cd29..a6edd65b8edb 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -1177,13 +1177,11 @@ static void intel_psr_enable_source(struct intel_dp *intel_dp, * Wa_16013835468 * Wa_14015648006 */ - if (IS_MTL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0) || - IS_DISPLAY_VER(dev_priv, 12, 13)) { - if (crtc_state->hw.adjusted_mode.crtc_vblank_start != - crtc_state->hw.adjusted_mode.crtc_vdisplay) - intel_de_rmw(dev_priv, GEN8_CHICKEN_DCPR_1, 0, - wa_16013835468_bit_get(intel_dp)); - } + if ((IS_MTL_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0) || + IS_DISPLAY_VER(dev_priv, 12, 13)) && + crtc_state->wm_level_disabled) + intel_de_rmw(dev_priv, GEN8_CHICKEN_DCPR_1, 0, + wa_16013835468_bit_get(intel_dp)); if (intel_dp->psr.psr2_enabled) { if (DISPLAY_VER(dev_priv) == 9) diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c index 50a9a6adbe32..afb751c024ba 100644 --- a/drivers/gpu/drm/i915/display/skl_watermark.c +++ b/drivers/gpu/drm/i915/display/skl_watermark.c @@ -2273,9 +2273,12 @@ static int skl_wm_check_vblank(struct intel_crtc_state *crtc_state) return level; /* - * FIXME PSR needs to toggle LATENCY_REPORTING_REMOVED_PIPE_* + * PSR needs to toggle LATENCY_REPORTING_REMOVED_PIPE_* * based on whether we're limited by the vblank duration. - * + */ + crtc_state->wm_level_disabled = level < i915->display.wm.num_levels - 1; + + /* * FIXME also related to skl+ w/a 1136 (also unimplemented as of * now) perhaps? */ From patchwork Fri Mar 17 11:04:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Hogander, Jouni" X-Patchwork-Id: 13178894 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 3EFBAC74A5B for ; Fri, 17 Mar 2023 11:05:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AFAB110EEE8; Fri, 17 Mar 2023 11:05:26 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 58F6B10EEE6 for ; Fri, 17 Mar 2023 11:05:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679051123; x=1710587123; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+aCaAN4kvTTfyXrfWLfnYICFJbMX8jrfWoZRYhOV/qg=; b=DburD9stQHl1WaSdfDShACNksOV2wxvuCg6ktNT9nSewn0QhegwRmAJJ ve7TkghUrop9vyEyB7whPxgO/Jm/bfbmXFtHT7dnRi40RNy/JeemTJABK 4PvCUj5xhLywzfQgWm28N1H5jvO1LGD3X/OEUlp1ZOYRKYajTBvxxX22R sxG9Go5HczWAbSp+/ZT3BH9MX7/ANcmsWy3R0CxuxkC5wWYT/tyshyg9H D1fqgdB+OVaXr5Q8ASbZ5zyJ6S2meX7tvhGsVU3csnpAdtQixjsI26jVb 5OpIRGiLsm84JVPg1Lq4AqpqrELYM6+hnBDVXnJ1aBZayi1AoItvFr5H1 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10651"; a="318634684" X-IronPort-AV: E=Sophos;i="5.98,268,1673942400"; d="scan'208";a="318634684" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2023 04:05:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10651"; a="744517027" X-IronPort-AV: E=Sophos;i="5.98,268,1673942400"; d="scan'208";a="744517027" Received: from nkiryuhi-mobl1.ccr.corp.intel.com (HELO jhogande-mobl1.ger.corp.intel.com) ([10.252.63.188]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2023 04:05:19 -0700 From: =?utf-8?q?Jouni_H=C3=B6gander?= To: intel-gfx@lists.freedesktop.org Date: Fri, 17 Mar 2023 13:04:36 +0200 Message-Id: <20230317110437.2780483-3-jouni.hogander@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230317110437.2780483-1-jouni.hogander@intel.com> References: <20230317110437.2780483-1-jouni.hogander@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH v2 2/3] drm/i915/psr: Check that vblank is long enough for psr2 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" Ensure vblank >= psr2 vblank where Psr2 vblank = PSR2_CTL Block Count Number maximum line count. Bspec: 71580, 49274 Signed-off-by: Jouni Högander --- drivers/gpu/drm/i915/display/intel_psr.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index a6edd65b8edb..a385cb8dbf13 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -958,6 +958,14 @@ static bool intel_psr2_config_valid(struct intel_dp *intel_dp, return false; } + /* Vblank >= PSR2_CTL Block Count Number maximum line count */ + if (crtc_state->hw.adjusted_mode.crtc_vblank_end - + crtc_state->hw.adjusted_mode.crtc_vblank_start < 12) { + drm_dbg_kms(&dev_priv->drm, + "PSR2 not enabled, too short vblank time\n"); + return false; + } + if (HAS_PSR2_SEL_FETCH(dev_priv)) { if (!intel_psr2_sel_fetch_config_valid(intel_dp, crtc_state) && !HAS_PSR_HW_TRACKING(dev_priv)) { From patchwork Fri Mar 17 11:04:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Hogander, Jouni" X-Patchwork-Id: 13178895 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 6AD17C74A5B for ; Fri, 17 Mar 2023 11:05:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D8CC710EEE0; Fri, 17 Mar 2023 11:05:29 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id CBF8A10EEE0 for ; Fri, 17 Mar 2023 11:05:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679051127; x=1710587127; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ojGuA4tsoYiQDvC2XIioHtsW8c0OzqI6hb68CiKbIuE=; b=cdbSOzNoKodd8Gcs0lYut1ZeSpCMc8OAzftxH3AEfNR2qG3M7hRYB5Vu Mn27HupYRKr7WOOoBGYlTillFHXbGxTOM/ayaO48F/mwSbted6E34hVUc Z9J+iWHm2sXImJ1Jn5VNsFR0ZUEAUw018ByVMl+/RdXAq7t40D4EN+NpJ 78XhOZiAQ0BOXR6fkyznXvJA2P1lXlE90lmz5b59IyF/KQHrzZSSq1BX1 VI57glAzWZL6Hp873ok0pqGB1Iqbt5HiQT9ICeMvQV7h4ZEIFE9RVHVkb TWkUGsQTLAWRVPAGOsngyXabBa5NXFxOBy/9mpX+aPL/3HGQHJ0ds9e/+ g==; X-IronPort-AV: E=McAfee;i="6600,9927,10651"; a="318634699" X-IronPort-AV: E=Sophos;i="5.98,268,1673942400"; d="scan'208";a="318634699" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2023 04:05:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10651"; a="744517063" X-IronPort-AV: E=Sophos;i="5.98,268,1673942400"; d="scan'208";a="744517063" Received: from nkiryuhi-mobl1.ccr.corp.intel.com (HELO jhogande-mobl1.ger.corp.intel.com) ([10.252.63.188]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2023 04:05:26 -0700 From: =?utf-8?q?Jouni_H=C3=B6gander?= To: intel-gfx@lists.freedesktop.org Date: Fri, 17 Mar 2023 13:04:37 +0200 Message-Id: <20230317110437.2780483-4-jouni.hogander@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230317110437.2780483-1-jouni.hogander@intel.com> References: <20230317110437.2780483-1-jouni.hogander@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH v2 3/3] drm/i915/psr: Implement Wa_1136 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" Implement Wa_1136 for SKL/BXT/ICL. Bspec: 21664 Signed-off-by: Jouni Högander --- drivers/gpu/drm/i915/display/intel_psr.c | 15 +++++++++++++++ drivers/gpu/drm/i915/display/skl_watermark.c | 5 ----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index a385cb8dbf13..e6bd46441392 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -1049,6 +1049,13 @@ void intel_psr_compute_config(struct intel_dp *intel_dp, return; } + /* Wa_1136 */ + if (DISPLAY_VER(dev_priv) < 12 && crtc_state->wm_level_disabled) { + drm_dbg_kms(&dev_priv->drm, + "PSR condition failed: WM level disabled and no HW WA available\n"); + return; + } + crtc_state->has_psr = true; crtc_state->has_psr2 = intel_psr2_config_valid(intel_dp, crtc_state); @@ -1260,6 +1267,10 @@ static void intel_psr_enable_locked(struct intel_dp *intel_dp, drm_WARN_ON(&dev_priv->drm, intel_dp->psr.enabled); + /* Wa_1136 */ + if (DISPLAY_VER(dev_priv) < 12 && crtc_state->wm_level_disabled) + return; + intel_dp->psr.psr2_enabled = crtc_state->has_psr2; intel_dp->psr.busy_frontbuffer_bits = 0; intel_dp->psr.pipe = to_intel_crtc(crtc_state->uapi.crtc)->pipe; @@ -1940,6 +1951,10 @@ void intel_psr_pre_plane_update(struct intel_atomic_state *state, needs_to_disable |= !new_crtc_state->active_planes; needs_to_disable |= new_crtc_state->has_psr2 != psr->psr2_enabled; + /* Wa_1136 */ + needs_to_disable |= DISPLAY_VER(i915) < 12 && + new_crtc_state->wm_level_disabled; + if (psr->enabled && needs_to_disable) intel_psr_disable_locked(intel_dp); diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c index afb751c024ba..ced61da8b496 100644 --- a/drivers/gpu/drm/i915/display/skl_watermark.c +++ b/drivers/gpu/drm/i915/display/skl_watermark.c @@ -2278,11 +2278,6 @@ static int skl_wm_check_vblank(struct intel_crtc_state *crtc_state) */ crtc_state->wm_level_disabled = level < i915->display.wm.num_levels - 1; - /* - * FIXME also related to skl+ w/a 1136 (also unimplemented as of - * now) perhaps? - */ - for (level++; level < i915->display.wm.num_levels; level++) { enum plane_id plane_id;