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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B7C13C433EF for ; Mon, 4 Oct 2021 11:38:01 +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 3C92D6120C for ; Mon, 4 Oct 2021 11:38:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3C92D6120C 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=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A4CD66E9C3; Mon, 4 Oct 2021 11:37:57 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5C4656E1A8; Mon, 4 Oct 2021 11:37:56 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10126"; a="222841227" X-IronPort-AV: E=Sophos;i="5.85,345,1624345200"; d="scan'208";a="222841227" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Oct 2021 04:37:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,345,1624345200"; d="scan'208";a="622090999" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.171]) by fmsmga001.fm.intel.com with SMTP; 04 Oct 2021 04:37:52 -0700 Received: by stinkbox (sSMTP sendmail emulation); Mon, 04 Oct 2021 14:37:52 +0300 Date: Mon, 4 Oct 2021 14:37:52 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Manasi Navare Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Simon Ser , Pekka Paalanen , Daniel Stone , Daniel Vetter Message-ID: References: <20211004113629.23715-1-manasi.d.navare@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20211004113629.23715-1-manasi.d.navare@intel.com> X-Patchwork-Hint: comment Subject: Re: [Intel-gfx] [PATCH v2] 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Mon, Oct 04, 2021 at 04:36:29AM -0700, Manasi Navare wrote: > In case of a modeset where a mode gets split across mutiple CRTCs > in the driver specific implementation (bigjoiner in i915) we wrongly count > the affected CRTCs based on the drm_crtc_mask and indicate the stolen CRTC as > an affected CRTC in atomic_check_only(). > This triggers a warning since affected CRTCs doent match requested CRTC. > > To fix this in such bigjoiner configurations, we should only > increment affected crtcs if that CRTC is enabled in UAPI not > if it is just used internally in the driver to split the mode. > > There is no way we can adjust requested_crtc calculation as suggested > in review comments because the crtc gets stolen only after the atomic_check call. The uapi crtc_state->enable value does not change due to bigjoiner stealing the crtc. So I don't understand what you're trying to say here. The only internal thing that could alter the set of enabled crtcs on the uapi level is update_connector_routing(true), but that is always called before drm_atomic_check_only(). > > Cc: Ville Syrjälä > Cc: Simon Ser > Cc: Pekka Paalanen > Cc: Daniel Stone > Cc: Daniel Vetter > Cc: dri-devel@lists.freedesktop.org > Signed-off-by: Manasi Navare > --- > drivers/gpu/drm/drm_atomic.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c > index ff1416cd609a..44e7ebf43a2a 100644 > --- a/drivers/gpu/drm/drm_atomic.c > +++ b/drivers/gpu/drm/drm_atomic.c > @@ -1360,8 +1360,10 @@ int drm_atomic_check_only(struct drm_atomic_state *state) > } > } > > - for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) > - affected_crtc |= drm_crtc_mask(crtc); > + for_each_new_crtc_in_state(state, crtc, new_crtc_state, i) { > + if (new_crtc_state->enable) > + affected_crtc |= drm_crtc_mask(crtc); > + } > > /* > * For commits that allow modesets drivers can add other CRTCs to the > -- > 2.19.1 -- Ville Syrjälä Intel