From patchwork Wed Nov 22 09:31:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= X-Patchwork-Id: 13465378 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 341B4C61D97 for ; Wed, 22 Nov 2023 18:57:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 80A5B10E0AB; Wed, 22 Nov 2023 18:57:26 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 85D8010E0AB for ; Wed, 22 Nov 2023 18:57:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700679444; x=1732215444; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=+R696zyzKHeObsTvQWQzsSBiKz6uQztB9244b0DzoHs=; b=SGeqDELrv/Ufn5dQ1ajegn/lTF3M/iqwn2jRDlsZKylDJJT3GhGAGpeY IxdsxiBHyPAzgufV3vHZR2al5yQ161UExiypl1e82B+Ewvi3BaDkBzCS0 K7riO3c8nPoyT/Hq698swTtzb0/0LSriRZhNe/z0WDMPpAkkqY/n6C6+u kY7MmLPAh29N5Ye9GpJmi0qYgIYtPb2scmLk/3O2md3vvYaa1IYF/vrd7 tX8NPEX8aQF+p6n+l5iG7+QdK4NfU+HOtmmIFlfRs9M+DMan8VzNaNxSU 77t3QFGMgrpKG5IYHRwpWFbehjtZvipZ0BNr7Z3JN9PbDlTMteWW/lkmt g==; X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="423252373" X-IronPort-AV: E=Sophos;i="6.04,219,1695711600"; d="scan'208";a="423252373" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Nov 2023 10:41:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10901"; a="760380367" X-IronPort-AV: E=Sophos;i="6.04,218,1695711600"; d="scan'208";a="760380367" Received: from unknown (HELO stinkbox) ([10.237.72.74]) by orsmga007.jf.intel.com with SMTP; 22 Nov 2023 01:34:38 -0800 Received: by stinkbox (sSMTP sendmail emulation); Wed, 22 Nov 2023 11:31:37 +0200 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Date: Wed, 22 Nov 2023 11:31:34 +0200 Message-ID: <20231122093137.1509-1-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 1/4] drm/i915/psr: Don't send a NULL VSC SDP 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: Ville Syrjälä The PSR code is unconditionally enabling the VSC SDP whether or not PSR itself is enabled. This means if the DP code decided not to use a VSC SDP we're always transmitting a zeroed SDP. Not sure what the hardware will even do in that case. We also see a "Failed to unpack DP VSC SDP" message on every readout since the DIP buffer is just full of zeroes. Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/i915/display/intel_psr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index 8d180132a74b..931295934659 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -1373,6 +1373,9 @@ void intel_psr_compute_config(struct intel_dp *intel_dp, else crtc_state->has_psr = _psr_compute_config(intel_dp, crtc_state); + if (!crtc_state->has_psr) + return; + crtc_state->has_psr2 = intel_psr2_config_valid(intel_dp, crtc_state); crtc_state->infoframes.enable |= intel_hdmi_infoframe_enable(DP_SDP_VSC); From patchwork Wed Nov 22 09:31:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= X-Patchwork-Id: 13465379 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 EB97FC61D9D for ; Wed, 22 Nov 2023 18:57:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8958910E0AA; Wed, 22 Nov 2023 18:57:30 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5776010E0AA for ; Wed, 22 Nov 2023 18:57:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700679448; x=1732215448; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=ECJcPJAHiWTV58j2Kr7bUistegDy6Wayp8NhLT9vNDs=; b=mdxp2+9SDAV7bsiWksvOriGi29UytiKlcWboOLLrdx6OJJw8t2XIAgJD u7NMUM8breBByNEsjqC+SdVQHfmgEG7BpkQbEYZjV5Gndcix6m70oR0zS qZR+pi/adftvvNNf4vVeM+q9dHRI9g7lFnKP+/INq1Emd3cs5rdOx+Ryk /gwIgnQdmG6eaSxcBw6t0pcrwzjyZN1WJSL1hU29KYwLujQYqjIeEKgnn XJzyKonNprEiJCOoahrXnycHDvRH6aEXcdVbOcTVAyzER2ILj70PHuVfp R+SpP7N/18SGp9boHjYV/VynkD9n0lZNzCapSce7wuKgXt73F3xbjqqh+ w==; X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="423252478" X-IronPort-AV: E=Sophos;i="6.04,219,1695711600"; d="scan'208";a="423252478" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Nov 2023 10:41:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10901"; a="760380630" X-IronPort-AV: E=Sophos;i="6.04,218,1695711600"; d="scan'208";a="760380630" Received: from unknown (HELO stinkbox) ([10.237.72.74]) by orsmga007.jf.intel.com with SMTP; 22 Nov 2023 01:37:41 -0800 Received: by stinkbox (sSMTP sendmail emulation); Wed, 22 Nov 2023 11:34:40 +0200 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Date: Wed, 22 Nov 2023 11:31:35 +0200 Message-ID: <20231122093137.1509-2-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231122093137.1509-1-ville.syrjala@linux.intel.com> References: <20231122093137.1509-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 2/4] drm/i915/psr: Include some basic PSR information in the state dump 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: Ville Syrjälä Currently no one can figure out what the PSR code is doing since we're including any of it in the basic state dump. Add at least the bare minimum there. Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/i915/display/intel_crtc_state_dump.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c b/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c index 2d15e82c0b3d..5bcdbf083281 100644 --- a/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c +++ b/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c @@ -262,6 +262,11 @@ void intel_crtc_state_dump(const struct intel_crtc_state *pipe_config, drm_dbg_kms(&i915->drm, "fec: %s, enhanced framing: %s\n", str_enabled_disabled(pipe_config->fec_enable), str_enabled_disabled(pipe_config->enhanced_framing)); + + drm_dbg_kms(&i915->drm, "psr: %s, psr2: %s, selective fetch: %s\n", + str_enabled_disabled(pipe_config->has_psr), + str_enabled_disabled(pipe_config->has_psr2), + str_enabled_disabled(pipe_config->enable_psr2_sel_fetch)); } drm_dbg_kms(&i915->drm, "framestart delay: %d, MSA timing delay: %d\n", From patchwork Wed Nov 22 09:31:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= X-Patchwork-Id: 13465380 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 4B5F9C61D9B for ; Wed, 22 Nov 2023 18:57:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9595110E0DA; Wed, 22 Nov 2023 18:57:33 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2FC0510E0BC for ; Wed, 22 Nov 2023 18:57:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700679451; x=1732215451; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=A5u0FlJ5k3bk/VaUH8QjQGOG0c27WxHIlga3vT/hDqA=; b=SAjyB73EH5m3GyF5D+Gynvwx8Un3XgxXQejeuA0EtITELcx307yGXlo+ tWHW3rTHYrL8ZkaVPNsL+Dh6JV4JKL+9qk1VvsqW0eYkblX5KOtIKGURg uq/eoo/qinxCbbtS3iM4hWEVGUc50953MVR0ii77W4B5qf9iAs5u0XouJ /YdNJuH3rIUGCIGVX7WqmaDGZYPXcOABL7+mIhSdBX22IBn2bTbgAw20T ZOa0p3Q+AX/0bOV78Rt/5hly6mc8a2+5tT7W9iFXzHU7QcX8ZrzI9O0vY DFEEeF0W1yKB00pj09A6yq0OHWRYspPEgOi8StG7tbNjJN11UniqRTxup g==; X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="423252651" X-IronPort-AV: E=Sophos;i="6.04,219,1695711600"; d="scan'208";a="423252651" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Nov 2023 10:41:16 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10901"; a="760381175" X-IronPort-AV: E=Sophos;i="6.04,218,1695711600"; d="scan'208";a="760381175" Received: from unknown (HELO stinkbox) ([10.237.72.74]) by orsmga007.jf.intel.com with SMTP; 22 Nov 2023 01:40:44 -0800 Received: by stinkbox (sSMTP sendmail emulation); Wed, 22 Nov 2023 11:37:43 +0200 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Date: Wed, 22 Nov 2023 11:31:36 +0200 Message-ID: <20231122093137.1509-3-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231122093137.1509-1-ville.syrjala@linux.intel.com> References: <20231122093137.1509-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 3/4] drm/i915: Stop printing pipe name as hex 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: Ville Syrjälä Print the pipe name in ascii rather than hex. Signed-off-by: Ville Syrjälä Reviewed-by: Jouni Högander --- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c index 7958d0bd851e..ef57dad1a9cb 100644 --- a/drivers/gpu/drm/i915/display/intel_dpll_mgr.c +++ b/drivers/gpu/drm/i915/display/intel_dpll_mgr.c @@ -4537,7 +4537,7 @@ void intel_shared_dpll_state_verify(struct intel_atomic_state *state, "pll active mismatch (didn't expect pipe %c in active mask (0x%x))\n", pipe_name(crtc->pipe), pll->active_mask); I915_STATE_WARN(i915, pll->state.pipe_mask & pipe_mask, - "pll enabled crtcs mismatch (found %x in enabled mask (0x%x))\n", + "pll enabled crtcs mismatch (found pipe %c in enabled mask (0x%x))\n", pipe_name(crtc->pipe), pll->state.pipe_mask); } } From patchwork Wed Nov 22 09:31:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= X-Patchwork-Id: 13465381 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 7B77DC61D9B for ; Wed, 22 Nov 2023 18:57:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E8FA310E0D5; Wed, 22 Nov 2023 18:57:36 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id AE61610E0BC for ; Wed, 22 Nov 2023 18:57: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=1700679452; x=1732215452; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=TCZS5gQG92YOq7qRHVntbBuMZH1CNJw0IHwStDseyPw=; b=W8HNDnJw2oyHa9BosBlJuOLCkhwjq9m26xFY4p8J0osT+CobjnQ+5RhS QjRFSzS85+p+u0NgIBDY+LYSzpq4kWViViV6HPirWOqO54y3ashIf13GU JSjmJ3XvPJ43uXurFU/NNN8eBHSuPqNjv8iwe0kCORuaiYB4WluZIgaV8 hQdhgnK23pyWuPC83jFxf0n6HSguVTuL62rSM8JM+s6pPOsDMDOMl6B+b ms26GQq5NwXyxXnTfTBxRzqdsdzgk4VkYVuO8Fb41f0v8U+QODy4HVVyD ayRbe7CnbC3mX79LEgTCwOPbnCqkdNAqReBalNMTHMb0iNYMy2jkqr0bq A==; X-IronPort-AV: E=McAfee;i="6600,9927,10902"; a="423252680" X-IronPort-AV: E=Sophos;i="6.04,219,1695711600"; d="scan'208";a="423252680" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Nov 2023 10:41:16 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10901"; a="760381425" X-IronPort-AV: E=Sophos;i="6.04,218,1695711600"; d="scan'208";a="760381425" Received: from unknown (HELO stinkbox) ([10.237.72.74]) by orsmga007.jf.intel.com with SMTP; 22 Nov 2023 01:43:47 -0800 Received: by stinkbox (sSMTP sendmail emulation); Wed, 22 Nov 2023 11:40:47 +0200 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Date: Wed, 22 Nov 2023 11:31:37 +0200 Message-ID: <20231122093137.1509-4-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231122093137.1509-1-ville.syrjala@linux.intel.com> References: <20231122093137.1509-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 4/4] drm/i915: Move the SDP split debug spew to the correct place 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: Ville Syrjälä Adding ad-hoc debug prints all over the place is not good. Move the SDP split debug spew into the proper place (state dumper). Signed-off-by: Ville Syrjälä Reviewed-by: Jouni Högander --- drivers/gpu/drm/i915/display/intel_crtc_state_dump.c | 3 +++ drivers/gpu/drm/i915/display/intel_dp.c | 7 ------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c b/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c index 5bcdbf083281..e62afd298191 100644 --- a/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c +++ b/drivers/gpu/drm/i915/display/intel_crtc_state_dump.c @@ -263,6 +263,9 @@ void intel_crtc_state_dump(const struct intel_crtc_state *pipe_config, str_enabled_disabled(pipe_config->fec_enable), str_enabled_disabled(pipe_config->enhanced_framing)); + drm_dbg_kms(&i915->drm, "sdp split: %s\n", + str_enabled_disabled(pipe_config->sdp_split_enable)); + drm_dbg_kms(&i915->drm, "psr: %s, psr2: %s, selective fetch: %s\n", str_enabled_disabled(pipe_config->has_psr), str_enabled_disabled(pipe_config->has_psr2), diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 1422c2370269..c6e3fe8b75d3 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -2844,19 +2844,12 @@ intel_dp_audio_compute_config(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config, struct drm_connector_state *conn_state) { - struct drm_i915_private *i915 = to_i915(encoder->base.dev); - struct drm_connector *connector = conn_state->connector; - pipe_config->has_audio = intel_dp_has_audio(encoder, pipe_config, conn_state) && intel_audio_compute_config(encoder, pipe_config, conn_state); pipe_config->sdp_split_enable = pipe_config->has_audio && intel_dp_is_uhbr(pipe_config); - - drm_dbg_kms(&i915->drm, "[CONNECTOR:%d:%s] SDP split enable: %s\n", - connector->base.id, connector->name, - str_yes_no(pipe_config->sdp_split_enable)); } int