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 C4747C0218A for ; Thu, 30 Jan 2025 11:55:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7884A10E944; Thu, 30 Jan 2025 11:55:44 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="ZSWituNC"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id 33D9D10E944; Thu, 30 Jan 2025 11:55:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738238143; x=1769774143; h=from:to:subject:in-reply-to:references:date:message-id: mime-version; bh=Zp8v/GdV/bmgHZdNhyKWoE3N6mjbC6fihlut1vd6lSw=; b=ZSWituNCLkmYv370xuB5DRyrd0Img5mTarAdEp/GfrG6XEyNlgdmJoJR Znv08AJZmffDnut8B95mFSfKYDCdx+ajencIHG1Mc+btBeqT90iudBNVO bvJ8v4A/qKKYmYExw2FTEi73EhfkaQ4xw+yu5WrMowAoRwSljR1cWDeD7 7S8TjHwEBR/Mp1I6KWQU284ilKApFpo2haZvBdYZ710rsDCKS7aw5Kz1Z 0abBuGpapA+HwJ7Rmg9B9FQTSIsov2RQx3wIxSBPJG/QyyuQicLxlMrRH AbxEzOHrOMKSC/CGnGAguJhxtqp4RjC2FFtCVO0CTLUPrSxNw9SgJzmEV g==; X-CSE-ConnectionGUID: DdKc386JSKSVLNvHLYffRQ== X-CSE-MsgGUID: F+HViV4vSvWZbgnkg84i2A== X-IronPort-AV: E=McAfee;i="6700,10204,11331"; a="38681885" X-IronPort-AV: E=Sophos;i="6.13,245,1732608000"; d="scan'208";a="38681885" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jan 2025 03:55:43 -0800 X-CSE-ConnectionGUID: OdPjiH6cQ/ibrm8zAd1Vlg== X-CSE-MsgGUID: PLoWweFgQ6Co3XEd9Hhr2w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,245,1732608000"; d="scan'208";a="109445373" Received: from sschumil-mobl2.ger.corp.intel.com (HELO localhost) ([10.245.246.68]) by fmviesa008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jan 2025 03:55:41 -0800 From: Jani Nikula To: Imre Deak , intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Subject: Re: [PATCH 05/17] drm/i915/ddi: Simplify the port enabling via DDI_BUF_CTL In-Reply-To: <20250129200221.2508101-6-imre.deak@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20250129200221.2508101-1-imre.deak@intel.com> <20250129200221.2508101-6-imre.deak@intel.com> Date: Thu, 30 Jan 2025 13:55:38 +0200 Message-ID: <875xlw8qit.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" On Wed, 29 Jan 2025, Imre Deak wrote: > In the past intel_digital_port::dp.prepare_link_retrain() could be > called directly (vs. from a modeset) to retrain an enabled link. In that > case the port had to be first disabled and then re-enabled. That changed > with commit 2885d283cce5 ("drm/i915/dp: Retrain SST links via a modeset > commit"), after which the only way prepare_link_retrain() can be called > is from a modeset during link training when the port is still disabled. > Simplify things accordingly, assuming the disabled port state. > > Signed-off-by: Imre Deak > --- > drivers/gpu/drm/i915/display/intel_ddi.c | 23 ++++------------------- > 1 file changed, 4 insertions(+), 19 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c > index 6192c0d3c87a5..3138dc4034797 100644 > --- a/drivers/gpu/drm/i915/display/intel_ddi.c > +++ b/drivers/gpu/drm/i915/display/intel_ddi.c > @@ -3743,8 +3743,8 @@ static void mtl_ddi_prepare_link_retrain(struct intel_dp *intel_dp, > * necessary disable and enable port > */ > dp_tp_ctl = intel_de_read(display, dp_tp_ctl_reg(encoder, crtc_state)); > - if (dp_tp_ctl & DP_TP_CTL_ENABLE) > - mtl_disable_ddi_buf(encoder, crtc_state); > + > + drm_WARN_ON(display->drm, dp_tp_ctl & DP_TP_CTL_ENABLE); > > /* 6.d Configure and enable DP_TP_CTL with link training pattern 1 selected */ > dp_tp_ctl = DP_TP_CTL_ENABLE | DP_TP_CTL_LINK_TRAIN_PAT1; > @@ -3787,26 +3787,11 @@ static void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp, > struct intel_encoder *encoder = &dig_port->base; > struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); > enum port port = encoder->port; > - u32 dp_tp_ctl, ddi_buf_ctl; > - bool wait = false; > + u32 dp_tp_ctl; > > dp_tp_ctl = intel_de_read(dev_priv, dp_tp_ctl_reg(encoder, crtc_state)); > > - if (dp_tp_ctl & DP_TP_CTL_ENABLE) { > - ddi_buf_ctl = intel_de_read(dev_priv, DDI_BUF_CTL(port)); > - if (ddi_buf_ctl & DDI_BUF_CTL_ENABLE) { > - intel_de_write(dev_priv, DDI_BUF_CTL(port), > - ddi_buf_ctl & ~DDI_BUF_CTL_ENABLE); > - wait = true; > - } > - > - dp_tp_ctl &= ~DP_TP_CTL_ENABLE; > - intel_de_write(dev_priv, dp_tp_ctl_reg(encoder, crtc_state), dp_tp_ctl); > - intel_de_posting_read(dev_priv, dp_tp_ctl_reg(encoder, crtc_state)); > - > - if (wait) > - intel_wait_ddi_buf_idle(dev_priv, port); > - } > + drm_WARN_ON(&dev_priv->drm, dp_tp_ctl & DP_TP_CTL_ENABLE); Please don't add new dev_priv uses. Add the local display variable and use display->drm. With that fixed, Reviewed-by: Jani Nikula > > dp_tp_ctl = DP_TP_CTL_ENABLE | DP_TP_CTL_LINK_TRAIN_PAT1; > if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST) || -- Jani Nikula, Intel