On Fri, Apr 06, 2018 at 06:56:22PM +0300, Ville Syrjälä wrote:
> On Thu, Mar 29, 2018 at 06:19:40AM +0000, Sripada, Radhakrishna wrote:
> > 
> > 
> > > -----Original Message-----
> > > From: Ville Syrjälä [mailto:ville.syrj...@linux.intel.com]
> > > Sent: Wednesday, March 28, 2018 3:36 AM
> > > To: Maarten Lankhorst <maarten.lankho...@linux.intel.com>
> > > Cc: Sripada, Radhakrishna <radhakrishna.srip...@intel.com>; igt-
> > > d...@lists.freedesktop.org; intel-gfx@lists.freedesktop.org; Srivatsa, 
> > > Anusha
> > > <anusha.sriva...@intel.com>; Vetter, Daniel <daniel.vet...@intel.com>; 
> > > Vivi,
> > > Rodrigo <rodrigo.v...@intel.com>; Kahola, Mika <mika.kah...@intel.com>;
> > > Navare, Manasi D <manasi.d.nav...@intel.com>
> > > Subject: Re: [PATCH i-g-t v3] tests/kms_rotation_crc: Move platform checks
> > > to one place for non exhaust fence cases
> > > 
> > > On Wed, Mar 28, 2018 at 10:29:15AM +0200, Maarten Lankhorst wrote:
> > > > Op 22-03-18 om 23:10 schreef Radhakrishna Sripada:
> > > > > From: Anusha Srivatsa <anusha.sriva...@intel.com>
> > > > >
> > > > > Cleanup the testcases by moving the platform checks to a single 
> > > > > function.
> > > > >
> > > > > The earlier version of the path is posted here [1]
> > > > >
> > > > > v2: Make use of the property enums to get the supported rotations
> > > > > v3: Move hardcodings to a single function(Ville)
> > > > >
> > > > > [1]: https://patchwork.freedesktop.org/patch/209647/
> > > > >
> > > > > Cc: Radhakrishna Sripada <radhakrishna.srip...@intel.com>
> > > > > Cc: Ville Syrjälä <ville.syrj...@linux.intel.com>
> > > > > Cc: Daniel Vetter <daniel.vet...@intel.com>
> > > > > Cc: Rodrigo Vivi <rodrigo.v...@intel.com>
> > > > > Cc: Maarten Lankhorst <maarten.lankho...@linux.intel.com>
> > > > > Cc: Mika Kahola <mika.kah...@intel.com>
> > > > > Cc: Manasi Navare <manasi.d.nav...@intel.com>
> > > > > Signed-off-by: Anusha Srivatsa <anusha.sriva...@intel.com>
> > > > > Signed-off-by: Radhakrishna Sripada <radhakrishna.srip...@intel.com>
> > > > > ---
> > > > >  tests/kms_rotation_crc.c | 31 ++++++++++++++++---------------
> > > > >  1 file changed, 16 insertions(+), 15 deletions(-)
> > > > >
> > > > > diff --git a/tests/kms_rotation_crc.c b/tests/kms_rotation_crc.c
> > > > > index 0cd5c6e52b57..60fb9012e14e 100644
> > > > > --- a/tests/kms_rotation_crc.c
> > > > > +++ b/tests/kms_rotation_crc.c
> > > > > @@ -43,6 +43,7 @@ typedef struct {
> > > > >       uint32_t override_fmt;
> > > > >       uint64_t override_tiling;
> > > > >       int devid;
> > > > > +     int gen;
> > > > >  } data_t;
> > > > >
> > > > >  typedef struct {
> > > > > @@ -301,6 +302,17 @@ static void wait_for_pageflip(int fd)
> > > > >       igt_assert(drmHandleEvent(fd, &evctx) == 0);  }
> > > > >
> > > > > +static void igt_check_rotation(data_t *data) {
> > > > > +     if (data->rotation & (IGT_ROTATION_90 | IGT_ROTATION_270))
> > > > > +             igt_require(data->gen >= 9);
> > > > > +     else if (data->rotation & IGT_REFLECT_X)
> > > > > +             igt_require(data->gen >= 10 ||
> > > > > +                         (IS_CHERRYVIEW(data->devid) && 
> > > > > (data->rotation
> > > & IGT_ROTATION_0)));
> > > > > +     else if (data->rotation & IGT_ROTATION_180)
> > > > > +             igt_require(data->gen >= 4);
> > > > > +}
> > > > This still won't work as intended on CHV as it only has reflection on 
> > > > PIPE_B,
> > > for X tiled fb's.
> > > 
> > > s/X tiled//
> > So should we hack the reflect subtest to partially run for a single pipe 
> > and skip for the other pipes on Chv? If so is there a non-murky way to do 
> > it?
> 
> At least skipping for pipe A/C should happen automagically if we ask the
> plane what it supports. The pipe B case still needs to be special cased
> though.
> 

I sent an updated patch [1] making the changes. Is it ok?

[1] https://patchwork.freedesktop.org/patch/214698/

> > 
> > Thanks,
> > Radhakrishna
> > 
> > > 
> > > >
> > > >
> > > > >  static void test_single_case(data_t *data, enum pipe pipe,
> > > > >                            igt_output_t *output, igt_plane_t *plane,
> > > > >                            enum rectangle_type rect,
> > > > > @@ -369,13 +381,12 @@ static void test_plane_rotation(data_t *data,
> > > > > int plane_type, bool test_bad_form
> > > > >
> > > > >       igt_display_require_output(display);
> > > > >
> > > > > +     igt_check_rotation(data);
> > > > > +
> > > > >       for_each_pipe_with_valid_output(display, pipe, output) {
> > > > >               igt_plane_t *plane;
> > > > >               int i, j;
> > > > >
> > > > > -             if (IS_CHERRYVIEW(data->devid) && pipe != PIPE_B)
> > > > > -                     continue;
> > > > > -
> > > > >               igt_output_set_pipe(output, pipe);
> > > > >
> > > > >               plane = igt_output_get_plane_type(output, plane_type); 
> > > > > @@
> > > -538,14
> > > > > +549,13 @@ igt_main
> > > > >       };
> > > > >
> > > > >       data_t data = {};
> > > > > -     int gen = 0;
> > > > >
> > > > >       igt_skip_on_simulation();
> > > > >
> > > > >       igt_fixture {
> > > > >               data.gfx_fd = drm_open_driver_master(DRIVER_INTEL);
> > > > >               data.devid = intel_get_drm_devid(data.gfx_fd);
> > > > > -             gen = intel_gen(data.devid);
> > > > > +             data.gen = intel_gen(data.devid);
> > > > >
> > > > >               kmstest_set_vt_graphics_mode();
> > > > >
> > > > > @@ -558,16 +568,12 @@ igt_main
> > > > >               igt_subtest_f("%s-rotation-%s",
> > > > >                             plane_test_str(subtest->plane),
> > > > >                             rot_test_str(subtest->rot)) {
> > > > > -                     igt_require(!(subtest->rot &
> > > > > -                                 (IGT_ROTATION_90 | 
> > > > > IGT_ROTATION_270))
> > > ||
> > > > > -                                 gen >= 9);
> > > > >                       data.rotation = subtest->rot;
> > > > >                       test_plane_rotation(&data, subtest->plane, 
> > > > > false);
> > > > >               }
> > > > >       }
> > > > >
> > > > >       igt_subtest_f("sprite-rotation-90-pos-100-0") {
> > > > > -             igt_require(gen >= 9);
> > > > >               data.rotation = IGT_ROTATION_90;
> > > > >               data.pos_x = 100,
> > > > >               data.pos_y = 0;
> > > > > @@ -577,7 +583,6 @@ igt_main
> > > > >       data.pos_y = 0;
> > > > >
> > > > >       igt_subtest_f("bad-pixel-format") {
> > > > > -             igt_require(gen >= 9);
> > > > >               data.rotation = IGT_ROTATION_90;
> > > > >               data.override_fmt = DRM_FORMAT_RGB565;
> > > > >               test_plane_rotation(&data, DRM_PLANE_TYPE_PRIMARY,
> > > true); @@
> > > > > -585,7 +590,6 @@ igt_main
> > > > >       data.override_fmt = 0;
> > > > >
> > > > >       igt_subtest_f("bad-tiling") {
> > > > > -             igt_require(gen >= 9);
> > > > >               data.rotation = IGT_ROTATION_90;
> > > > >               data.override_tiling = LOCAL_I915_FORMAT_MOD_X_TILED;
> > > > >               test_plane_rotation(&data, DRM_PLANE_TYPE_PRIMARY,
> > > true); @@
> > > > > -596,9 +600,6 @@ igt_main
> > > > >               igt_subtest_f("primary-%s-reflect-x-%s",
> > > > >                             tiling_test_str(reflect_x->tiling),
> > > > >                             rot_test_str(reflect_x->rot)) {
> > > > > -                     igt_require(gen >= 10 ||
> > > > > -                                 (IS_CHERRYVIEW(data.devid) && 
> > > > > reflect_x-
> > > >rot == IGT_ROTATION_0
> > > > > -                                  && reflect_x->tiling ==
> > > LOCAL_I915_FORMAT_MOD_X_TILED));
> > > > >                       data.rotation = (IGT_REFLECT_X | 
> > > > > reflect_x->rot);
> > > > >                       data.override_tiling = reflect_x->tiling;
> > > > >                       test_plane_rotation(&data,
> > > DRM_PLANE_TYPE_PRIMARY, false); @@
> > > > > -613,7 +614,7 @@ igt_main
> > > > >               enum pipe pipe;
> > > > >               igt_output_t *output;
> > > > >
> > > > > -             igt_require(gen >= 9);
> > > > > +             igt_require(data.gen >= 9);
> > > > >               igt_display_require_output(&data.display);
> > > > >
> > > > >               for_each_pipe_with_valid_output(&data.display, pipe,
> > > output) {
> > > >
> > > 
> > > --
> > > Ville Syrjälä
> > > Intel OTC
> 
> -- 
> Ville Syrjälä
> Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to