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 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 E14EDCD5BB0 for ; Fri, 22 May 2026 12:39:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 696BE10F75E; Fri, 22 May 2026 12:39:14 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="aLvPwwVg"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) by gabe.freedesktop.org (Postfix) with ESMTPS id ADAD210F75D; Fri, 22 May 2026 12:39:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1779453553; x=1810989553; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=AXXeA3dwnaCUQPVjOtiM0TJ5ElknnNEkDMrTJMAtZrM=; b=aLvPwwVgPYoAs47lZ4mgjbFHAt36VMyPOC6bm/wKn+iBU0NyrvchZZT1 tyBWwlgZ0ZCmdWgE11Szqx1zFelr6wVD4YbVjSJz6lEBKeTKcOe0yK1ee p14174GIIgGFm/GvET+T0OP1gKwkUqosmcaStT1m4o6YHTpqjbk9ovQ5W cQ9e0RTRZmNrHr+ZOBrwJXlj0ARnGxWInIJ4Hrh1Jlo9lsckUq0NbVo4Y YRmQRTuIxb48AeRPPs91VlwpRdgVwvat5iyP0uIBdM8pxt1E9QMCVCVTs 6nCRK+bckunu10b2EDQWQRHrfQedsolvYX1Uj6E3A7nh8lGSkRKGtAiJE g==; X-CSE-ConnectionGUID: y2JdEPWpQ/6lXpk2s+ibeQ== X-CSE-MsgGUID: KnhArkCVRXa73EWfko/kHQ== X-IronPort-AV: E=McAfee;i="6800,10657,11794"; a="80350942" X-IronPort-AV: E=Sophos;i="6.24,162,1774335600"; d="scan'208";a="80350942" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 May 2026 05:39:12 -0700 X-CSE-ConnectionGUID: GDt/fw+XSdST0Can3Fyt3g== X-CSE-MsgGUID: s62NoYt/TyensB2LMaML8Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.24,162,1774335600"; d="scan'208";a="271253748" Received: from amilburn-desk.amilburn-desk (HELO localhost) ([10.245.244.187]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 May 2026 05:39:10 -0700 Date: Fri, 22 May 2026 15:39:07 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Jani Nikula Cc: imre.deak@intel.com, Jouni Hogander , intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Subject: Re: [PATCH 1/5] drm/i915/dp: Add helpers to reset link params Message-ID: References: <20260518112427.2460725-1-imre.deak@intel.com> <20260518112427.2460725-2-imre.deak@intel.com> <6b7498358483981472e9a9c6b0c76739de0b028a@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <6b7498358483981472e9a9c6b0c76739de0b028a@intel.com> X-Patchwork-Hint: comment Organization: Intel Finland Oy - BIC 0357606-4 - c/o Alberga Business Park, 6 krs Bertel Jungin Aukio 5, 02600 Espoo, Finland 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" On Fri, May 22, 2026 at 01:29:39PM +0300, Jani Nikula wrote: > On Fri, 22 May 2026, Imre Deak wrote: > > On Fri, May 22, 2026 at 12:36:27AM +0300, Ville Syrjälä wrote: > >> On Mon, May 18, 2026 at 02:24:22PM +0300, Imre Deak wrote: > >> > Add helpers to defer and handle link params resets instead of > >> > open-coding the same. Rename intel_dp_reset_link_params() to > >> > intel_dp_reset_link_params_force() to align its name with the new > >> > deferred reset helpers. > >> > > >> > When deferring a reset, return whether a new reset was queued, used by a > >> > follow-up change. > >> > > >> > Signed-off-by: Imre Deak > >> > --- > >> > drivers/gpu/drm/i915/display/g4x_dp.c | 2 +- > >> > drivers/gpu/drm/i915/display/intel_ddi.c | 2 +- > >> > drivers/gpu/drm/i915/display/intel_dp.c | 41 +++++++++++++++---- > >> > drivers/gpu/drm/i915/display/intel_dp.h | 3 +- > >> > .../drm/i915/display/intel_dp_link_training.c | 4 +- > >> > 5 files changed, 38 insertions(+), 14 deletions(-) > >> > > >> > diff --git a/drivers/gpu/drm/i915/display/g4x_dp.c b/drivers/gpu/drm/i915/display/g4x_dp.c > >> > index 5ff1cdf4581a5..c20a97e21419b 100644 > >> > --- a/drivers/gpu/drm/i915/display/g4x_dp.c > >> > +++ b/drivers/gpu/drm/i915/display/g4x_dp.c > >> > @@ -1265,7 +1265,7 @@ static void intel_dp_encoder_reset(struct drm_encoder *encoder) > >> > > >> > intel_dp->DP = intel_de_read(display, intel_dp->output_reg); > >> > > >> > - intel_dp->reset_link_params = true; > >> > + intel_dp_reset_link_params_defer(intel_dp); > >> > intel_dp_invalidate_source_oui(intel_dp); > >> > > >> > if (display->platform.valleyview || display->platform.cherryview) > >> > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c > >> > index 86520848892e0..77819aaeccb76 100644 > >> > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > >> > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > >> > @@ -4664,7 +4664,7 @@ static void intel_ddi_encoder_reset(struct drm_encoder *encoder) > >> > struct intel_dp *intel_dp = enc_to_intel_dp(to_intel_encoder(encoder)); > >> > struct intel_digital_port *dig_port = enc_to_dig_port(to_intel_encoder(encoder)); > >> > > >> > - intel_dp->reset_link_params = true; > >> > + intel_dp_reset_link_params_defer(intel_dp); > >> > intel_dp_invalidate_source_oui(intel_dp); > >> > > >> > intel_pps_encoder_reset(intel_dp); > >> > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c > >> > index 1920d2f026665..13163dd085e91 100644 > >> > --- a/drivers/gpu/drm/i915/display/intel_dp.c > >> > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > >> > @@ -3710,7 +3710,11 @@ void intel_dp_set_link_params(struct intel_dp *intel_dp, > >> > intel_dp->lane_count = lane_count; > >> > } > >> > > >> > -void intel_dp_reset_link_params(struct intel_dp *intel_dp) > >> > +/* > >> > + * Reset link params now, preserving any deferred connector > >> > + * detect-time reset request. > >> > + */ > >> > +void intel_dp_reset_link_params_force(struct intel_dp *intel_dp) > >> > { > >> > intel_dp->link.max_lane_count = intel_dp_max_common_lane_count(intel_dp); > >> > intel_dp->link.max_rate = intel_dp_max_common_rate(intel_dp); > >> > @@ -3720,6 +3724,28 @@ void intel_dp_reset_link_params(struct intel_dp *intel_dp) > >> > intel_dp->link.seq_train_failures = 0; > >> > } > >> > > >> > +/* > >> > + * Reset link params during the next connector detect. > >> > + * Return %true if a new reset was queued. > >> > + */ > >> > +bool intel_dp_reset_link_params_defer(struct intel_dp *intel_dp) > >> > >> I find the intel_dp_reset_link_params_defer() vs. > >> intel_dp_reset_link_params_force() naming rather confusing. > >> > >> Can't immediately think of a really good name for > >> intel_dp_reset_link_params_defer() so maybe it's better to not > >> have a function for it at all (ie. just drop this patch)? > > > > The idea was to have an interface to reset the link params directly or > > in a deferred way, instead of a direct access of the flag. > > > > The names are not great yes. I could use what Jouni suggested instead, > > or if the above argument is not good enough I can also drop this patch. > > I suggest intel_dp_reset_link_params() keeps its name, or gets renamed > to intel_dp_link_params_reset(). It just does the thing, no "force". > > Then the other two use something like: > > - submit/process > - queue/process > - stage/handle > > or some combination i.e. something like: > > intel_dp_link_params_reset() > intel_dp_link_params_reset_submit() > intel_dp_link_params_reset_process() All of it kinda leaves it a bit unclear how these things are related, and then one probably has to read through them to figure out what they're actually doing. Hence why I think just setting/checking the flag on the spot might be the clearest approach. You can immediately find where it's set vs. checked. -- Ville Syrjälä Intel