[igt-dev] [PATCH i-g-t 2/2] tests/i915_pm_dc: psr required only for dc*-psr tests

[Souza, Jose]

On Wed, 2020-02-19 at 09:04 +0530, Anshuman Gupta wrote:
> On 2020-02-19 at 00:25:55 +0530, Souza, Jose wrote:
> > On Sun, 2020-02-16 at 23:30 +0530, Anshuman Gupta wrote:
> > > DPMS igt tests were skipping for non-psr panels due to
> > > psr_sink_support sink check added to igt_fixture() at
> > > commit <6cbe6af372a01be63121056679d540436ffd0b64>.
> > > DPMS dc state igt test don't require psr_sink_support, as it
> > > validates DC states with all display being DPMS off.
> > > Removing the psr sink check from igt_fixture and adding
> > > it only for dc*- psr tests.
> > 
> > Makes sense, just missing the igt_require(psr) in dc3co-vpb-
> > simulation.
> Thanks for review, dc3co-vpb-simulation already had igt_require_f
> for psr_wait_entry, so do we require psr sink check over there ?
> Please correct me if i am wrong here.

It does a bunch of things before that igt_require, with CI queues 3 to
4 days behind every little second saved(in this case when there is no
PSR2 panel) might help.

> Thanks,
> Anshuman Gupta. 
> > > Cc: Arkadiusz Hiler <arkadiusz.hiler at intel.com>
> > > Cc: José Roberto de Souza <jose.souza at intel.com>
> > > Signed-off-by: Anshuman Gupta <anshuman.gupta at intel.com>
> > > ---
> > >  tests/i915/i915_pm_dc.c | 3 ++-
> > >  1 file changed, 2 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/tests/i915/i915_pm_dc.c b/tests/i915/i915_pm_dc.c
> > > index 4bca8559..4c34ff9d 100644
> > > --- a/tests/i915/i915_pm_dc.c
> > > +++ b/tests/i915/i915_pm_dc.c
> > > @@ -395,7 +395,6 @@ int main(int argc, char *argv[])
> > >  		igt_require(igt_setup_runtime_pm(data.drm_fd));
> > >  		igt_require(igt_pm_dmc_loaded(data.debugfs_fd));
> > >  		igt_display_require(&data.display, data.drm_fd);
> > > -		igt_require(psr_sink_support(data.debugfs_fd,
> > > PSR_MODE_1));
> > >  		/* Make sure our Kernel supports MSR and the module is
> > > loaded */
> > >  		igt_require(igt_kmod_load("msr", NULL) == 0);
> > >  
> > > @@ -415,6 +414,7 @@ int main(int argc, char *argv[])
> > >  	igt_subtest("dc5-psr") {
> > >  		data.op_psr_mode = PSR_MODE_1;
> > >  		psr_enable(data.debugfs_fd, data.op_psr_mode);
> > > +		igt_require(psr_sink_support(data.debugfs_fd,
> > > PSR_MODE_1));
> > >  		test_dc_state_psr(&data, CHECK_DC5);
> > >  	}
> > >  
> > > @@ -423,6 +423,7 @@ int main(int argc, char *argv[])
> > >  	igt_subtest("dc6-psr") {
> > >  		data.op_psr_mode = PSR_MODE_1;
> > >  		psr_enable(data.debugfs_fd, data.op_psr_mode);
> > > +		igt_require(psr_sink_support(data.debugfs_fd,
> > > PSR_MODE_1));
> > >  		igt_require_f(igt_pm_pc8_plus_residencies_enabled(data.
> > > msr_fd),
> > >  			      "PC8+ residencies not supported\n");
> > >  		test_dc_state_psr(&data, CHECK_DC6);