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.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 BAB0DC433E7 for ; Mon, 19 Oct 2020 15:27:09 +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 4F5682231B for ; Mon, 19 Oct 2020 15:27:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4F5682231B 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 79A896E9F6; Mon, 19 Oct 2020 15:27:08 +0000 (UTC) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3EF866E9F6 for ; Mon, 19 Oct 2020 15:27:07 +0000 (UTC) IronPort-SDR: h25SWoR2/6BR9g1Pz/Lqmk8FY5+ofXnbr3mKa/RWouXYzxMd3gebrFYEMBATvf+NrF3uSLH3lQ eMFNg0kMGs6A== X-IronPort-AV: E=McAfee;i="6000,8403,9778"; a="228686912" X-IronPort-AV: E=Sophos;i="5.77,394,1596524400"; d="scan'208";a="228686912" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Oct 2020 08:27:06 -0700 IronPort-SDR: cK1Wysskx2vXcQo738QTW2aHLtfprMgBdgdbmqRBpT1xabP9a9/1OhNJh7FGg38MQBv5odthjz Ig3AXtdxQkPg== X-IronPort-AV: E=Sophos;i="5.77,394,1596524400"; d="scan'208";a="532666903" Received: from ideak-desk.fi.intel.com ([10.237.68.141]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Oct 2020 08:27:05 -0700 Date: Mon, 19 Oct 2020 18:27:01 +0300 From: Imre Deak To: Ville Syrjala Message-ID: <20201019152701.GE3199870@ideak-desk.fi.intel.com> References: <20201016194800.25581-1-ville.syrjala@linux.intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201016194800.25581-1-ville.syrjala@linux.intel.com> Subject: Re: [Intel-gfx] [PATCH 1/2] drm/i915: Move the lspcon resume from .reset() to intel_dp_sink_dpms() 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: , Reply-To: imre.deak@intel.com Cc: intel-gfx@lists.freedesktop.org Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Fri, Oct 16, 2020 at 10:47:59PM +0300, Ville Syrjala wrote: > From: Ville Syrj=E4l=E4 > = > Rather that try to trick LSPCON back into PCON mode from the .reset() > hook let's just do that as a regular part of the normal modeset > sequence, which is going to take care of the system resume case. During > a normal modeset this should normally be a nop as the mode should have > already been switched by .detect(). > = > Signed-off-by: Ville Syrj=E4l=E4 > --- > drivers/gpu/drm/i915/display/intel_dp.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i9= 15/display/intel_dp.c > index 52075a241eaf..4784aaeb934e 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -3490,6 +3490,8 @@ void intel_dp_sink_dpms(struct intel_dp *intel_dp, = int mode) > } else { > struct intel_lspcon *lspcon =3D dp_to_lspcon(intel_dp); > = > + lspcon_resume(dp_to_dig_port(intel_dp)); Only applies when lspcon->active (the check could be moved to lspcon_resume). With that fixed: Reviewed-by: Imre Deak > + > /* > * When turning on, we need to retry for 1ms to give the sink > * time to wake up. > @@ -6782,14 +6784,11 @@ void intel_dp_encoder_reset(struct drm_encoder *e= ncoder) > { > struct drm_i915_private *dev_priv =3D to_i915(encoder->dev); > struct intel_dp *intel_dp =3D enc_to_intel_dp(to_intel_encoder(encoder)= ); > - struct intel_digital_port *dig_port =3D dp_to_dig_port(intel_dp); > intel_wakeref_t wakeref; > = > if (!HAS_DDI(dev_priv)) > intel_dp->DP =3D intel_de_read(dev_priv, intel_dp->output_reg); > = > - lspcon_resume(dig_port); > - > intel_dp->reset_link_params =3D true; > = > if (!IS_VALLEYVIEW(dev_priv) && !IS_CHERRYVIEW(dev_priv) && > -- = > 2.26.2 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx