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 A9446C2D0DB for ; Thu, 23 Jan 2020 18:27:18 +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 8FBF221569 for ; Thu, 23 Jan 2020 18:27:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8FBF221569 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 2C8FE6E0B7; Thu, 23 Jan 2020 18:27:18 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 43A026E0B7 for ; Thu, 23 Jan 2020 18:27:16 +0000 (UTC) X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Jan 2020 10:27:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,354,1574150400"; d="scan'208";a="276112639" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by FMSMGA003.fm.intel.com with SMTP; 23 Jan 2020 10:27:13 -0800 Received: by stinkbox (sSMTP sendmail emulation); Thu, 23 Jan 2020 20:27:12 +0200 Date: Thu, 23 Jan 2020 20:27:12 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Manasi Navare Message-ID: <20200123182712.GV13686@intel.com> References: <20200123002415.31478-1-manasi.d.navare@intel.com> <20200123002415.31478-2-manasi.d.navare@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200123002415.31478-2-manasi.d.navare@intel.com> X-Patchwork-Hint: comment User-Agent: Mutt/1.10.1 (2018-07-13) Subject: Re: [Intel-gfx] [PATCH 2/2] drm/i915/dp: Modeset only the tiled connectors with CRTC 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, Jan 22, 2020 at 04:24:15PM -0800, Manasi Navare wrote: Missing commit msg. > Cc: Ville Syrj=E4l=E4 > Fixes: a603f5bd1691 ("drm/i915/dp: Make sure all tiled connectors get add= ed to the state with full modeset") > Closes: https://gitlab.freedesktop.org/drm/intel/issues/516 > Signed-off-by: Manasi Navare > --- > drivers/gpu/drm/i915/display/intel_display.c | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/d= rm/i915/display/intel_display.c > index 79f9054078ea..c8d6f6e8fc7f 100644 > --- a/drivers/gpu/drm/i915/display/intel_display.c > +++ b/drivers/gpu/drm/i915/display/intel_display.c > @@ -13155,11 +13155,12 @@ intel_modeset_pipe_config(struct intel_crtc_sta= te *pipe_config) > } > = > /* Get total number of tiled connectors in state that belong to > - * this tile group. > + * this tile group and that have a CRTC > */ > for_each_new_connector_in_state(state, connector, connector_state, i) { > if (connector->has_tile && > - connector->tile_group->id =3D=3D tile_group_id) > + connector->tile_group->id =3D=3D tile_group_id && > + connector_state->crtc) It might have a crtc, but that crtc might not be active. So feels like this fixes things more by luck that by design. The real problem of course is that we can't tell whether other crtcs are active or not during intel_modeset_pipe_config(). All pipes must finish that stage before we can make an actual decision based on what's active and what's inactive. And that requires the two stage approach I proposed in my branch before xmas. > num_tiled_conns++; > } > = > @@ -14507,13 +14508,14 @@ intel_modeset_all_tiles(struct intel_atomic_sta= te *state, int 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; > + break; > = > crtc_state =3D drm_atomic_get_crtc_state(&state->base, > conn_state->crtc); > @@ -14550,6 +14552,8 @@ intel_atomic_check_tiled_conns(struct intel_atomi= c_state *state) > continue; > if (!intel_connector_needs_modeset(state, connector)) > continue; > + if (!new_conn_state->crtc) > + continue; > = > ret =3D intel_modeset_all_tiles(state, connector->tile_group->id); > if (ret) > -- = > 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