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 BBAD1C43603 for ; Fri, 13 Dec 2019 21:17:50 +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 2F74C20663 for ; Fri, 13 Dec 2019 21:17:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2F74C20663 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 4170F6EDA1; Fri, 13 Dec 2019 21:17:50 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5677D6EDA1 for ; Fri, 13 Dec 2019 21:17:49 +0000 (UTC) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Dec 2019 13:17:48 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,311,1571727600"; d="scan'208";a="265633098" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by FMSMGA003.fm.intel.com with SMTP; 13 Dec 2019 13:17:46 -0800 Received: by stinkbox (sSMTP sendmail emulation); Fri, 13 Dec 2019 23:17:45 +0200 Date: Fri, 13 Dec 2019 23:17:45 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Manasi Navare Message-ID: <20191213211745.GJ1208@intel.com> References: <20191211211425.17821-1-manasi.d.navare@intel.com> <20191211211425.17821-2-manasi.d.navare@intel.com> <20191213200549.GD1208@intel.com> <20191213210547.GG19224@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20191213210547.GG19224@intel.com> User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [Intel-gfx] [PATCH 1/3] drm/i915/dp: Make sure all tiled connectors get added to the state with full modeset 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: 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, Dec 13, 2019 at 01:05:48PM -0800, Manasi Navare wrote: > On Fri, Dec 13, 2019 at 10:05:49PM +0200, Ville Syrj=E4l=E4 wrote: > > On Wed, Dec 11, 2019 at 01:14:23PM -0800, Manasi Navare wrote: > > > In case of tiled displays, all the tiles are linke dto each other > > > for transcoder port sync. So in intel_atomic_check() we need to make > > > sure that we add all the tiles to the modeset and if one of the > > > tiles needs a full modeset then mark all other tiles for a full modes= et. > > > = > > > Suggested-by: Ville Syrj=E4l=E4 > > > Cc: Ville Syrj=E4l=E4 > > > Cc: Jos=E9 Roberto de Souza > > > Bugzilla: https://gitlab.freedesktop.org/drm/intel/issues/5 > > > Signed-off-by: Manasi Navare > > > --- > > > drivers/gpu/drm/i915/display/intel_display.c | 78 ++++++++++++++++++= ++ > > > 1 file changed, 78 insertions(+) > > > = > > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/g= pu/drm/i915/display/intel_display.c > > > index 803993a01ca7..7263eaa66cda 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_display.c > > > +++ b/drivers/gpu/drm/i915/display/intel_display.c > > > @@ -14066,6 +14066,80 @@ static int intel_atomic_check_crtcs(struct i= ntel_atomic_state *state) > > > return 0; > > > } > > > = > > > +static int > > > +intel_dp_modeset_all_tiles(struct drm_i915_private *dev_priv, > > > + struct intel_atomic_state *state, int tile_grp_id) > > > +{ > > > + struct drm_connector *conn_iter; > > 'connector' > = > Ok > = > > > + struct drm_connector_list_iter conn_list_iter; > > > + struct drm_crtc_state *crtc_state; > > = > > crtc_state has needlessly wide scope. > = > Ok will add it inside the loop > = > > = > > > + > > > + drm_connector_list_iter_begin(&dev_priv->drm, &conn_list_iter); > > > + drm_for_each_connector_iter(conn_iter, &conn_list_iter) { > > > + struct drm_connector_state *conn_iter_state; > > = > > 'conn_state' is the most popular name. > > = > > > + > > > + if (!conn_iter->has_tile) > > > + continue; > > > + conn_iter_state =3D drm_atomic_get_connector_state(&state->base, > > > + conn_iter); > > > + if (IS_ERR(conn_iter_state)) { > > > + drm_connector_list_iter_end(&conn_list_iter); > > > + return PTR_ERR(conn_iter_state); > > > + } > > > + > > > + if (!conn_iter_state->crtc) > > > + continue; > > > + > > > + if (conn_iter->tile_group->id !=3D tile_grp_id) > > > + continue; > > = > > The tile group check should be part of the same if with the has_tile > > check. > = > Ok yes. So not pass the tile grp id at all just compare with current > connector's tile_grp_id ? You still need to pass in the tile_grp_id from the caller's current connector. What I meant is that you should do = if (!connector->has_tile || connector->tile_grp !=3D tile_grp) continue; before you do the drm_atomic_get_connector_state(). We don't want to needlessly add connectors belonging to some other tile group to our atomic state. > = > > = > > > + > > > + crtc_state =3D drm_atomic_get_crtc_state(&state->base, conn_iter_s= tate->crtc); > > > + if (IS_ERR(crtc_state)) { > > > + drm_connector_list_iter_end(&conn_list_iter); > > > + return PTR_ERR(conn_iter_state); > > > + } > > > + crtc_state->mode_changed =3D true; > > > + } > > > + drm_connector_list_iter_end(&conn_list_iter); > > > + > > > + return 0; > > > +} > > > + > > > +static int > > > +intel_dp_atomic_trans_port_sync_check(struct drm_i915_private *dev_p= riv, > > = > > Pointless variable. Can be extracted from the atomic state. > > = > > > + struct intel_atomic_state *state) > > > +{ > > > + struct drm_connector *connector; > > > + struct drm_crtc_state *crtc_state; > > > + struct drm_connector_state *connector_state; > > > + int i, ret, tile_grp_id =3D 0; > > = > > tile_grp_id is rather pointless. crtc_state and ret can move into > > tighter scope. And the next suggestion allows you to kill crtc_state > > entirely... > = > tile_grp_id is useless because I should just use it from current connect= or obtained from state? I just meant that you use that variable exactly once. So instead you can just directly do: ret =3D intel_dp_modeset_all_tiles(state, connector->tile_grp_id); ... > = > > = > > > + > > > + if (INTEL_GEN(dev_priv) < 11) > > > + return 0; > > > + > > > + /* Is tiled, mark all other tiled CRTCs as needing a modeset */ > > > + for_each_new_connector_in_state(&state->base, connector, connector_= state, i) { > > > + if (!connector->has_tile) > > > + continue; > > > + if (connector_state->crtc && > > > + tile_grp_id !=3D connector->tile_group->id) { > > > + crtc_state =3D drm_atomic_get_new_crtc_state(&state->base, > > > + connector_state->crtc); > > > + if (!drm_atomic_crtc_needs_modeset(crtc_state)) > > > + continue; > > = > > This should to be able to be shortened to just intel_connector_needs_mo= deset(). > = > Ok will use that instead. > = > > = > > > + > > > + tile_grp_id =3D connector->tile_group->id; > > > + } else > > > + continue; > > > + > > > + ret =3D intel_dp_modeset_all_tiles(dev_priv, state, tile_grp_id); > > > + if (ret) > > > + return ret; > > > + } > > > + > > > + return 0; > > > +} > > > + > > > /** > > > * intel_atomic_check - validate state object > > > * @dev: drm device > > > @@ -14093,6 +14167,10 @@ static int intel_atomic_check(struct drm_dev= ice *dev, > > > if (ret) > > > goto fail; > > > = > > > + ret =3D intel_dp_atomic_trans_port_sync_check(dev_priv, state); > > > + if (ret) > > > + goto fail; > > = > > We should probably do this from the connector .atomic_check() hook if > > Jose is going to do the MST thing that way. But no real problem doing > > here I think. > = > If you dont have a strong preference I will leave it here since Jose's co= de is not in yet. > = > Manasi > = > > = > > > + > > > for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state, > > > new_crtc_state, i) { > > > if (!needs_modeset(new_crtc_state)) { > > > -- = > > > 2.19.1 > > = > > -- = > > Ville Syrj=E4l=E4 > > Intel -- = Ville Syrj=E4l=E4 Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx