From patchwork Fri Apr 19 12:11:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Hogander, Jouni" X-Patchwork-Id: 13636330 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 AE4D2C4345F for ; Fri, 19 Apr 2024 12:12:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2B29910FE9E; Fri, 19 Apr 2024 12:12:10 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="YJ2ZY0T2"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id B542C10FE7D for ; Fri, 19 Apr 2024 12:12:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713528727; x=1745064727; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Q80L49HuZKt8oIRud33K9U3ZtIN3iqwe9gb4GLAE/Ho=; b=YJ2ZY0T27lPcaWftp6ZPBMdaMgSB8NaTXY4N/G5d+Hz6AfCgOuGZX9CD uLgi4vQCznU/ZeoeJA0ERBmAzpnQwrjpbvoDmIFl7rtsCw20z27PNAwLv ppNlBinzaLth09EblyePhGXz6ogHuhwUwUeSV0w1qclebQZtqs6mJp/4z 3ecWGDyqv2Hxppb7pndOqsp1UnRWUI9o0FwG5Elo9RRmn+qYLjvWuzM7t aJkVQj7QWF2Xm6uEy8RR+Gd5L7oSpDYBBKPzIipptcKTmSbcbfBsUXC2G krtQzc0mHI7s6qzASsph40pNy2TOXgzkN68bkAayVBfdlZjfaeIQ+rWME g==; X-CSE-ConnectionGUID: FS8z58u+QsSfAayMJuntRQ== X-CSE-MsgGUID: KBw78KhgQpWrciHbaGFlfA== X-IronPort-AV: E=McAfee;i="6600,9927,11047"; a="19735935" X-IronPort-AV: E=Sophos;i="6.07,213,1708416000"; d="scan'208";a="19735935" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Apr 2024 05:12:07 -0700 X-CSE-ConnectionGUID: yI8WMOP+SRuEq5Ht4Yq9SQ== X-CSE-MsgGUID: Aybc10gBQGem/JPhI5wTNw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,213,1708416000"; d="scan'208";a="28149538" Received: from mkuznet1-mobl2.ger.corp.intel.com (HELO jhogande-mobl1.intel.com) ([10.252.63.13]) by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Apr 2024 05:12:05 -0700 From: =?utf-8?q?Jouni_H=C3=B6gander?= To: intel-gfx@lists.freedesktop.org Cc: Animesh Manna , =?utf-8?q?Jouni_H=C3=B6gander?= Subject: [PATCH v7 07/11] drm/i915/psr: Panel replay uses SRD_STATUS to track it's status Date: Fri, 19 Apr 2024 15:11:37 +0300 Message-Id: <20240419121141.2665945-8-jouni.hogander@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240419121141.2665945-1-jouni.hogander@intel.com> References: <20240419121141.2665945-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" DP Panel replay uses SRD_STATUS to track it's status despite selective update mode. Bspec: 53370, 68920 v3: - do not use PSR2_STATUS for PSR1 v2: - use intel_dp_is_edp to differentiate - modify debugfs status as well Signed-off-by: Jouni Högander --- drivers/gpu/drm/i915/display/intel_psr.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index 29400fac13c2..7631aad5ee7a 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -2860,7 +2860,8 @@ void intel_psr_wait_for_idle_locked(const struct intel_crtc_state *new_crtc_stat if (!intel_dp->psr.enabled) continue; - if (intel_dp->psr.sel_update_enabled) + if (intel_dp_is_edp(intel_dp) && + intel_dp->psr.sel_update_enabled) ret = _psr2_ready_for_pipe_update_locked(intel_dp); else ret = _psr1_ready_for_pipe_update_locked(intel_dp); @@ -2881,7 +2882,8 @@ static bool __psr_wait_for_idle_locked(struct intel_dp *intel_dp) if (!intel_dp->psr.enabled) return false; - if (intel_dp->psr.sel_update_enabled) { + if (!intel_dp->psr.panel_replay_enabled && + intel_dp->psr.sel_update_enabled) { reg = EDP_PSR2_STATUS(cpu_transcoder); mask = EDP_PSR2_STATUS_STATE_MASK; } else { @@ -3500,7 +3502,7 @@ psr_source_status(struct intel_dp *intel_dp, struct seq_file *m) const char *status = "unknown"; u32 val, status_val; - if (intel_dp->psr.sel_update_enabled) { + if (intel_dp_is_edp(intel_dp) && intel_dp->psr.sel_update_enabled) { static const char * const live_status[] = { "IDLE", "CAPTURE",