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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 1E5DDC4320A for ; Mon, 16 Aug 2021 15:35:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0576D6103A for ; Mon, 16 Aug 2021 15:35:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236242AbhHPPf5 (ORCPT ); Mon, 16 Aug 2021 11:35:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236237AbhHPPfz (ORCPT ); Mon, 16 Aug 2021 11:35:55 -0400 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8DB5C0613C1 for ; Mon, 16 Aug 2021 08:35:22 -0700 (PDT) Received: by mail-ed1-x536.google.com with SMTP id q3so22975696edt.5 for ; Mon, 16 Aug 2021 08:35:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=IasKvmj0grPyZpclaR8IMBAIBRCjZoEN6q1hySOpIx8=; b=FLJi4iZUP8UiTgTh2IzZR2WM5wp0UlezFnpQ0+W4dKvlP/Bp0N/xwQ5xVJ8QzlbwcW FfqgUTOGQVSAZ6lhJSKcNchtnt2bnEjmau/bBsT9uARYt77GapvGf8OEOjjT0jXDRZQe 3IopPSjLA0oQ60FwNzj8SQ1orL3ysEbohceDs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to; bh=IasKvmj0grPyZpclaR8IMBAIBRCjZoEN6q1hySOpIx8=; b=RvHESVGntx9B7r6vepQIwfnvdi2EUtFOOkWL4C11Hyds/uT7Gwma85NqXyNVerb/Tv /STvRBueKSK2mPBMIb9KRUPpZLtzjvUOF6z4GkJPwjqwSb2+CBkRMHZrAuLc3u6C8tX9 BZnV2oePUK9qJGeWjPMnpgN9F/ZKYHIUs2HDyxXOitYs8Vef4B4Hm3FTcq4lKfqttlnT 5Ovx1lfu0qZjtcPlailHC7FhWRHzNsggYT29wR4ukmBlrQIUTbIGjNNuz3uvofTk0fWQ R89PdidiJBWV0kZ2qeYkS07Rx9uzudVzSRrNzCBSOWGMayirE9C9fCdd2TniMeMFhIja 8bng== X-Gm-Message-State: AOAM5327JjT4SyO/Fg4C5kU2OCM1HMaebVoGu8I+Kv1eOhPPG153An2L Y6H5io94xV9/FFvSCZV/YdB1nQ== X-Google-Smtp-Source: ABdhPJw86Us3yeAl8Ak8OflhLTWRhOuq8mFn02KQKAqblo+89lWzBRM05emXkzKLODsMjl1K7NUN0w== X-Received: by 2002:a05:6402:328:: with SMTP id q8mr21378867edw.84.1629128121309; Mon, 16 Aug 2021 08:35:21 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id wc16sm3821383ejb.15.2021.08.16.08.35.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Aug 2021 08:35:20 -0700 (PDT) Date: Mon, 16 Aug 2021 17:35:18 +0200 From: Daniel Vetter To: Rob Clark Cc: dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Daniel Vetter , Christian =?iso-8859-1?Q?K=F6nig?= , Rob Clark , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , open list Subject: Re: [PATCH v2 3/5] drm/atomic-helper: Set fence deadline for vblank Message-ID: Mail-Followup-To: Rob Clark , dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Christian =?iso-8859-1?Q?K=F6nig?= , Rob Clark , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , open list References: <20210807183804.459850-1-robdclark@gmail.com> <20210807183804.459850-4-robdclark@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210807183804.459850-4-robdclark@gmail.com> X-Operating-System: Linux phenom 5.10.0-7-amd64 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On Sat, Aug 07, 2021 at 11:37:57AM -0700, Rob Clark wrote: > From: Rob Clark > > For an atomic commit updating a single CRTC (ie. a pageflip) calculate > the next vblank time, and inform the fence(s) of that deadline. > > Signed-off-by: Rob Clark > --- > drivers/gpu/drm/drm_atomic_helper.c | 36 +++++++++++++++++++++++++++++ > 1 file changed, 36 insertions(+) > > diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c > index bc3487964fb5..7caa2c3cc304 100644 > --- a/drivers/gpu/drm/drm_atomic_helper.c > +++ b/drivers/gpu/drm/drm_atomic_helper.c > @@ -1406,6 +1406,40 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, > } > EXPORT_SYMBOL(drm_atomic_helper_commit_modeset_enables); > > +/* > + * For atomic updates which touch just a single CRTC, calculate the time of the > + * next vblank, and inform all the fences of the of the deadline. s/of the// Otherwise lgtm, Reviewed-by: Daniel Vetter > + */ > +static void set_fence_deadline(struct drm_device *dev, > + struct drm_atomic_state *state) > +{ > + struct drm_crtc *crtc, *wait_crtc = NULL; > + struct drm_crtc_state *new_crtc_state; > + struct drm_plane *plane; > + struct drm_plane_state *new_plane_state; > + ktime_t vbltime; > + int i; > + > + for_each_new_crtc_in_state (state, crtc, new_crtc_state, i) { > + if (wait_crtc) > + return; > + wait_crtc = crtc; > + } > + > + /* If no CRTCs updated, then nothing to do: */ > + if (!wait_crtc) > + return; > + > + if (drm_crtc_next_vblank_time(wait_crtc, &vbltime)) > + return; > + > + for_each_new_plane_in_state (state, plane, new_plane_state, i) { > + if (!new_plane_state->fence) > + continue; > + dma_fence_set_deadline(new_plane_state->fence, vbltime); > + } > +} > + > /** > * drm_atomic_helper_wait_for_fences - wait for fences stashed in plane state > * @dev: DRM device > @@ -1435,6 +1469,8 @@ int drm_atomic_helper_wait_for_fences(struct drm_device *dev, > struct drm_plane_state *new_plane_state; > int i, ret; > > + set_fence_deadline(dev, state); > + > for_each_new_plane_in_state(state, plane, new_plane_state, i) { > if (!new_plane_state->fence) > continue; > -- > 2.31.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch