From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 7E0B4F364A8 for ; Thu, 9 Apr 2026 17:09:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=HqD0mr7sf75LjT0yNP7LvO47dnEsZGkmyqhNV5eLXkg=; b=aVAGmL4cuVSE7bfwjtLDoDNGBE 09Ru+Yc4+PYcExohJbvktANqWykCBqa+Hqiudp4EtsWudpgt8iiyXMV863vOxhfMGMdYTmQQlKcFb mLd8RmxBwaU8N0yv30lMAqfWsjiimPlwm/ibs88nPR70Qudwe/Sds59VjAUCbEcsGBKeKDKqlM6tA OKuIXqjcB4oAFXGJHPg6mKsiKb07a3w5w7H6SzhUE3KgVCfbyEUtbYMVd9/A2z44DykiTNRHZI9z7 LoadxBXXeJfIPOxBQqjfsWZ4mxhjBc0qU9vLolJjANDaG260qjnqfXi0UtvjAxSYy1R14LlHtQYo2 AYJDn8hg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1wAssr-0000000AzBZ-0xlJ; Thu, 09 Apr 2026 17:09:37 +0000 Received: from smtpout-04.galae.net ([185.171.202.116]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1wAssm-0000000Az2A-3IzL for linux-arm-kernel@lists.infradead.org; Thu, 09 Apr 2026 17:09:35 +0000 Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-04.galae.net (Postfix) with ESMTPS id 0A420C5C18A; Thu, 9 Apr 2026 17:10:06 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 4094D603E4; Thu, 9 Apr 2026 17:09:31 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id D624B104500F2; Thu, 9 Apr 2026 19:09:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1775754569; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=HqD0mr7sf75LjT0yNP7LvO47dnEsZGkmyqhNV5eLXkg=; b=h9xR02kI1jjYrNVTXgx/FD2R2tfo46THPCu9f5RgxizVaElcH1nVrVJgn9XpW++icA9cMD L6S0aZ7ez4L3CLg+I8sm1VUojyEkqoID3PPOS43uaDB1FF65SFPwqUATKJFyU0t7vdQwD6 eulVpzdY8P1DuKHwIy4wsoQp99WkcUQI1B/QrBRFc3kH18/WjmOzAUTQU9BztWNvn3E3et hz0cJzJ7aa3wtQmaBtpF2CBTN4u41rNwmDq9B530eeAy5Is3pvdhs6XD+6glpyitFhdYJu 6+CzEOl1ypzGo0xkDgmMno01+uxHAGlysBB9+twiEWhERUswxbd5CwYjGK9law== From: Kory Maincent Date: Thu, 09 Apr 2026 19:08:26 +0200 Subject: [PATCH RFC 10/12] drm/i915/display/dp: Adopt dp_connector helpers to expose link training state MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260409-feat_link_cap-v1-10-7069e8199ce2@bootlin.com> References: <20260409-feat_link_cap-v1-0-7069e8199ce2@bootlin.com> In-Reply-To: <20260409-feat_link_cap-v1-0-7069e8199ce2@bootlin.com> To: Jani Nikula , Rodrigo Vivi , Joonas Lahtinen , Tvrtko Ursulin , David Airlie , Simona Vetter , Dave Airlie , Jesse Barnes , Eric Anholt , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Chun-Kuang Hu , Philipp Zabel , Matthias Brugger , AngeloGioacchino Del Regno , Chris Wilson Cc: Thomas Petazzoni , Mark Yacoub , Sean Paul , Louis Chauvet , intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Simona Vetter , Kory Maincent X-Mailer: b4 0.14-dev-d4707 X-Last-TLS-Session-Version: TLSv1.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260409_100933_191264_44A60896 X-CRM114-Status: GOOD ( 16.52 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Switch the i915 DP connector initialization from drmm_connector_init() to drmm_connector_dp_init(), providing the source link capabilities (supported lane counts, link rates, DSC support, voltage swing and pre-emphasis levels). Add intel_dp_report_link_train() to collect the negotiated link parameters (rate, lane count, DSC enable, per-lane voltage swing and pre-emphasis) and report them via drm_connector_dp_set_link_train_properties() once link training completes successfully. Reset the link training properties via drm_connector_dp_reset_link_train_properties() when the connector is reported as disconnected or when the display device is disabled, so the exposed state always reflects the current link status. Signed-off-by: Kory Maincent --- drivers/gpu/drm/i915/display/intel_dp.c | 31 +++++++++++++++++++--- .../gpu/drm/i915/display/intel_dp_link_training.c | 25 +++++++++++++++++ 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 2af64de9c81de..641406bdc0cc9 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -6337,8 +6338,10 @@ intel_dp_detect(struct drm_connector *_connector, drm_WARN_ON(display->drm, !drm_modeset_is_locked(&display->drm->mode_config.connection_mutex)); - if (!intel_display_device_enabled(display)) + if (!intel_display_device_enabled(display)) { + drm_connector_dp_reset_link_train_properties(_connector); return connector_status_disconnected; + } if (!intel_display_driver_check_access(display)) return connector->base.status; @@ -6388,6 +6391,8 @@ intel_dp_detect(struct drm_connector *_connector, intel_dp_tunnel_disconnect(intel_dp); + drm_connector_dp_reset_link_train_properties(_connector); + goto out_unset_edid; } @@ -7162,10 +7167,12 @@ intel_dp_init_connector(struct intel_digital_port *dig_port, struct intel_connector *connector) { struct intel_display *display = to_intel_display(dig_port); + struct drm_connector_dp_link_train_caps link_caps; struct intel_dp *intel_dp = &dig_port->dp; struct intel_encoder *encoder = &dig_port->base; struct drm_device *dev = encoder->base.dev; enum port port = encoder->port; + u32 *rates; int type; if (drm_WARN(dev, dig_port->max_lanes < 1, @@ -7213,8 +7220,25 @@ intel_dp_init_connector(struct intel_digital_port *dig_port, type == DRM_MODE_CONNECTOR_eDP ? "eDP" : "DP", encoder->base.base.id, encoder->base.name); - drmm_connector_init(dev, &connector->base, &intel_dp_connector_funcs, - type, &intel_dp->aux.ddc); + intel_dp_set_source_rates(intel_dp); + link_caps.nlanes = DRM_DP_1LANE | DRM_DP_2LANE | DRM_DP_4LANE; + link_caps.nrates = intel_dp->num_source_rates; + rates = kzalloc_objs(*rates, intel_dp->num_source_rates); + if (!rates) + goto fail; + + for (int i = 0; i < intel_dp->num_source_rates; i++) + rates[i] = intel_dp->source_rates[i]; + + link_caps.rates = rates; + link_caps.dsc = true; + link_caps.v_swings = DRM_DP_VOLTAGE_SWING_LEVEL_MASK; + link_caps.pre_emphs = DRM_DP_PRE_EMPH_LEVEL_MASK; + + drmm_connector_dp_init(dev, &connector->base, &intel_dp_connector_funcs, + &link_caps, type, &intel_dp->aux.ddc); + kfree(rates); + drm_connector_helper_add(&connector->base, &intel_dp_connector_helper_funcs); if (drmm_add_action_or_reset(dev, intel_connector_destroy, connector)) { @@ -7240,7 +7264,6 @@ intel_dp_init_connector(struct intel_digital_port *dig_port, if (!intel_edp_init_connector(intel_dp, connector)) goto fail; - intel_dp_set_source_rates(intel_dp); intel_dp_set_common_rates(intel_dp); intel_dp_reset_link_params(intel_dp); diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c index 54c585c59b900..c2fd46a323650 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c @@ -25,6 +25,7 @@ #include #include +#include #include #include "intel_display_core.h" @@ -1116,6 +1117,27 @@ intel_dp_128b132b_intra_hop(struct intel_dp *intel_dp, return sink_status & DP_INTRA_HOP_AUX_REPLY_INDICATION ? 1 : 0; } +static void intel_dp_report_link_train(struct intel_dp *intel_dp) +{ + struct intel_connector *connector = intel_dp->attached_connector; + struct drm_connector_dp_link_train dp_link_train; + + dp_link_train.rate = intel_dp->link_rate; + dp_link_train.nlanes = intel_dp->lane_count; + dp_link_train.dsc_en = connector->dp.dsc_decompression_enabled; + + for (int i = 0; i < intel_dp->lane_count; i++) { + int v_swing_level = (intel_dp->train_set[i] & + DP_TRAIN_VOLTAGE_SWING_MASK) >> DP_TRAIN_VOLTAGE_SWING_SHIFT; + int pre_emph_level = (intel_dp->train_set[i] & + DP_TRAIN_PRE_EMPHASIS_MASK) >> DP_TRAIN_PRE_EMPHASIS_SHIFT; + dp_link_train.v_swing[i] = 1 << v_swing_level; + dp_link_train.pre_emph[i] = 1 << pre_emph_level; + } + + drm_connector_dp_set_link_train_properties(&connector->base, &dp_link_train); +} + /** * intel_dp_stop_link_train - stop link training * @intel_dp: DP struct @@ -1144,6 +1166,9 @@ void intel_dp_stop_link_train(struct intel_dp *intel_dp, intel_dp_program_link_training_pattern(intel_dp, crtc_state, DP_PHY_DPRX, DP_TRAINING_PATTERN_DISABLE); + if (!intel_dp->is_mst) + intel_dp_report_link_train(intel_dp); + if (intel_dp_is_uhbr(crtc_state)) { ret = poll_timeout_us(ret = intel_dp_128b132b_intra_hop(intel_dp, crtc_state), ret == 0, -- 2.43.0