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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA9C8C61DA3 for ; Tue, 21 Feb 2023 13:01:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233731AbjBUNBx (ORCPT ); Tue, 21 Feb 2023 08:01:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58496 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233618AbjBUNBo (ORCPT ); Tue, 21 Feb 2023 08:01:44 -0500 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1AA92940E for ; Tue, 21 Feb 2023 05:01:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676984502; x=1708520502; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=acdczu8sh+vl0KUoF5rFum01VLOZMhQ4SRvqf3KdLIY=; b=JQV15dWTFBlrGzw7cLL1DxnllghTcRMVpMpMxVsimCKyNAx4B4zttW0C zZNOcBz2Vzmjg/QT5wTArWoAWmXER9gSOgizbMdMgfwT4iza+yvmaMYrP h6o3gvQSUTz3giFICuC4C7lsCQ1FYn0KiJvG1WRcFN63AelF77vRHHYjI +NwTkXmkCFfvQI1/2nXi9DjHhl0V2XlQaDeF68PYJGlkIjjZq3Oa9yL2e W6mrL5df33gw0ZdV6vcNCTfrgETH5lf6FCT7uH50BZutDdI9IWnv0YVLz zeMy9BExeBC0JchPhUHGFLJb8UV7/UMsgbddqGSuGEz7LDeO3WNRCncin g==; X-IronPort-AV: E=McAfee;i="6500,9779,10627"; a="333983817" X-IronPort-AV: E=Sophos;i="5.97,315,1669104000"; d="scan'208";a="333983817" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Feb 2023 05:01:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10627"; a="845666450" X-IronPort-AV: E=Sophos;i="5.97,315,1669104000"; d="scan'208";a="845666450" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.70]) by orsmga005.jf.intel.com with SMTP; 21 Feb 2023 05:01:36 -0800 Received: by stinkbox (sSMTP sendmail emulation); Tue, 21 Feb 2023 15:01:35 +0200 Date: Tue, 21 Feb 2023 15:01:35 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Pekka Paalanen Cc: Rob Clark , Rob Clark , Thomas Zimmermann , Tvrtko Ursulin , Christian =?iso-8859-1?Q?K=F6nig?= , Michel =?iso-8859-1?Q?D=E4nzer?= , open list , dri-devel@lists.freedesktop.org, Rodrigo Vivi , Alex Deucher , freedreno@lists.freedesktop.org Subject: Re: [PATCH v4 10/14] drm/vblank: Add helper to get next vblank time Message-ID: References: <20230218211608.1630586-1-robdclark@gmail.com> <20230218211608.1630586-11-robdclark@gmail.com> <20230220110820.595cfa37@eldfell> <20230221104551.60d44d1c@eldfell> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20230221104551.60d44d1c@eldfell> X-Patchwork-Hint: comment Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Feb 21, 2023 at 10:45:51AM +0200, Pekka Paalanen wrote: > On Mon, 20 Feb 2023 07:55:41 -0800 > Rob Clark wrote: > > > On Mon, Feb 20, 2023 at 1:08 AM Pekka Paalanen wrote: > > > > > > On Sat, 18 Feb 2023 13:15:53 -0800 > > > Rob Clark wrote: > > > > > > > From: Rob Clark > > > > > > > > Will be used in the next commit to set a deadline on fences that an > > > > atomic update is waiting on. > > > > > > > > Signed-off-by: Rob Clark > > > > --- > > > > drivers/gpu/drm/drm_vblank.c | 32 ++++++++++++++++++++++++++++++++ > > > > include/drm/drm_vblank.h | 1 + > > > > 2 files changed, 33 insertions(+) > > > > > > > > diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c > > > > index 2ff31717a3de..caf25ebb34c5 100644 > > > > --- a/drivers/gpu/drm/drm_vblank.c > > > > +++ b/drivers/gpu/drm/drm_vblank.c > > > > @@ -980,6 +980,38 @@ u64 drm_crtc_vblank_count_and_time(struct drm_crtc *crtc, > > > > } > > > > EXPORT_SYMBOL(drm_crtc_vblank_count_and_time); > > > > > > > > +/** > > > > + * drm_crtc_next_vblank_time - calculate the time of the next vblank > > > > + * @crtc: the crtc for which to calculate next vblank time > > > > + * @vblanktime: pointer to time to receive the next vblank timestamp. > > > > + * > > > > + * Calculate the expected time of the next vblank based on time of previous > > > > + * vblank and frame duration > > > > > > Hi, > > > > > > for VRR this targets the highest frame rate possible for the current > > > VRR mode, right? > > > > > > > It is based on vblank->framedur_ns which is in turn based on > > mode->crtc_clock. Presumably for VRR that ends up being a maximum? > > I don't know. :-) At least for i915 this will give you the maximum frame duration. Also this does not calculate the the start of vblank, it calculates the start of active video. > > You need a number of clock cycles in addition to the clock frequency, > and that could still be minimum, maximum, the last realized one, ... > > VRR works by adjusting the front porch length IIRC. > > > Thanks, > pq > > > BR, > > -R > > > > > > > > > > Thanks, > > > pq > > > > > > > + */ > > > > +int drm_crtc_next_vblank_time(struct drm_crtc *crtc, ktime_t *vblanktime) > > > > +{ > > > > + unsigned int pipe = drm_crtc_index(crtc); > > > > + struct drm_vblank_crtc *vblank = &crtc->dev->vblank[pipe]; > > > > + u64 count; > > > > + > > > > + if (!vblank->framedur_ns) > > > > + return -EINVAL; > > > > + > > > > + count = drm_vblank_count_and_time(crtc->dev, pipe, vblanktime); > > > > + > > > > + /* > > > > + * If we don't get a valid count, then we probably also don't > > > > + * have a valid time: > > > > + */ > > > > + if (!count) > > > > + return -EINVAL; > > > > + > > > > + *vblanktime = ktime_add(*vblanktime, ns_to_ktime(vblank->framedur_ns)); > > > > + > > > > + return 0; > > > > +} > > > > +EXPORT_SYMBOL(drm_crtc_next_vblank_time); > > > > + > > > > static void send_vblank_event(struct drm_device *dev, > > > > struct drm_pending_vblank_event *e, > > > > u64 seq, ktime_t now) > > > > diff --git a/include/drm/drm_vblank.h b/include/drm/drm_vblank.h > > > > index 733a3e2d1d10..a63bc2c92f3c 100644 > > > > --- a/include/drm/drm_vblank.h > > > > +++ b/include/drm/drm_vblank.h > > > > @@ -230,6 +230,7 @@ bool drm_dev_has_vblank(const struct drm_device *dev); > > > > u64 drm_crtc_vblank_count(struct drm_crtc *crtc); > > > > u64 drm_crtc_vblank_count_and_time(struct drm_crtc *crtc, > > > > ktime_t *vblanktime); > > > > +int drm_crtc_next_vblank_time(struct drm_crtc *crtc, ktime_t *vblanktime); > > > > void drm_crtc_send_vblank_event(struct drm_crtc *crtc, > > > > struct drm_pending_vblank_event *e); > > > > void drm_crtc_arm_vblank_event(struct drm_crtc *crtc, > > > > -- Ville Syrj?l? Intel