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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 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 D0C7FC43603 for ; Wed, 18 Dec 2019 20:26:58 +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 9B0B421582 for ; Wed, 18 Dec 2019 20:26:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9B0B421582 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.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 454626EA78; Wed, 18 Dec 2019 20:26:58 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 288F46EA78 for ; Wed, 18 Dec 2019 20:26:57 +0000 (UTC) X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Dec 2019 12:26:56 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,330,1571727600"; d="scan'208";a="212800008" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by fmsmga007.fm.intel.com with SMTP; 18 Dec 2019 12:26:54 -0800 Received: by stinkbox (sSMTP sendmail emulation); Wed, 18 Dec 2019 22:26:53 +0200 Date: Wed, 18 Dec 2019 22:26:53 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: "Souza, Jose" Message-ID: <20191218202653.GC1208@intel.com> References: <20191218185910.303540-1-jose.souza@intel.com> <20191218185910.303540-5-jose.souza@intel.com> <20191218193917.GY1208@intel.com> <26caae27943611264d8b3a112e8089eab203083a.camel@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <26caae27943611264d8b3a112e8089eab203083a.camel@intel.com> User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [Intel-gfx] [PATCH v4 5/6] drm/i915/display: Check if pipe fastset is allowed by external dependencies 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: "De Marchi, Lucas" , "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 Wed, Dec 18, 2019 at 08:19:15PM +0000, Souza, Jose wrote: > On Wed, 2019-12-18 at 21:39 +0200, Ville Syrj=E4l=E4 wrote: > > On Wed, Dec 18, 2019 at 10:59:09AM -0800, Jos=E9 Roberto de Souza > > wrote: > > > Check if fastset is allowed by external dependencies like other > > > pipes > > > and transcoders. > > > = > > > Right now this patch only forces a fullmodeset in MST slaves of MST > > > masters that needs a fullmodeset but it will be needed for port > > > sync > > > as well. > > > = > > > v3: > > > - moved handling to intel_atomic_check() this way is guarantee that > > > all pipes will have its state computed > > > = > > > v4: > > > - added a function to return if MST master neeeds modeset to simply > > > code in intel_atomic_check() > > > = > > > Cc: Ville Syrj=E4l=E4 > > > Cc: Lucas De Marchi > > > Cc: Maarten Lankhorst > > > Cc: Manasi Navare > > > Signed-off-by: Jos=E9 Roberto de Souza > > > --- > > > drivers/gpu/drm/i915/display/intel_display.c | 53 +++++++++++++++- > > > ---- > > > drivers/gpu/drm/i915/display/intel_dp_mst.c | 14 ++++++ > > > drivers/gpu/drm/i915/display/intel_dp_mst.h | 3 ++ > > > 3 files changed, 57 insertions(+), 13 deletions(-) > > > = > > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c > > > b/drivers/gpu/drm/i915/display/intel_display.c > > > index a4f252d05b37..2a406891567b 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_display.c > > > +++ b/drivers/gpu/drm/i915/display/intel_display.c > > > @@ -13903,19 +13903,6 @@ static void intel_crtc_check_fastset(const > > > struct intel_crtc_state *old_crtc_sta > > > = > > > new_crtc_state->uapi.mode_changed =3D false; > > > new_crtc_state->update_pipe =3D true; > > > - > > > - /* > > > - * If we're not doing the full modeset we want to > > > - * keep the current M/N values as they may be > > > - * sufficiently different to the computed values > > > - * to cause problems. > > > - * > > > - * FIXME: should really copy more fuzzy state here > > > - */ > > > - new_crtc_state->fdi_m_n =3D old_crtc_state->fdi_m_n; > > > - new_crtc_state->dp_m_n =3D old_crtc_state->dp_m_n; > > > - new_crtc_state->dp_m2_n2 =3D old_crtc_state->dp_m2_n2; > > > - new_crtc_state->has_drrs =3D old_crtc_state->has_drrs; > > > } > > > = > > > static int intel_crtc_add_planes_to_state(struct > > > intel_atomic_state *state, > > > @@ -14083,6 +14070,46 @@ static int intel_atomic_check(struct > > > drm_device *dev, > > > any_ms =3D true; > > > } > > > = > > > + /** > > > + * Check if fastset is allowed by external dependencies like > > > other > > > + * pipes and transcoders. > > > + * > > > + * Right now it only forces a fullmodeset when the MST master > > > + * transcoder did not changed but the pipe of the master > > > transcoder > > > + * needs a fullmodeset so all slaves also needs to do a > > > fullmodeset. > > > + */ > > > + for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, > > > i) { > > > + enum transcoder master =3D new_crtc_state- > > > >mst_master_transcoder; > > > + > > > + if (!intel_dp_mst_is_slave_trans(new_crtc_state) || > > > + needs_modeset(new_crtc_state)) > > > + continue; > > > + > > > + if (intel_dp_mst_master_trans_needs_modeset(state, > > > master)) { > > = > > I think this has the loops the opposite way of what I was thinking, > > but should work fine I think... OK. I'm convinced your way is in fact > > better. > > = > > > + new_crtc_state->uapi.mode_changed =3D true; > > > + new_crtc_state->update_pipe =3D false; > > > + } > > > + } > > > + > > > + for_each_oldnew_intel_crtc_in_state(state, crtc, > > > old_crtc_state, > > > + new_crtc_state, i) { > > > + if (needs_modeset(new_crtc_state)) > > > + continue; > > = > > I suppose there isn't any way we should have crtcs in the state that > > neither have update_pipe or needs_modeset flagged here. Could maybe > > WARN_ON(!update_pipe) here if we're being paranoid. > = > Adding the WARN_ON > = > > = > > > + > > > + /* > > > + * If we're not doing the full modeset we want to > > > + * keep the current M/N values as they may be > > > + * sufficiently different to the computed values > > > + * to cause problems. > > > + * > > > + * FIXME: should really copy more fuzzy state here > > > + */ > > > + new_crtc_state->fdi_m_n =3D old_crtc_state->fdi_m_n; > > > + new_crtc_state->dp_m_n =3D old_crtc_state->dp_m_n; > > > + new_crtc_state->dp_m2_n2 =3D old_crtc_state->dp_m2_n2; > > > + new_crtc_state->has_drrs =3D old_crtc_state->has_drrs; > > = > > Still a bit unhappy having this state copy inlined in > > intel_atomic_check(). > > = > > > + } > > > + > > > if (any_ms && !check_digital_port_conflicts(state)) { > > > DRM_DEBUG_KMS("rejecting conflicting digital port > > > configuration\n"); > > > ret =3D EINVAL; > > > diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c > > > b/drivers/gpu/drm/i915/display/intel_dp_mst.c > > > index efd14b0b507b..4aba1d702a83 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c > > > +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c > > > @@ -854,3 +854,17 @@ bool intel_dp_mst_is_slave_trans(const struct > > > intel_crtc_state *crtc_state) > > > return crtc_state->mst_master_transcoder !=3D INVALID_TRANSCODER > > > && > > > crtc_state->mst_master_transcoder !=3D crtc_state- > > > >cpu_transcoder; > > > } > > > + > > > +bool intel_dp_mst_master_trans_needs_modeset(struct > > > intel_atomic_state *state, > > > + enum transcoder master) > > = > > Are we going to need this elsewhere? Or be static in intel_display.c? > > Not that people are 100% happy of stuffing everything in there. > = > Not needed elsewhere, I'm also trying to not put more stuff in > intel_display.c. > = > > = > > > +{ > > > + struct intel_crtc_state *new_crtc_state; > > > + struct intel_crtc *crtc; > > > + int i; > > > + > > > + for_each_new_intel_crtc_in_state(state, crtc, new_crtc_state, > > > i) > > > + if (new_crtc_state->mst_master_transcoder =3D=3D master) > > = > > So we need to modeset everything when either the master or any > > other slave wants to modeset? That is, we can't just modeset slaves > > independently and only force the modesets for all slaves if the > > master > > needs a modeset? > = > If a slave needs a modeset we don't need to do a modeset in master or > in other slaves. > = > This is doing independent modeset in slaves and forcing modeset to all > slaves when master needs as modeset. If you just wanted to check if the master needs a modeset then shouldn't it just compare crtc_state->cpu_transcoder =3D=3D master? And in that case it's not at all MST specific and we could just call it intel_cpu_transcoder_needs_modeset() or something. > = > > = > > > + return > > > drm_atomic_crtc_needs_modeset(&new_crtc_state->uapi); > > > + > > > + return false; > > > +} > > > diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.h > > > b/drivers/gpu/drm/i915/display/intel_dp_mst.h > > > index 854724f68f09..72cb486f32ab 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_dp_mst.h > > > +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.h > > > @@ -8,6 +8,7 @@ > > > = > > > #include > > > = > > > +struct intel_atomic_state; > > > struct intel_digital_port; > > > struct intel_crtc_state; > > > = > > > @@ -16,5 +17,7 @@ void intel_dp_mst_encoder_cleanup(struct > > > intel_digital_port *intel_dig_port); > > > int intel_dp_mst_encoder_active_links(struct intel_digital_port > > > *intel_dig_port); > > > bool intel_dp_mst_is_master_trans(const struct intel_crtc_state > > > *crtc_state); > > > bool intel_dp_mst_is_slave_trans(const struct intel_crtc_state > > > *crtc_state); > > > +bool intel_dp_mst_master_trans_needs_modeset(struct > > > intel_atomic_state *state, > > > + enum transcoder master); > > > = > > > #endif /* __INTEL_DP_MST_H__ */ > > > -- = > > > 2.24.1 -- = Ville Syrj=E4l=E4 Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx