From: Jani Nikula <jani.nikula@intel.com>
To: Jani Nikula <jani.nikula@intel.com>,
intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org
Cc: imre.deak@intel.com
Subject: [PATCH] drm/i915/ddi: write payload for 128b/132b SST
Date: Tue, 7 Jan 2025 11:54:14 +0200 [thread overview]
Message-ID: <20250107095414.1244286-1-jani.nikula@intel.com> (raw)
In-Reply-To: <f27aefb555e1edcf94aea8f78021afb04faf8f33.1735912293.git.jani.nikula@intel.com>
Write the payload allocation table for 128b/132b SST. Use VCPID 1 and
start from slot 0, with dp_m_n.tu slots.
This is preparation for enabling 128b/132b SST. This path is not
reachable yet. Indeed, we don't yet compute TU for 128b/132b SST.
v2: Handle drm_dp_dpcd_write_payload() failures (Imre)
v3: Include drm_dp_helper.h (kernel test robot)
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_ddi.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index 44f9bde2cdcc..f8e111d8c3a5 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -28,6 +28,7 @@
#include <linux/iopoll.h>
#include <linux/string_helpers.h>
+#include <drm/display/drm_dp_helper.h>
#include <drm/display/drm_scdc_helper.h>
#include <drm/drm_privacy_screen_consumer.h>
@@ -2574,6 +2575,7 @@ static void mtl_ddi_pre_enable_dp(struct intel_atomic_state *state,
{
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
bool is_mst = intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST);
+ int ret;
intel_dp_set_link_params(intel_dp,
crtc_state->port_clock,
@@ -2668,6 +2670,14 @@ static void mtl_ddi_pre_enable_dp(struct intel_atomic_state *state,
/* 6.o Configure and enable FEC if needed */
intel_ddi_enable_fec(encoder, crtc_state);
+ /* 7.a 128b/132b SST. */
+ if (!is_mst && intel_dp_is_uhbr(crtc_state)) {
+ /* VCPID 1, start slot 0 for 128b/132b, tu slots */
+ ret = drm_dp_dpcd_write_payload(&intel_dp->aux, 1, 0, crtc_state->dp_m_n.tu);
+ if (ret < 0)
+ intel_dp_queue_modeset_retry_for_link(state, encoder, crtc_state);
+ }
+
if (!is_mst)
intel_dsc_dp_pps_write(encoder, crtc_state);
}
@@ -2681,6 +2691,7 @@ static void tgl_ddi_pre_enable_dp(struct intel_atomic_state *state,
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
bool is_mst = intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST);
+ int ret;
intel_dp_set_link_params(intel_dp,
crtc_state->port_clock,
@@ -2807,6 +2818,13 @@ static void tgl_ddi_pre_enable_dp(struct intel_atomic_state *state,
/* 7.l Configure and enable FEC if needed */
intel_ddi_enable_fec(encoder, crtc_state);
+ if (!is_mst && intel_dp_is_uhbr(crtc_state)) {
+ /* VCPID 1, start slot 0 for 128b/132b, tu slots */
+ ret = drm_dp_dpcd_write_payload(&intel_dp->aux, 1, 0, crtc_state->dp_m_n.tu);
+ if (ret < 0)
+ intel_dp_queue_modeset_retry_for_link(state, encoder, crtc_state);
+ }
+
if (!is_mst)
intel_dsc_dp_pps_write(encoder, crtc_state);
}
--
2.39.5
next prev parent reply other threads:[~2025-01-07 9:54 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-03 13:52 [PATCH v3 00/16] drm/i915/dp: 128b/132b uncompressed SST Jani Nikula
2025-01-03 13:52 ` [PATCH v3 01/16] drm/mst: remove mgr parameter and debug logging from drm_dp_get_vc_payload_bw() Jani Nikula
2025-01-07 9:55 ` Jani Nikula
2025-01-07 15:14 ` Maxime Ripard
2025-01-07 17:05 ` Jani Nikula
2025-01-09 22:06 ` Lyude Paul
2025-01-10 8:54 ` Jani Nikula
2025-01-03 13:52 ` [PATCH v3 02/16] drm/i915/mst: drop connector parameter from intel_dp_mst_bw_overhead() Jani Nikula
2025-01-03 13:52 ` [PATCH v3 03/16] drm/i915/mst: drop connector parameter from intel_dp_mst_compute_m_n() Jani Nikula
2025-01-03 13:52 ` [PATCH v3 04/16] drm/i915/mst: change return value of mst_stream_find_vcpi_slots_for_bpp() Jani Nikula
2025-01-03 13:52 ` [PATCH v3 05/16] drm/i915/mst: remove crtc_state->pbn Jani Nikula
2025-01-03 13:52 ` [PATCH v3 06/16] drm/i915/mst: split out a helper for figuring out the TU Jani Nikula
2025-01-03 13:52 ` [PATCH v3 07/16] drm/i915/mst: adapt intel_dp_mtp_tu_compute_config() for 128b/132b SST Jani Nikula
2025-01-03 13:52 ` [PATCH v3 08/16] drm/i915/ddi: enable 128b/132b TRANS_DDI_FUNC_CTL mode for UHBR SST Jani Nikula
2025-01-03 13:52 ` [PATCH v3 09/16] drm/i915/ddi: 128b/132b SST also needs DP_TP_CTL_MODE_MST Jani Nikula
2025-01-03 13:52 ` [PATCH v3 10/16] drm/i915/ddi: write payload for 128b/132b SST Jani Nikula
2025-01-03 14:23 ` Imre Deak
2025-01-07 9:54 ` Jani Nikula [this message]
2025-01-03 13:52 ` [PATCH v3 11/16] drm/i915/ddi: initialize 128b/132b SST DP2 VFREQ registers Jani Nikula
2025-01-03 14:23 ` Imre Deak
2025-01-03 13:52 ` [PATCH v3 12/16] drm/i915/ddi: enable ACT handling for 128b/132b SST Jani Nikula
2025-01-03 14:39 ` Imre Deak
2025-01-03 13:52 ` [PATCH v3 13/16] drm/i915/ddi: start distinguishing 128b/132b SST and MST at state readout Jani Nikula
2025-01-03 13:52 ` [PATCH v3 14/16] drm/i915/ddi: handle 128b/132b SST in intel_ddi_read_func_ctl() Jani Nikula
2025-01-03 13:52 ` [PATCH v3 15/16] drm/i915/ddi: disable trancoder port select for 128b/132b SST Jani Nikula
2025-01-03 13:52 ` [PATCH v3 16/16] drm/i915/dp: compute config for 128b/132b SST w/o DSC Jani Nikula
2025-01-03 15:25 ` ✓ CI.Patch_applied: success for drm/i915/dp: 128b/132b uncompressed SST (rev4) Patchwork
2025-01-03 15:25 ` ✗ CI.checkpatch: warning " Patchwork
2025-01-03 15:27 ` ✓ CI.KUnit: success " Patchwork
2025-01-03 15:45 ` ✓ CI.Build: " Patchwork
2025-01-03 15:47 ` ✓ CI.Hooks: " Patchwork
2025-01-03 15:49 ` ✗ CI.checksparse: warning " Patchwork
2025-01-03 16:14 ` ✓ Xe.CI.BAT: success " Patchwork
2025-01-03 23:32 ` ✗ Xe.CI.Full: failure " Patchwork
2025-01-07 11:07 ` ✓ CI.Patch_applied: success for drm/i915/dp: 128b/132b uncompressed SST (rev5) Patchwork
2025-01-07 11:08 ` ✗ CI.checkpatch: warning " Patchwork
2025-01-07 11:09 ` ✓ CI.KUnit: success " Patchwork
2025-01-07 11:27 ` ✓ CI.Build: " Patchwork
2025-01-07 11:29 ` ✓ CI.Hooks: " Patchwork
2025-01-07 11:31 ` ✗ CI.checksparse: warning " Patchwork
2025-01-07 11:57 ` ✓ Xe.CI.BAT: success " Patchwork
2025-01-07 17:05 ` [PATCH v3 00/16] drm/i915/dp: 128b/132b uncompressed SST Jani Nikula
2025-01-08 15:43 ` ✗ Xe.CI.Full: failure for drm/i915/dp: 128b/132b uncompressed SST (rev5) Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250107095414.1244286-1-jani.nikula@intel.com \
--to=jani.nikula@intel.com \
--cc=imre.deak@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox