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.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 9B8CBC6369E for ; Wed, 2 Dec 2020 22:35:34 +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 1F835221F7 for ; Wed, 2 Dec 2020 22:35:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1F835221F7 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 424686EB1B; Wed, 2 Dec 2020 22:35:33 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3247A6EB1B for ; Wed, 2 Dec 2020 22:35:31 +0000 (UTC) IronPort-SDR: VGVpsnkGRwokX6g0eVMQ3sU434kN6Yef/lFgZdqchGClr5qGioWEBeF7bR36EX4zS1T1+171bo VR2q3bDUB0JA== X-IronPort-AV: E=McAfee;i="6000,8403,9823"; a="152926409" X-IronPort-AV: E=Sophos;i="5.78,388,1599548400"; d="scan'208";a="152926409" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Dec 2020 14:35:30 -0800 IronPort-SDR: ySfdZA5gHgdb58Bc35sYtzZD+rcCKbjU8eaASfFv3Etit6N572fLQU/F4fPfe3AENPGnmDWXxn QpDt+d2gs9Tw== X-IronPort-AV: E=Sophos;i="5.78,388,1599548400"; d="scan'208";a="550241831" Received: from labuser-z97x-ud5h.jf.intel.com (HELO labuser-Z97X-UD5H) ([10.165.21.211]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Dec 2020 14:35:30 -0800 Date: Wed, 2 Dec 2020 14:38:28 -0800 From: "Navare, Manasi" To: Jani Nikula Message-ID: <20201202223828.GA26911@labuser-Z97X-UD5H> References: <20201022222709.29386-1-manasi.d.navare@intel.com> <20201022222709.29386-6-manasi.d.navare@intel.com> <87o8k5sd2l.fsf@intel.com> <20201201225259.GB22644@labuser-Z97X-UD5H> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201201225259.GB22644@labuser-Z97X-UD5H> User-Agent: Mutt/1.5.24 (2015-08-30) Subject: Re: [Intel-gfx] [PATCH 05/11] drm/i915/display/dp: Compute VRR state in atomic_check 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 Tue, Dec 01, 2020 at 02:52:59PM -0800, Navare, Manasi wrote: > On Tue, Nov 10, 2020 at 12:47:46PM +0200, Jani Nikula wrote: > > On Thu, 22 Oct 2020, Manasi Navare wrote: > > > This forces a complete modeset if vrr drm crtc state goes > > > from enabled to disabled and vice versa. > > > This patch also computes vrr state variables from the mode timings > > > and based on the vrr property set by userspace as well as hardware's > > > vrr capability. > > > > > > v2: > > > *Rebase > > > v3: > > > * Vmin =3D max (vtotal, vmin) (Manasi) > > > v4: > > > * set crtc_state->vrr.enable =3D 0 for disable request > > > > > > Cc: Ville Syrj=E4l=E4 > > > Cc: Jani Nikula > > > Signed-off-by: Manasi Navare > > > --- > > > drivers/gpu/drm/i915/display/intel_display.c | 7 +++- > > > drivers/gpu/drm/i915/display/intel_dp.c | 1 + > > > drivers/gpu/drm/i915/display/intel_vrr.c | 38 ++++++++++++++++++= ++ > > > drivers/gpu/drm/i915/display/intel_vrr.h | 2 ++ > > > 4 files changed, 47 insertions(+), 1 deletion(-) > > > > > > diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/g= pu/drm/i915/display/intel_display.c > > > index f41b6f8b5618..f70cc3b2a1a4 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_display.c > > > +++ b/drivers/gpu/drm/i915/display/intel_display.c > > > @@ -14213,6 +14213,10 @@ intel_pipe_config_compare(const struct intel= _crtc_state *current_config, > > > = > > > PIPE_CONF_CHECK_I(mst_master_transcoder); > > > = > > > + PIPE_CONF_CHECK_BOOL(vrr.enable); > > > + PIPE_CONF_CHECK_I(vrr.vtotalmin); > > > + PIPE_CONF_CHECK_I(vrr.vtotalmax); > > > + > > > #undef PIPE_CONF_CHECK_X > > > #undef PIPE_CONF_CHECK_I > > > #undef PIPE_CONF_CHECK_BOOL > > > @@ -15202,7 +15206,8 @@ static int intel_atomic_check(struct drm_devi= ce *dev, > > > = > > > for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state, > > > new_crtc_state, i) { > > > - if (new_crtc_state->inherited !=3D old_crtc_state->inherited) > > > + if (new_crtc_state->inherited !=3D old_crtc_state->inherited || > > > + new_crtc_state->uapi.vrr_enabled !=3D old_crtc_state->uapi.vrr= _enabled) > > = > > Somehow this feels like a really specific check to add considering the > > abstraction level of the function in general. Actually while discussing with @Ville on IRC, he had proposed just adding i= t here since we already have this loop existing that loops through the old and new= crtc states and we need to set the mode_changed =3D true right up at the top. But if you think its more intuitive to create a separate function for this = I could do that Ville, Jani N any thoughts? Manasi > = > Should I then create a separate function to force a full modeset by setti= ng mode changed = > if vrr_enabled changed? > And call that from intel_atomic_check() ? > = > > = > > > new_crtc_state->uapi.mode_changed =3D true; > > > } > > > = > > > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/dr= m/i915/display/intel_dp.c > > > index 3794b8f35edc..3185c4ca523d 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_dp.c > > > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > > > @@ -2752,6 +2752,7 @@ intel_dp_compute_config(struct intel_encoder *e= ncoder, > > > if (!HAS_DDI(dev_priv)) > > > intel_dp_set_clock(encoder, pipe_config); > > > = > > > + intel_vrr_compute_config(intel_dp, pipe_config); > > > intel_psr_compute_config(intel_dp, pipe_config); > > > intel_dp_drrs_compute_config(intel_dp, pipe_config, output_bpp, > > > constant_n); > > > diff --git a/drivers/gpu/drm/i915/display/intel_vrr.c b/drivers/gpu/d= rm/i915/display/intel_vrr.c > > > index 0c8a91fabb64..56114f535f94 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_vrr.c > > > +++ b/drivers/gpu/drm/i915/display/intel_vrr.c > > > @@ -26,3 +26,41 @@ bool intel_is_vrr_capable(struct drm_connector *co= nnector) > > > info->monitor_range.max_vfreq - info->monitor_range.min_vfreq > 10; > > > } > > > = > > > +void > > > +intel_vrr_compute_config(struct intel_dp *intel_dp, > > > + struct intel_crtc_state *crtc_state) > > > +{ > > > + struct drm_i915_private *dev_priv =3D dp_to_i915(intel_dp); > > > + struct intel_connector *intel_connector =3D intel_dp->attached_conn= ector; > > > + struct drm_connector *connector =3D &intel_connector->base; > > > + struct drm_display_mode *adjusted_mode =3D &crtc_state->hw.adjusted= _mode; > > > + const struct drm_display_info *info =3D &connector->display_info; > > > + > > > + if (!intel_is_vrr_capable(connector)) > > > + return; > > > + > > > + if (!crtc_state->uapi.vrr_enabled) { > > > + drm_dbg(&dev_priv->drm, > > > + "VRR disable requested by Userspace\n"); > > = > > drm_dbg_kms, though is this useful information? Quite a bit of log spam > > I'd think. > = > Yea this one can probably remove > = > Manasi > = > = > > = > > > + crtc_state->vrr.enable =3D false; > > > + return; > > > + } > > > + > > > + crtc_state->vrr.enable =3D true; > > > + crtc_state->vrr.vtotalmin =3D > > > + max_t(u16, adjusted_mode->crtc_vtotal, > > > + DIV_ROUND_CLOSEST(adjusted_mode->crtc_clock * 1000, > > > + adjusted_mode->crtc_htotal * > > > + info->monitor_range.max_vfreq)); > > > + crtc_state->vrr.vtotalmax =3D > > > + max_t(u16, adjusted_mode->crtc_vtotal, > > > + DIV_ROUND_UP(adjusted_mode->crtc_clock * 1000, > > > + adjusted_mode->crtc_htotal * > > > + info->monitor_range.min_vfreq)); > > > + > > > + drm_dbg(&dev_priv->drm, > > = > > drm_dbg_kms > > = > > > + "VRR Config: Enable =3D %s Vtotal Min =3D %d Vtotal Max =3D %d\n", > > > + yesno(crtc_state->vrr.enable), crtc_state->vrr.vtotalmin, > > > + crtc_state->vrr.vtotalmax); > > > +} > > > + > > > diff --git a/drivers/gpu/drm/i915/display/intel_vrr.h b/drivers/gpu/d= rm/i915/display/intel_vrr.h > > > index 755746c7525c..1e6fe8fe92ec 100644 > > > --- a/drivers/gpu/drm/i915/display/intel_vrr.h > > > +++ b/drivers/gpu/drm/i915/display/intel_vrr.h > > > @@ -15,5 +15,7 @@ struct intel_encoder; > > > struct intel_dp; > > > = > > > bool intel_is_vrr_capable(struct drm_connector *connector); > > > +void intel_vrr_compute_config(struct intel_dp *intel_dp, > > > + struct intel_crtc_state *crtc_state); > > > = > > > #endif /* __INTEL_VRR_H__ */ > > = > > -- = > > Jani Nikula, Intel Open Source Graphics Center > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx