[igt-dev] [PATCH i-g-t] tests/kms_plane: Don't test every plane on icl+

[Petri Latvala]

On Wed, Oct 30, 2019 at 03:34:27PM +0200, Ville Syrjälä wrote:
> On Wed, Oct 30, 2019 at 02:59:28PM +0200, Petri Latvala wrote:
> > On Fri, Oct 25, 2019 at 10:01:34PM +0300, Ville Syrjala wrote:
> > > From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > > 
> > > Only test one plane of each type (HDR, SDR UV, SDR Y) on icl+.
> > > For the purposes of validating pixel formats this should be sufficient
> > > as the programming of each plane of the same type is identical and
> > > as such it's unlikely we'd have different bugs between them.
> > > 
> > > As before we'll leave the full test set available to be run at
> > > the user's discretion via --extended.
> > > 
> > > Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > > ---
> > >  tests/kms_plane.c | 25 ++++++++++++++++++++++++-
> > >  1 file changed, 24 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/tests/kms_plane.c b/tests/kms_plane.c
> > > index 86a3a6296d26..7672374f5152 100644
> > > --- a/tests/kms_plane.c
> > > +++ b/tests/kms_plane.c
> > > @@ -757,6 +757,26 @@ static bool test_format_plane(data_t *data, enum pipe pipe,
> > >  	return result;
> > >  }
> > >  
> > > +static bool skip_plane(data_t *data, igt_plane_t *plane)
> > > +{
> > > +	int index = plane->index;
> > > +
> > > +	if (data->extended)
> > > +		return false;
> > > +
> > > +	if (!is_i915_device(data->drm_fd))
> > > +		return false;
> > > +
> > > +	if (plane->type == DRM_PLANE_TYPE_CURSOR)
> > > +		return false;
> > > +
> > > +	if (intel_gen(intel_get_drm_devid(data->drm_fd)) < 11)
> > > +		return false;
> > > +
> > > +	/* test 1 HDR plane, 1 SDR UV plane, 1 SDR Y plane */
> > > +	return index != 0 && index != 3 && index != 5;
> > 
> > 
> > Magic numbers, but we can maybe let that slide. Where can one check
> > that these indices are the plane types stated?
> 
> Kernel land plane->id:
> icl_is_hdr_plane() vs. icl_is_nv12_y_plane(), vs. neither +
> the plane uapi registration order matches the plane->id order.
> 
> 0,1,2 HDR planes
> 3,4 SDR UV planes
> 5,6 SDR Y planes
> 
> I guess I should put that full list in the comment actually.

Yes please.

> 
> The SDR UV planes are going away at some point, but the index
> 3 check will then catch one of the the SDR Y planes. So should
> be future proof for some time.


Sounds good. With the enhanced comment,

Reviewed-by: Petri Latvala <petri.latvala at intel.com>