[igt-dev] [PATCH i-g-t] tests/i915/kms_psr2_sf: Fix cleanup

[Hogander, Jouni]

On Thu, 2023-03-23 at 07:43 +0000, B, Jeevan wrote:
> Can we set display_reset before setting pipe ?? 

I don't know about that, but logically as prepare is setting pipe for
output I would expect cleanup to release it.
 
> 
> > -----Original Message-----
> > From: Hogander, Jouni <jouni.hogander at intel.com>
> > Sent: Thursday, March 23, 2023 1:08 PM
> > To: igt-dev at lists.freedesktop.org
> > Cc: Hogander, Jouni <jouni.hogander at intel.com>; B, Jeevan
> > <jeevan.b at intel.com>
> > Subject: [PATCH i-g-t] tests/i915/kms_psr2_sf: Fix cleanup
> > 
> > Cleanup is leaving pipe reserved. This is causing failures like:
> > 
> > igt_kms-CRITICAL: DP-1 and eDP-1 are both trying to use pipe A
> > 
> > Fix by setting pipe of output as PIPE_NONE.
> > 
> > Cc: Jeevan B <jeevan.b at intel.com>
> > 
> > Signed-off-by: Jouni Högander <jouni.hogander at intel.com>
> > ---
> >  tests/i915/kms_psr2_sf.c | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/tests/i915/kms_psr2_sf.c b/tests/i915/kms_psr2_sf.c
> > index
> > 2d761d31..4a8608c1 100644
> > --- a/tests/i915/kms_psr2_sf.c
> > +++ b/tests/i915/kms_psr2_sf.c
> > @@ -846,10 +846,10 @@ static void cleanup(data_t *data)
> >                 igt_plane_set_fb(sprite, NULL);
> >         }
> > 
> > -       if (data->coexist_feature & FEATURE_DSC) {
> > +       if (data->coexist_feature &
> > FEATURE_DSC)https://patchwork.freedesktop.org/series/115532/ 
> >                 restore_force_dsc_en();
> > -               igt_output_set_pipe(output, PIPE_NONE);
> > -       }
> > +
> > +       igt_output_set_pipe(output, PIPE_NONE);
> > 
> >         igt_display_commit2(&data->display, COMMIT_ATOMIC);
> > 
> > --
> > 2.34.1
>