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.3 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 6B6A6C352A3 for ; Mon, 10 Feb 2020 11:02:20 +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 47AA820733 for ; Mon, 10 Feb 2020 11:02:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 47AA820733 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 D61ED6EBED; Mon, 10 Feb 2020 11:02:19 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 15FFA6EBED for ; Mon, 10 Feb 2020 11:02:18 +0000 (UTC) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Feb 2020 03:02:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,424,1574150400"; d="scan'208";a="226168387" Received: from labuser-z97x-ud5h.jf.intel.com (HELO intel.com) ([10.165.21.211]) by fmsmga007.fm.intel.com with ESMTP; 10 Feb 2020 03:02:17 -0800 Date: Mon, 10 Feb 2020 03:03:35 -0800 From: Manasi Navare To: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Message-ID: <20200210110335.GB5808@intel.com> References: <20200203074756.10549-1-manasi.d.navare@intel.com> <20200203074756.10549-3-manasi.d.navare@intel.com> <20200205143248.GI13686@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200205143248.GI13686@intel.com> User-Agent: Mutt/1.5.24 (2015-08-30) Subject: Re: [Intel-gfx] [PATCH v2 3/3] drm/i915/dp: Add all tiled and port sync conns to 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 Wed, Feb 05, 2020 at 04:32:48PM +0200, Ville Syrj=E4l=E4 wrote: > On Sun, Feb 02, 2020 at 11:47:56PM -0800, Manasi Navare wrote: > > If one of the synced crtcs needs a full modeset, we need > > to make sure all the synced crtcs are forced a full > > modeset. > > = > > v2: > > * Add tiles based on cpu_trans check (Ville) > > = > > Suggested-by: Ville Syrj=E4l=E4 > > Cc: Ville Syrj=E4l=E4 > > Signed-off-by: Manasi Navare > > --- > > drivers/gpu/drm/i915/display/intel_display.c | 85 ----------- > > drivers/gpu/drm/i915/display/intel_dp.c | 142 ++++++++++++++++++- > > 2 files changed, 141 insertions(+), 86 deletions(-) > > = > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu= /drm/i915/display/intel_display.c > > index a943787167de..6383d1287472 100644 > > --- a/drivers/gpu/drm/i915/display/intel_display.c > > +++ b/drivers/gpu/drm/i915/display/intel_display.c > > @@ -14669,76 +14669,6 @@ static bool intel_cpu_transcoders_need_modeset= (struct intel_atomic_state *state, > > return false; > > } > > = > > -static int > > -intel_modeset_all_tiles(struct intel_atomic_state *state, int tile_grp= _id) > > -{ > > - struct drm_i915_private *dev_priv =3D to_i915(state->base.dev); > > - struct drm_connector *connector; > > - struct drm_connector_list_iter conn_iter; > > - int ret =3D 0; > > - > > - drm_connector_list_iter_begin(&dev_priv->drm, &conn_iter); > > - drm_for_each_connector_iter(connector, &conn_iter) { > > - struct drm_connector_state *conn_state; > > - struct drm_crtc_state *crtc_state; > > - > > - if (!connector->has_tile || > > - connector->tile_group->id !=3D tile_grp_id) > > - continue; > > - conn_state =3D drm_atomic_get_connector_state(&state->base, > > - connector); > > - if (IS_ERR(conn_state)) { > > - ret =3D PTR_ERR(conn_state); > > - break; > > - } > > - > > - if (!conn_state->crtc) > > - continue; > > - > > - crtc_state =3D drm_atomic_get_crtc_state(&state->base, > > - conn_state->crtc); > > - if (IS_ERR(crtc_state)) { > > - ret =3D PTR_ERR(crtc_state); > > - break; > > - } > > - crtc_state->mode_changed =3D true; > > - ret =3D drm_atomic_add_affected_connectors(&state->base, > > - conn_state->crtc); > > - if (ret) > > - break; > > - } > > - drm_connector_list_iter_end(&conn_iter); > > - > > - return ret; > > -} > > - > > -static int > > -intel_atomic_check_tiled_conns(struct intel_atomic_state *state) > > -{ > > - struct drm_i915_private *dev_priv =3D to_i915(state->base.dev); > > - struct drm_connector *connector; > > - struct drm_connector_state *old_conn_state, *new_conn_state; > > - int i, ret; > > - > > - if (INTEL_GEN(dev_priv) < 11) > > - return 0; > > - > > - /* Is tiled, mark all other tiled CRTCs as needing a modeset */ > > - for_each_oldnew_connector_in_state(&state->base, connector, > > - old_conn_state, new_conn_state, i) { > > - if (!connector->has_tile) > > - continue; > > - if (!intel_connector_needs_modeset(state, connector)) > > - continue; > > - > > - ret =3D intel_modeset_all_tiles(state, connector->tile_group->id); > > - if (ret) > > - return ret; > > - } > > - > > - return 0; > > -} > > - > > /** > > * intel_atomic_check - validate state object > > * @dev: drm device > > @@ -14767,21 +14697,6 @@ static int intel_atomic_check(struct drm_devic= e *dev, > > if (ret) > > goto fail; > > = > > - /** > > - * This check adds all the connectors in current state that belong to > > - * the same tile group to a full modeset. > > - * This function directly sets the mode_changed to true and we also c= all > > - * drm_atomic_add_affected_connectors(). Hence we are not explicitly > > - * calling drm_atomic_helper_check_modeset() after this. > > - * > > - * Fixme: Handle some corner cases where one of the > > - * tiled connectors gets disconnected and tile info is lost but since= it > > - * was previously synced to other conn, we need to add that to the mo= deset. > > - */ > > - ret =3D intel_atomic_check_tiled_conns(state); > > - if (ret) > > - goto fail; > > - > > for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state, > > new_crtc_state, i) { > > if (!needs_modeset(new_crtc_state)) { > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/= i915/display/intel_dp.c > > index f4dede6253f8..07f0374d4409 100644 > > --- a/drivers/gpu/drm/i915/display/intel_dp.c > > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > > @@ -6582,6 +6582,146 @@ void intel_dp_encoder_reset(struct drm_encoder = *encoder) > > } > > } > > = > > +static int intel_modeset_tile_group(struct intel_atomic_state *state, > > + int tile_group_id) > > +{ > > + struct drm_i915_private *dev_priv =3D to_i915(state->base.dev); > > + struct drm_connector_list_iter conn_iter; > > + struct drm_connector *connector; > > + int ret =3D 0; > > + > > + drm_connector_list_iter_begin(&dev_priv->drm, &conn_iter); > > + drm_for_each_connector_iter(connector, &conn_iter) { > > + struct drm_connector_state *conn_state; > > + struct intel_crtc_state *crtc_state; > > + struct intel_crtc *crtc; > > + > > + if (!connector->has_tile || > > + connector->tile_group->id !=3D tile_group_id) > > + continue; > > + > > + conn_state =3D drm_atomic_get_connector_state(&state->base, > > + connector); > > + if (IS_ERR(conn_state)) { > > + ret =3D PTR_ERR(conn_state); > > + break; > > + } > > + > > + crtc =3D to_intel_crtc(conn_state->crtc); > > + > > + if (!crtc) > > + continue; > > + > > + crtc_state =3D intel_atomic_get_crtc_state(&state->base, crtc); > = > I think this could just be get_new_crtc_state() since > drm_atomic_get_connector_state() should have added the > connector's crtc already to the state. Which would let us > get rid of the error handling here. > Okay will make that change so just call intel_atomic_get_new_crtc_state() a= nd no error check for that = > > + if (IS_ERR(crtc_state)) { > > + ret =3D PTR_ERR(crtc_state); > > + break; > > + } > > + > > + crtc_state->uapi.mode_changed =3D true; > > + > > + ret =3D drm_atomic_add_affected_planes(&state->base, &crtc->base); > > + if (ret) > > + break; > > + } > > + drm_connector_list_iter_begin(&dev_priv->drm, &conn_iter); > > + > > + return ret; > > +} > > + > > +static int intel_modeset_affected_transcoders(struct intel_atomic_stat= e *state, u8 transcoders) > > +{ > > + struct drm_i915_private *dev_priv =3D to_i915(state->base.dev); > > + struct intel_crtc *crtc; > > + > > + if (transcoders =3D=3D 0) > > + return 0; > > + > > + for_each_intel_crtc(&dev_priv->drm, crtc) { > > + struct intel_crtc_state *crtc_state; > > + int ret; > > + > > + crtc_state =3D intel_atomic_get_crtc_state(&state->base, crtc); > > + if (IS_ERR(crtc_state)) > > + return PTR_ERR(crtc_state); > > + > > + if (!crtc_state->hw.enable) > > + continue; > > + > > + if (!(transcoders & BIT(crtc_state->cpu_transcoder))) > > + continue; > > + > > + crtc_state->uapi.mode_changed =3D true; > > + > > + ret =3D drm_atomic_add_affected_connectors(&state->base, &crtc->base= ); > > + if (ret) > > + return ret; > > + > > + ret =3D drm_atomic_add_affected_planes(&state->base, &crtc->base); > > + if (ret) > > + return ret; > > + > > + transcoders &=3D ~BIT(crtc_state->cpu_transcoder); > > + } > > + > > + WARN_ON(transcoders !=3D 0); > > + > > + return 0; > > +} > > + > > +static int intel_modeset_synced_crtcs(struct intel_atomic_state *state, > > + struct drm_connector *connector) > > +{ > > + const struct drm_connector_state *old_conn_state =3D > > + drm_atomic_get_old_connector_state(&state->base, connector); > > + const struct intel_crtc_state *old_crtc_state; > > + struct intel_crtc *crtc; > > + u8 transcoders; > > + > > + crtc =3D to_intel_crtc(old_conn_state->crtc); > > + if (!crtc) > > + return 0; > > + > > + old_crtc_state =3D intel_atomic_get_old_crtc_state(state, crtc); > > + > > + if (!old_crtc_state->hw.active) > > + return 0; > > + > > + transcoders =3D old_crtc_state->sync_mode_slaves_mask; > > + if (old_crtc_state->master_transcoder !=3D INVALID_TRANSCODER) > > + transcoders |=3D BIT(old_crtc_state->master_transcoder); > > + > > + return intel_modeset_affected_transcoders(state, > > + transcoders & > > + ~BIT(old_crtc_state->cpu_transcoder)); > = > As I said in the previous review cycle the '&~BIT(cpu_trans)' should > be a nop. So can just drop it. > Okay will remove that and thanks for the review Manasi = > Otherwise > Reviewed-by: Ville Syrj=E4l=E4 > = > > +} > > + > > +static int intel_dp_connector_atomic_check(struct drm_connector *conn, > > + struct drm_atomic_state *_state) > > +{ > > + struct drm_i915_private *dev_priv =3D to_i915(conn->dev); > > + struct intel_atomic_state *state =3D to_intel_atomic_state(_state); > > + int ret; > > + > > + ret =3D intel_digital_connector_atomic_check(conn, &state->base); > > + if (ret) > > + return ret; > > + > > + if (INTEL_GEN(dev_priv) < 11) > > + return 0; > > + > > + if (!intel_connector_needs_modeset(state, conn)) > > + return 0; > > + > > + if (conn->has_tile) { > > + ret =3D intel_modeset_tile_group(state, conn->tile_group->id); > > + if (ret) > > + return ret; > > + } > > + > > + return intel_modeset_synced_crtcs(state, conn); > > +} > > + > > static const struct drm_connector_funcs intel_dp_connector_funcs =3D { > > .force =3D intel_dp_force, > > .fill_modes =3D drm_helper_probe_single_connector_modes, > > @@ -6598,7 +6738,7 @@ static const struct drm_connector_helper_funcs in= tel_dp_connector_helper_funcs =3D > > .detect_ctx =3D intel_dp_detect, > > .get_modes =3D intel_dp_get_modes, > > .mode_valid =3D intel_dp_mode_valid, > > - .atomic_check =3D intel_digital_connector_atomic_check, > > + .atomic_check =3D intel_dp_connector_atomic_check, > > }; > > = > > static const struct drm_encoder_funcs intel_dp_enc_funcs =3D { > > -- = > > 2.19.1 > = > -- = > Ville Syrj=E4l=E4 > Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx