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 X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E90CEC433DF for ; Sun, 18 Oct 2020 22:14:44 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 8097722272 for ; Sun, 18 Oct 2020 22:14:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8097722272 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C292A6E8B3; Sun, 18 Oct 2020 22:14:43 +0000 (UTC) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7B9EE6E8B3; Sun, 18 Oct 2020 22:14:42 +0000 (UTC) IronPort-SDR: PsTcWp9McIwhnv9wGzJjc9ltmwe09JWnVZA+la6mp+qL41Q2uHUsiyrGafog6jigpxNRLj3DAu YlTNDZdxL2Aw== X-IronPort-AV: E=McAfee;i="6000,8403,9778"; a="154729491" X-IronPort-AV: E=Sophos;i="5.77,392,1596524400"; d="scan'208";a="154729491" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Oct 2020 15:14:41 -0700 IronPort-SDR: iXag6fWWclRUw99d6s8VX7htBIPD/mqBNMDNEfAFAsIgrLD/BnP/XrSYQ26AhoNEj7b+NnHMZ/ xgDTuG2QwDCg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,392,1596524400"; d="scan'208";a="522902332" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by fmsmga005.fm.intel.com with ESMTP; 18 Oct 2020 15:14:40 -0700 Received: from bgsmsx603.gar.corp.intel.com (10.109.78.82) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Sun, 18 Oct 2020 15:14:39 -0700 Received: from bgsmsx604.gar.corp.intel.com (10.67.234.6) by BGSMSX603.gar.corp.intel.com (10.109.78.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Mon, 19 Oct 2020 03:44:37 +0530 Received: from bgsmsx604.gar.corp.intel.com ([10.67.234.6]) by BGSMSX604.gar.corp.intel.com ([10.67.234.6]) with mapi id 15.01.1713.004; Mon, 19 Oct 2020 03:44:37 +0530 From: "Shankar, Uma" To: "Nautiyal, Ankit K" , "intel-gfx@lists.freedesktop.org" Subject: RE: [RFC 05/13] drm/i915: Add support for starting FRL training for HDMI2.1 via PCON Thread-Topic: [RFC 05/13] drm/i915: Add support for starting FRL training for HDMI2.1 via PCON Thread-Index: AQHWouJbK3VKaB5GLk+s+VpdKqJG8Kmd7swQ Date: Sun, 18 Oct 2020 22:14:36 +0000 Message-ID: <55c73a5c117e436eaab0f8d4ff806de0@intel.com> References: <20201015105259.27934-1-ankit.k.nautiyal@intel.com> <20201015105259.27934-6-ankit.k.nautiyal@intel.com> In-Reply-To: <20201015105259.27934-6-ankit.k.nautiyal@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.5.1.3 x-originating-ip: [10.223.10.1] MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Kulkarni, Vandita" , "dri-devel@lists.freedesktop.org" , "Sharma, Swati2" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" > -----Original Message----- > From: Nautiyal, Ankit K > Sent: Thursday, October 15, 2020 4:23 PM > To: intel-gfx@lists.freedesktop.org > Cc: dri-devel@lists.freedesktop.org; Shankar, Uma ; > Kulkarni, Vandita ; ville.syrjala@linux.intel.com; > Sharma, Swati2 > Subject: [RFC 05/13] drm/i915: Add support for starting FRL training for HDMI2.1 > via PCON > > This patch adds functions to start FRL training for an HDMI2.1 sink, connected via > a PCON as a DP branch device. > This patch also adds a new structure for storing frl training related data, when > FRL training is completed. > > Signed-off-by: Ankit Nautiyal > --- > .../drm/i915/display/intel_display_types.h | 7 + > drivers/gpu/drm/i915/display/intel_dp.c | 200 ++++++++++++++++++ > drivers/gpu/drm/i915/display/intel_dp.h | 2 + > 3 files changed, 209 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h > b/drivers/gpu/drm/i915/display/intel_display_types.h > index e2f58d0575a2..6c69922313d6 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > @@ -1287,6 +1287,11 @@ struct intel_dp_compliance { > u8 test_lane_count; > }; > > +struct intel_dp_pcon_frl { > + bool is_trained; > + int trained_rate_gbps; > +}; > + > struct intel_dp { > i915_reg_t output_reg; > u32 DP; > @@ -1408,6 +1413,8 @@ struct intel_dp { > > bool hobl_failed; > bool hobl_active; > + > + struct intel_dp_pcon_frl frl; > }; > > enum lspcon_vendor { > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c > b/drivers/gpu/drm/i915/display/intel_dp.c > index cd6934f28f32..c1342b5e7781 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -2885,6 +2885,9 @@ static void intel_dp_prepare(struct intel_encoder > *encoder, > intel_dp->DP |= DP_PIPE_SEL_CHV(crtc->pipe); > else > intel_dp->DP |= DP_PIPE_SEL(crtc->pipe); > + > + intel_dp->frl.is_trained = false; > + intel_dp->frl.trained_rate_gbps = 0; > } > } > > @@ -3781,6 +3784,9 @@ static void intel_disable_dp(struct intel_atomic_state > *state, > intel_edp_backlight_off(old_conn_state); > intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF); > intel_edp_panel_off(intel_dp); > + > + intel_dp->frl.is_trained = false; > + intel_dp->frl.trained_rate_gbps = 0; > } > > static void g4x_disable_dp(struct intel_atomic_state *state, @@ -3876,6 > +3882,200 @@ cpt_set_link_train(struct intel_dp *intel_dp, > intel_de_posting_read(dev_priv, intel_dp->output_reg); } > > +static int intel_dp_get_max_rate_gbps(struct intel_dp *intel_dp) { > + int max_link_clock, max_lanes, max_rate_khz, max_rate_gbps; > + > + max_link_clock = intel_dp_max_link_rate(intel_dp); > + max_lanes = intel_dp_max_lane_count(intel_dp); > + max_rate_khz = intel_dp_max_data_rate(max_link_clock, max_lanes); > + max_rate_gbps = 8 * DIV_ROUND_UP(max_rate_khz, 1000000); > + > + return max_rate_gbps; > +} > + > +static int intel_dp_pcon_get_frl_mask(u8 frl_bw_mask) { > + int bw_gbps[] = {9, 18, 24, 32, 40, 48}; > + int i; > + > + for (i = ARRAY_SIZE(bw_gbps) - 1; i >= 0; i--) { > + if (frl_bw_mask & (1 << i)) > + return bw_gbps[i]; > + } > + return 0; > +} > + > +static int intel_dp_pcon_set_frl_mask(int max_frl) { > + int max_frl_mask = 0; > + > + switch (max_frl) { > + case 48: > + max_frl_mask |= DP_PCON_FRL_BW_MASK_48GBPS; Just say it as return DP_PCON_FRL_BW_MASK_48GBPS. Do it universally. > + break; > + case 40: > + max_frl_mask |= DP_PCON_FRL_BW_MASK_40GBPS; > + break; > + case 32: > + max_frl_mask |= DP_PCON_FRL_BW_MASK_32GBPS; > + break; > + case 24: > + max_frl_mask |= DP_PCON_FRL_BW_MASK_24GBPS; > + break; > + case 18: > + max_frl_mask |= DP_PCON_FRL_BW_MASK_18GBPS; > + break; > + case 9: > + max_frl_mask |= DP_PCON_FRL_BW_MASK_9GBPS; > + break; > + default: > + max_frl_mask = 0; > + } > + > + return max_frl_mask; > +} > + > +static int intel_dp_hdmi_sink_max_frl(struct intel_dp *intel_dp) { > + struct intel_connector *intel_connector = intel_dp->attached_connector; > + struct drm_connector *connector = &intel_connector->base; > + > + return (connector->display_info.hdmi.max_frl_rate_per_lane * > + connector->display_info.hdmi.max_lanes); > +} > + > +static int intel_dp_pcon_start_frl_training(struct intel_dp *intel_dp) > +{ #define PCON_EXTENDED_TRAIN_MODE true#define > PCON_CONCURRENT_MODE > +true #define PCON_SEQUENTIAL_MODE !PCON_CONCURRENT_MODE #define > +PCON_NORMAL_TRAIN_MODE !PCON_EXTENDED_TRAIN_MODE #define Don't use true instead 1 < 0 as true is not the right thing to be used here. > +TIMEOUT_FRL_READY_MS 500 #define TIMEOUT_HDMI_LINK_ACTIVE_MS 1000 > + > + struct drm_i915_private *i915 = dp_to_i915(intel_dp); > + int max_frl, max_pcon_frl, max_sink_frl, max_rate_gbps, max_frl_edid, > ret; > + u8 max_frl_mask = 0, frl_trained_mask; > + bool is_active; > + > + ret = drm_dp_pcon_reset_frl_config(&intel_dp->aux); > + if (ret < 0) > + return ret; > + > + max_rate_gbps = intel_dp_get_max_rate_gbps(intel_dp); > + drm_dbg(&i915->drm, "Source max rate = %d Gbps\n", max_rate_gbps); > + > + max_pcon_frl = intel_dp->dfp.pcon_max_frl; Append it with rate or bw. > + drm_dbg(&i915->drm, "PCON max rate = %d Gbps\n", max_pcon_frl); > + > + /* Double Check from HDMI SINK EDID */ > + max_frl_edid = intel_dp_hdmi_sink_max_frl(intel_dp); > + drm_dbg(&i915->drm, "Sink max rate from EDID = %d Gbps\n", > +max_frl_edid); > + > + max_sink_frl = intel_dp->dfp.sink_max_frl; > + drm_dbg(&i915->drm, "Sink max rate from PCON = %d Gbps\n", > +max_sink_frl); > + > + /* TODO MAX SINK FRL from PCON is not enumerated. Using MAX FRL > value Use multi line comment style. > + * directly from EDID. Need to confirm from Spec. > + */ > + max_frl = min(max_rate_gbps, min(max_frl_edid, max_pcon_frl)); > + > + if (max_frl <= 0) > + return -EINVAL; > + > + ret = drm_dp_pcon_frl_prepare(&intel_dp->aux, false); > + if (ret < 0) > + return ret; > + /* Wait for PCON to be FRL Ready */ > + wait_for(is_active = drm_dp_pcon_is_frl_ready(&intel_dp->aux) == true, > +TIMEOUT_FRL_READY_MS); > + > + if (!is_active) > + return -ETIMEDOUT; > + > + max_frl_mask = intel_dp_pcon_set_frl_mask(max_frl); > + ret = drm_dp_pcon_frl_configure_1(&intel_dp->aux, max_frl, > PCON_SEQUENTIAL_MODE); > + if (ret < 0) > + return ret; > + ret = drm_dp_pcon_frl_configure_2(&intel_dp->aux, max_frl_mask, > PCON_NORMAL_TRAIN_MODE); > + if (ret < 0) > + return ret; > + ret = drm_dp_pcon_frl_enable(&intel_dp->aux); > + if (ret < 0) > + return ret; > + /* > + * Wait for FRL to be completed > + * Check if the HDMI Link is up and active. > + */ > + wait_for(is_active = drm_dp_pcon_hdmi_link_active(&intel_dp->aux) == > +true, TIMEOUT_HDMI_LINK_ACTIVE_MS); > + > + if (!is_active) > + return -ETIMEDOUT; > + /* > + * Verify HDMI Link configuration shows FRL Mode. > + */ > + if (DP_PCON_HDMI_MODE_FRL != > drm_dp_pcon_hdmi_link_mode(&intel_dp->aux, &frl_trained_mask)) { > + drm_dbg(&i915->drm, "HDMI couldn't be trained in FRL > Mode\n"); > + return -EINVAL; > + } > + drm_dbg(&i915->drm, "MAX_FRL_MASK = %u, FRL_TRAINED_MASK = > %u\n", > +max_frl_mask, frl_trained_mask); > + > + /* > + * Read HDMI_LINK_STATUS_TRAINED 0x2005 bit 5 > + * TODO: Details not mentioned in spec. Need to check. > + */ > + > + intel_dp->frl.trained_rate_gbps = > intel_dp_pcon_get_frl_mask(frl_trained_mask); > + intel_dp->frl.is_trained = true; > + drm_dbg(&i915->drm, "FRL trained with : %d Gbps\n", > +intel_dp->frl.trained_rate_gbps); > + > + return 0; > +} > + > +static bool intel_dp_is_frl_required(struct intel_dp *intel_dp) { > + if (!intel_dp->frl.is_trained) > + return true; > + /* > + * #TODO check if the mode really required FRL or can work > + * with TMDS mode. > + */ > + > + return false; > +} > + > +static bool intel_dp_is_hdmi_2_1_sink(struct intel_dp *intel_dp) { > + if (drm_dp_is_branch(intel_dp->dpcd) && > + intel_dp_hdmi_sink_max_frl(intel_dp) > 0) > + return true; > + > + return false; > +} > + > +void intel_dp_check_frl_training(struct intel_dp *intel_dp) { > + struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); > + > + if (!intel_dp_is_hdmi_2_1_sink(intel_dp) || > + !intel_dp_is_frl_required(intel_dp)) > + return; > + > + if (intel_dp_pcon_start_frl_training(intel_dp) < 0) { > + int ret, mode; > + > + drm_dbg(&dev_priv->drm, "Couldnt set FRL mode, continuing > with TMDS mode\n"); > + ret = drm_dp_pcon_reset_frl_config(&intel_dp->aux); > + mode = drm_dp_pcon_hdmi_link_mode(&intel_dp->aux, NULL); > + > + if (ret < 0 || mode != DP_PCON_HDMI_MODE_TMDS) > + drm_dbg(&dev_priv->drm, "Issue with PCON, cannot set > TMDS mode\n"); > + } > + > + else Move it up and enclose in { to match the above if style. > + drm_dbg(&dev_priv->drm, "FRL training Completed\n"); } > + > static void > g4x_set_link_train(struct intel_dp *intel_dp, > const struct intel_crtc_state *crtc_state, diff --git > a/drivers/gpu/drm/i915/display/intel_dp.h > b/drivers/gpu/drm/i915/display/intel_dp.h > index fcc28eb242f2..81d83d88cd41 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.h > +++ b/drivers/gpu/drm/i915/display/intel_dp.h > @@ -143,4 +143,6 @@ bool intel_dp_initial_fastset_check(struct intel_encoder > *encoder, void intel_dp_sync_state(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state); > > +void intel_dp_check_frl_training(struct intel_dp *intel_dp); > + > #endif /* __INTEL_DP_H__ */ > -- > 2.17.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel 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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7CB1FC433DF for ; Sun, 18 Oct 2020 22:14:48 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 45AA022272 for ; Sun, 18 Oct 2020 22:14:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 45AA022272 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5F0546E8B7; Sun, 18 Oct 2020 22:14:44 +0000 (UTC) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7B9EE6E8B3; Sun, 18 Oct 2020 22:14:42 +0000 (UTC) IronPort-SDR: PsTcWp9McIwhnv9wGzJjc9ltmwe09JWnVZA+la6mp+qL41Q2uHUsiyrGafog6jigpxNRLj3DAu YlTNDZdxL2Aw== X-IronPort-AV: E=McAfee;i="6000,8403,9778"; a="154729491" X-IronPort-AV: E=Sophos;i="5.77,392,1596524400"; d="scan'208";a="154729491" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Oct 2020 15:14:41 -0700 IronPort-SDR: iXag6fWWclRUw99d6s8VX7htBIPD/mqBNMDNEfAFAsIgrLD/BnP/XrSYQ26AhoNEj7b+NnHMZ/ xgDTuG2QwDCg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,392,1596524400"; d="scan'208";a="522902332" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by fmsmga005.fm.intel.com with ESMTP; 18 Oct 2020 15:14:40 -0700 Received: from bgsmsx603.gar.corp.intel.com (10.109.78.82) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Sun, 18 Oct 2020 15:14:39 -0700 Received: from bgsmsx604.gar.corp.intel.com (10.67.234.6) by BGSMSX603.gar.corp.intel.com (10.109.78.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Mon, 19 Oct 2020 03:44:37 +0530 Received: from bgsmsx604.gar.corp.intel.com ([10.67.234.6]) by BGSMSX604.gar.corp.intel.com ([10.67.234.6]) with mapi id 15.01.1713.004; Mon, 19 Oct 2020 03:44:37 +0530 From: "Shankar, Uma" To: "Nautiyal, Ankit K" , "intel-gfx@lists.freedesktop.org" Thread-Topic: [RFC 05/13] drm/i915: Add support for starting FRL training for HDMI2.1 via PCON Thread-Index: AQHWouJbK3VKaB5GLk+s+VpdKqJG8Kmd7swQ Date: Sun, 18 Oct 2020 22:14:36 +0000 Message-ID: <55c73a5c117e436eaab0f8d4ff806de0@intel.com> References: <20201015105259.27934-1-ankit.k.nautiyal@intel.com> <20201015105259.27934-6-ankit.k.nautiyal@intel.com> In-Reply-To: <20201015105259.27934-6-ankit.k.nautiyal@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.5.1.3 x-originating-ip: [10.223.10.1] MIME-Version: 1.0 Subject: Re: [Intel-gfx] [RFC 05/13] drm/i915: Add support for starting FRL training for HDMI2.1 via PCON 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: , Cc: "dri-devel@lists.freedesktop.org" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" > -----Original Message----- > From: Nautiyal, Ankit K > Sent: Thursday, October 15, 2020 4:23 PM > To: intel-gfx@lists.freedesktop.org > Cc: dri-devel@lists.freedesktop.org; Shankar, Uma ; > Kulkarni, Vandita ; ville.syrjala@linux.intel.com; > Sharma, Swati2 > Subject: [RFC 05/13] drm/i915: Add support for starting FRL training for HDMI2.1 > via PCON > > This patch adds functions to start FRL training for an HDMI2.1 sink, connected via > a PCON as a DP branch device. > This patch also adds a new structure for storing frl training related data, when > FRL training is completed. > > Signed-off-by: Ankit Nautiyal > --- > .../drm/i915/display/intel_display_types.h | 7 + > drivers/gpu/drm/i915/display/intel_dp.c | 200 ++++++++++++++++++ > drivers/gpu/drm/i915/display/intel_dp.h | 2 + > 3 files changed, 209 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h > b/drivers/gpu/drm/i915/display/intel_display_types.h > index e2f58d0575a2..6c69922313d6 100644 > --- a/drivers/gpu/drm/i915/display/intel_display_types.h > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h > @@ -1287,6 +1287,11 @@ struct intel_dp_compliance { > u8 test_lane_count; > }; > > +struct intel_dp_pcon_frl { > + bool is_trained; > + int trained_rate_gbps; > +}; > + > struct intel_dp { > i915_reg_t output_reg; > u32 DP; > @@ -1408,6 +1413,8 @@ struct intel_dp { > > bool hobl_failed; > bool hobl_active; > + > + struct intel_dp_pcon_frl frl; > }; > > enum lspcon_vendor { > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c > b/drivers/gpu/drm/i915/display/intel_dp.c > index cd6934f28f32..c1342b5e7781 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -2885,6 +2885,9 @@ static void intel_dp_prepare(struct intel_encoder > *encoder, > intel_dp->DP |= DP_PIPE_SEL_CHV(crtc->pipe); > else > intel_dp->DP |= DP_PIPE_SEL(crtc->pipe); > + > + intel_dp->frl.is_trained = false; > + intel_dp->frl.trained_rate_gbps = 0; > } > } > > @@ -3781,6 +3784,9 @@ static void intel_disable_dp(struct intel_atomic_state > *state, > intel_edp_backlight_off(old_conn_state); > intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF); > intel_edp_panel_off(intel_dp); > + > + intel_dp->frl.is_trained = false; > + intel_dp->frl.trained_rate_gbps = 0; > } > > static void g4x_disable_dp(struct intel_atomic_state *state, @@ -3876,6 > +3882,200 @@ cpt_set_link_train(struct intel_dp *intel_dp, > intel_de_posting_read(dev_priv, intel_dp->output_reg); } > > +static int intel_dp_get_max_rate_gbps(struct intel_dp *intel_dp) { > + int max_link_clock, max_lanes, max_rate_khz, max_rate_gbps; > + > + max_link_clock = intel_dp_max_link_rate(intel_dp); > + max_lanes = intel_dp_max_lane_count(intel_dp); > + max_rate_khz = intel_dp_max_data_rate(max_link_clock, max_lanes); > + max_rate_gbps = 8 * DIV_ROUND_UP(max_rate_khz, 1000000); > + > + return max_rate_gbps; > +} > + > +static int intel_dp_pcon_get_frl_mask(u8 frl_bw_mask) { > + int bw_gbps[] = {9, 18, 24, 32, 40, 48}; > + int i; > + > + for (i = ARRAY_SIZE(bw_gbps) - 1; i >= 0; i--) { > + if (frl_bw_mask & (1 << i)) > + return bw_gbps[i]; > + } > + return 0; > +} > + > +static int intel_dp_pcon_set_frl_mask(int max_frl) { > + int max_frl_mask = 0; > + > + switch (max_frl) { > + case 48: > + max_frl_mask |= DP_PCON_FRL_BW_MASK_48GBPS; Just say it as return DP_PCON_FRL_BW_MASK_48GBPS. Do it universally. > + break; > + case 40: > + max_frl_mask |= DP_PCON_FRL_BW_MASK_40GBPS; > + break; > + case 32: > + max_frl_mask |= DP_PCON_FRL_BW_MASK_32GBPS; > + break; > + case 24: > + max_frl_mask |= DP_PCON_FRL_BW_MASK_24GBPS; > + break; > + case 18: > + max_frl_mask |= DP_PCON_FRL_BW_MASK_18GBPS; > + break; > + case 9: > + max_frl_mask |= DP_PCON_FRL_BW_MASK_9GBPS; > + break; > + default: > + max_frl_mask = 0; > + } > + > + return max_frl_mask; > +} > + > +static int intel_dp_hdmi_sink_max_frl(struct intel_dp *intel_dp) { > + struct intel_connector *intel_connector = intel_dp->attached_connector; > + struct drm_connector *connector = &intel_connector->base; > + > + return (connector->display_info.hdmi.max_frl_rate_per_lane * > + connector->display_info.hdmi.max_lanes); > +} > + > +static int intel_dp_pcon_start_frl_training(struct intel_dp *intel_dp) > +{ #define PCON_EXTENDED_TRAIN_MODE true#define > PCON_CONCURRENT_MODE > +true #define PCON_SEQUENTIAL_MODE !PCON_CONCURRENT_MODE #define > +PCON_NORMAL_TRAIN_MODE !PCON_EXTENDED_TRAIN_MODE #define Don't use true instead 1 < 0 as true is not the right thing to be used here. > +TIMEOUT_FRL_READY_MS 500 #define TIMEOUT_HDMI_LINK_ACTIVE_MS 1000 > + > + struct drm_i915_private *i915 = dp_to_i915(intel_dp); > + int max_frl, max_pcon_frl, max_sink_frl, max_rate_gbps, max_frl_edid, > ret; > + u8 max_frl_mask = 0, frl_trained_mask; > + bool is_active; > + > + ret = drm_dp_pcon_reset_frl_config(&intel_dp->aux); > + if (ret < 0) > + return ret; > + > + max_rate_gbps = intel_dp_get_max_rate_gbps(intel_dp); > + drm_dbg(&i915->drm, "Source max rate = %d Gbps\n", max_rate_gbps); > + > + max_pcon_frl = intel_dp->dfp.pcon_max_frl; Append it with rate or bw. > + drm_dbg(&i915->drm, "PCON max rate = %d Gbps\n", max_pcon_frl); > + > + /* Double Check from HDMI SINK EDID */ > + max_frl_edid = intel_dp_hdmi_sink_max_frl(intel_dp); > + drm_dbg(&i915->drm, "Sink max rate from EDID = %d Gbps\n", > +max_frl_edid); > + > + max_sink_frl = intel_dp->dfp.sink_max_frl; > + drm_dbg(&i915->drm, "Sink max rate from PCON = %d Gbps\n", > +max_sink_frl); > + > + /* TODO MAX SINK FRL from PCON is not enumerated. Using MAX FRL > value Use multi line comment style. > + * directly from EDID. Need to confirm from Spec. > + */ > + max_frl = min(max_rate_gbps, min(max_frl_edid, max_pcon_frl)); > + > + if (max_frl <= 0) > + return -EINVAL; > + > + ret = drm_dp_pcon_frl_prepare(&intel_dp->aux, false); > + if (ret < 0) > + return ret; > + /* Wait for PCON to be FRL Ready */ > + wait_for(is_active = drm_dp_pcon_is_frl_ready(&intel_dp->aux) == true, > +TIMEOUT_FRL_READY_MS); > + > + if (!is_active) > + return -ETIMEDOUT; > + > + max_frl_mask = intel_dp_pcon_set_frl_mask(max_frl); > + ret = drm_dp_pcon_frl_configure_1(&intel_dp->aux, max_frl, > PCON_SEQUENTIAL_MODE); > + if (ret < 0) > + return ret; > + ret = drm_dp_pcon_frl_configure_2(&intel_dp->aux, max_frl_mask, > PCON_NORMAL_TRAIN_MODE); > + if (ret < 0) > + return ret; > + ret = drm_dp_pcon_frl_enable(&intel_dp->aux); > + if (ret < 0) > + return ret; > + /* > + * Wait for FRL to be completed > + * Check if the HDMI Link is up and active. > + */ > + wait_for(is_active = drm_dp_pcon_hdmi_link_active(&intel_dp->aux) == > +true, TIMEOUT_HDMI_LINK_ACTIVE_MS); > + > + if (!is_active) > + return -ETIMEDOUT; > + /* > + * Verify HDMI Link configuration shows FRL Mode. > + */ > + if (DP_PCON_HDMI_MODE_FRL != > drm_dp_pcon_hdmi_link_mode(&intel_dp->aux, &frl_trained_mask)) { > + drm_dbg(&i915->drm, "HDMI couldn't be trained in FRL > Mode\n"); > + return -EINVAL; > + } > + drm_dbg(&i915->drm, "MAX_FRL_MASK = %u, FRL_TRAINED_MASK = > %u\n", > +max_frl_mask, frl_trained_mask); > + > + /* > + * Read HDMI_LINK_STATUS_TRAINED 0x2005 bit 5 > + * TODO: Details not mentioned in spec. Need to check. > + */ > + > + intel_dp->frl.trained_rate_gbps = > intel_dp_pcon_get_frl_mask(frl_trained_mask); > + intel_dp->frl.is_trained = true; > + drm_dbg(&i915->drm, "FRL trained with : %d Gbps\n", > +intel_dp->frl.trained_rate_gbps); > + > + return 0; > +} > + > +static bool intel_dp_is_frl_required(struct intel_dp *intel_dp) { > + if (!intel_dp->frl.is_trained) > + return true; > + /* > + * #TODO check if the mode really required FRL or can work > + * with TMDS mode. > + */ > + > + return false; > +} > + > +static bool intel_dp_is_hdmi_2_1_sink(struct intel_dp *intel_dp) { > + if (drm_dp_is_branch(intel_dp->dpcd) && > + intel_dp_hdmi_sink_max_frl(intel_dp) > 0) > + return true; > + > + return false; > +} > + > +void intel_dp_check_frl_training(struct intel_dp *intel_dp) { > + struct drm_i915_private *dev_priv = dp_to_i915(intel_dp); > + > + if (!intel_dp_is_hdmi_2_1_sink(intel_dp) || > + !intel_dp_is_frl_required(intel_dp)) > + return; > + > + if (intel_dp_pcon_start_frl_training(intel_dp) < 0) { > + int ret, mode; > + > + drm_dbg(&dev_priv->drm, "Couldnt set FRL mode, continuing > with TMDS mode\n"); > + ret = drm_dp_pcon_reset_frl_config(&intel_dp->aux); > + mode = drm_dp_pcon_hdmi_link_mode(&intel_dp->aux, NULL); > + > + if (ret < 0 || mode != DP_PCON_HDMI_MODE_TMDS) > + drm_dbg(&dev_priv->drm, "Issue with PCON, cannot set > TMDS mode\n"); > + } > + > + else Move it up and enclose in { to match the above if style. > + drm_dbg(&dev_priv->drm, "FRL training Completed\n"); } > + > static void > g4x_set_link_train(struct intel_dp *intel_dp, > const struct intel_crtc_state *crtc_state, diff --git > a/drivers/gpu/drm/i915/display/intel_dp.h > b/drivers/gpu/drm/i915/display/intel_dp.h > index fcc28eb242f2..81d83d88cd41 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.h > +++ b/drivers/gpu/drm/i915/display/intel_dp.h > @@ -143,4 +143,6 @@ bool intel_dp_initial_fastset_check(struct intel_encoder > *encoder, void intel_dp_sync_state(struct intel_encoder *encoder, > const struct intel_crtc_state *crtc_state); > > +void intel_dp_check_frl_training(struct intel_dp *intel_dp); > + > #endif /* __INTEL_DP_H__ */ > -- > 2.17.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx