[igt-dev] [PATCH i-g-t] tests/i915/kms_frontbuffer_tracking: Skip fbcpsr testcases as needed

[Hogander, Jouni]

On Tue, 2022-07-26 at 11:36 -0700, Matt Roper wrote:
> On Tue, Jul 26, 2022 at 12:09:30PM +0300, Jouni Högander wrote:
> > Driver is not using fbc for display versions 12 and 13 if PSR is
> > enabled. This is currently causing failures on fbcpsr_* subtests.
> > 
> > Fix this by checking display version and skipping fbcpsc_* subtests
> > as
> > needed.
> > 
> > Cc: Matt Roper <matthew.d.roper at intel.com>
> > 
> > Fixes: https://gitlab.freedesktop.org/drm/intel/-/issues/160
> > Signed-off-by: Jouni Högander <jouni.hogander at intel.com>
> 
> You may want to mention that Wa_14016291713 is the reason for this in
> the commit message and/or code comment.  But otherwise,
> 
> Reviewed-by: Matt Roper <matthew.d.roper at intel.com>

Thank you for the review. Patch now merged.

> 
> 
> > ---
> >  tests/i915/kms_frontbuffer_tracking.c | 10 ++++++++++
> >  1 file changed, 10 insertions(+)
> > 
> > diff --git a/tests/i915/kms_frontbuffer_tracking.c
> > b/tests/i915/kms_frontbuffer_tracking.c
> > index 248ff36b..9518c706 100644
> > --- a/tests/i915/kms_frontbuffer_tracking.c
> > +++ b/tests/i915/kms_frontbuffer_tracking.c
> > @@ -1788,6 +1788,8 @@ static bool enable_features_for_test(const
> > struct test_mode *t)
> >  
> >  static void check_test_requirements(const struct test_mode *t)
> >  {
> > +	int ver;
> > +
> >  	if (t->pipes == PIPE_DUAL)
> >  		igt_require_f(scnd_mode_params.output,
> >  			    "Can't test dual pipes with the current
> > outputs\n");
> > @@ -1815,6 +1817,14 @@ static void check_test_requirements(const
> > struct test_mode *t)
> >  
> >  	if (opt.only_pipes != PIPE_COUNT)
> >  		igt_require(t->pipes == opt.only_pipes);
> > +
> > +	/* Kernel disables fbc for display versions 12 and 13 if psr is
> > enabled. */
> > +	ver = intel_display_ver(intel_get_drm_devid(drm.fd));
> > +	if (ver >= 12 && ver <= 13)
> > +		igt_require_f(!((t->feature & FEATURE_PSR) &&
> > +				(t->feature & FEATURE_FBC)),
> > +			      "Can't test PSR and FBC together\n");
> > +
> >  }
> >  
> >  static void set_crtc_fbs(const struct test_mode *t)
> > -- 
> > 2.25.1
> >