From patchwork Thu Sep 12 05:05:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun R Murthy X-Patchwork-Id: 13801363 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 BB811EE644A for ; Thu, 12 Sep 2024 05:15:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1C0BA10E9A3; Thu, 12 Sep 2024 05:15:47 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="ju27IZP0"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id 70B7810E9A3; Thu, 12 Sep 2024 05:15:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1726118144; x=1757654144; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XXJY3SlhdFlS17ylCS+OgBUVIH8/dhQI/nJ6xA9jBRY=; b=ju27IZP0bpSI0PhnvUTvfz45NDkL/aDzKKS22wejCXYxPk7QP/h2PCoM /d46MkzeZtG76ydKmAnzHYZ6fv72k6qPMQJlhFBII90D1u4/Ma26gG/J+ H6aHSLwzWtrIDLuH09IYJ/DJ0+76fiQgKLTyp0yH6mY+iL0oOnhsCuxhn Q05Uqnd2rnILoRb8OCpNrX4V9KHdY19mJvX089shoVAyRbudqyWuZ3Iiz MitfSrzb+eJ8PjPIvzBBITP8tLnItHO+yJID4lyV9RNSlEt+afY6tblvl SqPhMaNKXlsUWpSTE4JQnliQJrHpCfg2FFQ5MGlhywPJE7EOPYDOnBtGj g==; X-CSE-ConnectionGUID: V6c9Zla+TXiDeOQnAMGYig== X-CSE-MsgGUID: IBGmH5SDSfWZKw87wShRhg== X-IronPort-AV: E=McAfee;i="6700,10204,11192"; a="35613924" X-IronPort-AV: E=Sophos;i="6.10,222,1719903600"; d="scan'208";a="35613924" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Sep 2024 22:15:44 -0700 X-CSE-ConnectionGUID: fCKIMAc2T+KS6jYNIvPLng== X-CSE-MsgGUID: 6NExZf+VSm2vWyUNhhmemg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,222,1719903600"; d="scan'208";a="72388856" Received: from srr4-3-linux-106-armuthy.iind.intel.com ([10.190.238.56]) by orviesa005.jf.intel.com with ESMTP; 11 Sep 2024 22:15:43 -0700 From: Arun R Murthy To: intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: Arun R Murthy , Srikanth V NagaVenkata Subject: [PATCH 1/3] drm/i915/dp: use fsleep instead of usleep_rage for LT Date: Thu, 12 Sep 2024 10:35:50 +0530 Message-Id: <20240912050552.779356-2-arun.r.murthy@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240912050552.779356-1-arun.r.murthy@intel.com> References: <20240912050552.779356-1-arun.r.murthy@intel.com> MIME-Version: 1.0 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" Aux RD Interval value depends on the value read from the dpcd register which is updated from the sink device use flseep thereby we adhere to the Documentation/timers/timers-howto.rst Signed-off-by: Srikanth V NagaVenkata Signed-off-by: Arun R Murthy Reviewed-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_dp_link_training.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 397cc4ebae52..f41b69840ad9 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c @@ -898,7 +898,7 @@ intel_dp_link_training_clock_recovery(struct intel_dp *intel_dp, voltage_tries = 1; for (cr_tries = 0; cr_tries < max_cr_tries; ++cr_tries) { - usleep_range(delay_us, 2 * delay_us); + fsleep(delay_us); if (drm_dp_dpcd_read_phy_link_status(&intel_dp->aux, dp_phy, link_status) < 0) { @@ -1040,7 +1040,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp, } for (tries = 0; tries < 5; tries++) { - usleep_range(delay_us, 2 * delay_us); + fsleep(delay_us); if (drm_dp_dpcd_read_phy_link_status(&intel_dp->aux, dp_phy, link_status) < 0) { @@ -1417,7 +1417,7 @@ intel_dp_128b132b_lane_eq(struct intel_dp *intel_dp, deadline = jiffies + msecs_to_jiffies_timeout(400); for (try = 0; try < max_tries; try++) { - usleep_range(delay_us, 2 * delay_us); + fsleep(delay_us); /* * The delay may get updated. The transmitter shall read the From patchwork Thu Sep 12 05:05:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun R Murthy X-Patchwork-Id: 13801364 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 3D8E1EE644C for ; Thu, 12 Sep 2024 05:15:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 51F8310E9B8; Thu, 12 Sep 2024 05:15:47 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="mS8T3A5G"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id 163ED10E9A3; Thu, 12 Sep 2024 05:15:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1726118146; x=1757654146; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=3kntFXla7m+0Hv/BcRUDRpCJcw2ILUWRMyONOThaLHM=; b=mS8T3A5GWCdHn3oqulhYcJC0B24oub9d2xxCCfSxvrvVJznnY5G5nEmN LlwXE2G6oe5VzQupNh6KlDzMIFZQX6DCQ+7vK1lxVcb2HM1zQSb84T4Ai 9W+/Q5/IhKZWrdFv7pl1nB+McrklGqMimFFIq7vk9pGX8QDE5xXil06gH /GEmL8BBCG8+o1vN9E21OEgmLFwVRhVnrAXEyRKfkyRoK8W45dWtPwvIM VgjkckPymaLf8OIDPRwbkMdi8TSWGlJajhlGE0XfoxTxE8chFFCOOYxCF 4F6oH6sxMai+olLk5n0iRBo+PamrH7v1e1Ghpi7Ec0j5X/02O/97r9K8S g==; X-CSE-ConnectionGUID: mYuwbvVcT+CxvECBFYjLag== X-CSE-MsgGUID: /NlKG8OHSfeOMPhBdOQIzA== X-IronPort-AV: E=McAfee;i="6700,10204,11192"; a="35613927" X-IronPort-AV: E=Sophos;i="6.10,222,1719903600"; d="scan'208";a="35613927" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Sep 2024 22:15:46 -0700 X-CSE-ConnectionGUID: 1iPfmpuHTpmFxek0h+9hJQ== X-CSE-MsgGUID: zfOClt8xQLO16tDbUyNuvg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,222,1719903600"; d="scan'208";a="72388859" Received: from srr4-3-linux-106-armuthy.iind.intel.com ([10.190.238.56]) by orviesa005.jf.intel.com with ESMTP; 11 Sep 2024 22:15:44 -0700 From: Arun R Murthy To: intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: Arun R Murthy , Srikanth V NagaVenkata Subject: [PATCH 2/3] drm/i915/dp: read Aux RD interval after reading the FFE preset Date: Thu, 12 Sep 2024 10:35:51 +0530 Message-Id: <20240912050552.779356-3-arun.r.murthy@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240912050552.779356-1-arun.r.murthy@intel.com> References: <20240912050552.779356-1-arun.r.murthy@intel.com> MIME-Version: 1.0 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 Source should be reading AUX_RD interval after we get adjusted TX_FFE_PRESET_VALUE from the DP Sink. (before actually adjusting in DP Source) Signed-off-by: Srikanth V NagaVenkata Signed-off-by: Arun R Murthy --- .../gpu/drm/i915/display/intel_dp_link_training.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 f41b69840ad9..ca179bed46ad 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c @@ -1419,12 +1419,6 @@ intel_dp_128b132b_lane_eq(struct intel_dp *intel_dp, for (try = 0; try < max_tries; try++) { fsleep(delay_us); - /* - * The delay may get updated. The transmitter shall read the - * delay before link status during link training. - */ - delay_us = drm_dp_128b132b_read_aux_rd_interval(&intel_dp->aux); - if (drm_dp_dpcd_read_link_status(&intel_dp->aux, link_status) < 0) { lt_err(intel_dp, DP_PHY_DPRX, "Failed to read link status\n"); return false; @@ -1457,6 +1451,12 @@ intel_dp_128b132b_lane_eq(struct intel_dp *intel_dp, lt_err(intel_dp, DP_PHY_DPRX, "Failed to update TX FFE settings\n"); return false; } + + /* + * The delay may get updated. The transmitter shall read the + * delay before link status during link training. + */ + delay_us = drm_dp_128b132b_read_aux_rd_interval(&intel_dp->aux); } if (try == max_tries) { From patchwork Thu Sep 12 05:05:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun R Murthy X-Patchwork-Id: 13801365 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 C6F57EE6442 for ; Thu, 12 Sep 2024 05:15:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7BA5810EA92; Thu, 12 Sep 2024 05:15:51 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="aWDz3iLz"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id A894710E9BA; Thu, 12 Sep 2024 05:15:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1726118148; x=1757654148; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NxvA8vQID2ti5QVXHM4L2swT1DSYIoPRLT0ogammRkI=; b=aWDz3iLzjPlE1eiDz3agH/J7k0gHSBEZiORgpaEirZ+3LA+gowxIFrDz 3pnp0UaPdmzQ6/xCkL3M6nAC0dm40GAwIKf72VlnQC42yWivXvOJ9ridB Z76UcSirEDA0OudNJ4NwcZix6P7kGT9yegoWGW+c4O6YzTlEJMLlt1QQU ucTWaucuSWnw903L1fHAvOG4InmjLJ+2K2ixmfhkAmg8v06G4jlp/r33h geA1e71ja2y3mJeKQFmFRlMoqLYd++N/OOVQOrGIl/cc6nuK5k+UHX+1o rX8m4GX+apaWaUrQHX/kalowaomMS8LeqAdC++rLngcpBibn856nTfpex w==; X-CSE-ConnectionGUID: YgHPRO7hTmGWaoBS0du2Gg== X-CSE-MsgGUID: HS+LqTKIRIqkfhsGdz2Pxg== X-IronPort-AV: E=McAfee;i="6700,10204,11192"; a="35613929" X-IronPort-AV: E=Sophos;i="6.10,222,1719903600"; d="scan'208";a="35613929" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Sep 2024 22:15:47 -0700 X-CSE-ConnectionGUID: YRkd3XEKR1O1hbJauunRAg== X-CSE-MsgGUID: syo/zIiISEiShm53oQDN7A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,222,1719903600"; d="scan'208";a="72388862" Received: from srr4-3-linux-106-armuthy.iind.intel.com ([10.190.238.56]) by orviesa005.jf.intel.com with ESMTP; 11 Sep 2024 22:15:46 -0700 From: Arun R Murthy To: intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: Arun R Murthy , Srikanth V NagaVenkata Subject: [PATCH 3/3] drm/i915/dp: Include the time taken by AUX Tx for timeout Date: Thu, 12 Sep 2024 10:35:52 +0530 Message-Id: <20240912050552.779356-4-arun.r.murthy@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240912050552.779356-1-arun.r.murthy@intel.com> References: <20240912050552.779356-1-arun.r.murthy@intel.com> MIME-Version: 1.0 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" As per DP spec the timeout for LANE_CHANNEL_EQ_DONE is 400ms. But this timeout value is exclusively for the Aux RD Interval and excludes the time consumed for the AUX Tx (i.e reading/writing FFE presets). Add another 50ms for these AUX Tx to the 400ms timeout. Signed-off-by: Srikanth V NagaVenkata Signed-off-by: Arun R Murthy Reviewed-by: Suraj Kandpal Acked-by: Jani Nikula --- drivers/gpu/drm/i915/display/intel_dp_link_training.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ca179bed46ad..b6573934c6dd 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c @@ -1414,7 +1414,7 @@ intel_dp_128b132b_lane_eq(struct intel_dp *intel_dp, } /* Time budget for the LANEx_EQ_DONE Sequence */ - deadline = jiffies + msecs_to_jiffies_timeout(400); + deadline = jiffies + msecs_to_jiffies_timeout(450); for (try = 0; try < max_tries; try++) { fsleep(delay_us);