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=-5.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=no 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 B10D6C433DB for ; Thu, 25 Mar 2021 21:55:15 +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 75AA461A27 for ; Thu, 25 Mar 2021 21:55:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 75AA461A27 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 2D1F16EE50; Thu, 25 Mar 2021 21:55:10 +0000 (UTC) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id DF6DC6EE4F; Thu, 25 Mar 2021 21:55:08 +0000 (UTC) IronPort-SDR: 3JcU/HPjqoEmD39rftkOolKMPXwIMQ+ECpzBxebL14cIN61OqdvLKBZx6toakD0nap5WlRPUEU e4h7UR0TlXGQ== X-IronPort-AV: E=McAfee;i="6000,8403,9934"; a="191058696" X-IronPort-AV: E=Sophos;i="5.81,278,1610438400"; d="scan'208";a="191058696" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Mar 2021 14:55:07 -0700 IronPort-SDR: HBODvaZ+c4jacKSUkSUvCXO5+0XhKi/OpVsvVudfwU4Z5GpvRGa1sC2Pw8Cewfoe2+hAzsfTch ViYHxLYIBm9g== X-IronPort-AV: E=Sophos;i="5.81,278,1610438400"; d="scan'208";a="409566502" Received: from labuser-z97x-ud5h.jf.intel.com (HELO labuser-Z97X-UD5H) ([10.165.21.211]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Mar 2021 14:55:07 -0700 Date: Thu, 25 Mar 2021 15:01:29 -0700 From: "Navare, Manasi" To: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Message-ID: <20210325220127.GA28898@labuser-Z97X-UD5H> References: <20210304104223.6b3490bc@eldfell> <20210309005252.GA27491@labuser-Z97X-UD5H> <20210309111350.3be0543f@eldfell> <20210318230126.GA1900@labuser-Z97X-UD5H> <20210319205413.GA6359@labuser-Z97X-UD5H> <20210319212624.GA6560@labuser-Z97X-UD5H> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.24 (2015-08-30) Subject: Re: [Intel-gfx] [PATCH] drm/atomic: Add the crtc to affected crtc only if uapi.enable = true 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: Daniel Vetter , intel-gfx , dri-devel , Daniel Stone 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, Mar 19, 2021 at 11:27:59PM +0200, Ville Syrj=E4l=E4 wrote: > On Fri, Mar 19, 2021 at 02:26:24PM -0700, Navare, Manasi wrote: > > On Fri, Mar 19, 2021 at 11:12:41PM +0200, Ville Syrj=E4l=E4 wrote: > > > On Fri, Mar 19, 2021 at 01:54:13PM -0700, Navare, Manasi wrote: > > > > On Fri, Mar 19, 2021 at 04:56:24PM +0200, Ville Syrj=E4l=E4 wrote: > > > > > On Thu, Mar 18, 2021 at 04:01:26PM -0700, Navare, Manasi wrote: > > > > > > So basically we see this warning only in case of bigjoiner when > > > > > > drm_atomic_check gets called without setting the state->allow_m= odeset flag. > > > > > = > > > > > Considering the code is 'WARN(!state->allow_modeset, ...' that > > > > > fact should be rather obvious. > > > > > = > > > > > > = > > > > > > So do you think that in i915, in intel_atomic_check_bigjoiner()= we should only > > > > > > steal the crtc when allow_modeset flag is set in state? > > > > > = > > > > > No. If you fully read drm_atomic_check_only() you will observe > > > > > that it will reject any commit w/ allow_modeset=3D=3Dfalse which = > > > > > needs a modeset. And it does that before the WARN. > > > > > = > > > > > So you're barking up the wrong tree here. The problem I think > > > > > is that you're just computing requested_crtcs wrong. > > > > = > > > > So here in this case, requested CRTC =3D 0x1 since it requests mode= set on CRTC 0 > > > > Now in teh atomic check, it steals the slave CRTC 1 and hence affec= ted CRTC comes out > > > > as 0x3 and hence the mismatch. > > > = > > > Hmm. How can it be 0x3 if we filtered out the uapi.enable=3D=3Dfalse = case? > > > = > > = > > Yes if I add that condition like in this patch then it correctly calcul= ates > > the affected crtc bitmask as only 0x1 since it doesnt include the slave= crtc. > > So with this patch, requested crtc =3D 0x 1, affected crtc =3D 0x1 > > = > > If this looks good then this fixes our bigjoiner warnings. > > Does this patch look good to you as is then? > = > I think you still need to fix the requested_crtcs calculation. We calculate requested crtc at the beginning : for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) requested_crtc |=3D drm_crtc_mask(crtc); Are you suggesting adding this to after: if (config->funcs->atomic_check) { ret =3D config->funcs->atomic_check(state->dev, state); if (ret) { DRM_DEBUG_ATOMIC("atomic driver check for %p failed= : %d\n", state, ret); return ret; } requested_crtc |=3D drm_crtc_mask(crtc); // Here it will have requeste= d crtc =3D 0x11 } in this case here the state should already have master crtc 0 and slave crt= c 1 and that requested crtc should already be 0x11 Then in that case we dont need any special check for calculating affected c= rtc, that also will be 0x11 Manasi > = > -- = > Ville Syrj=E4l=E4 > Intel _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx