| Message ID | 20170120174554.14195-4-robert.foss@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Reviewed-by: Mika Kahola <mika.kahola@intel.com> On Fri, 2017-01-20 at 12:45 -0500, Robert Foss wrote: > Rename these properties to have them use the same naming convention > as the igt_*_t structs. > > Signed-off-by: Robert Foss <robert.foss@collabora.com> > --- > lib/igt_kms.c | 16 +++++++++------- > lib/igt_kms.h | 4 ++-- > tests/kms_plane_lowres.c | 10 +++++----- > 3 files changed, 16 insertions(+), 14 deletions(-) > > diff --git a/lib/igt_kms.c b/lib/igt_kms.c > index 922bba63..8fa40c28 100644 > --- a/lib/igt_kms.c > +++ b/lib/igt_kms.c > @@ -1310,11 +1310,13 @@ void kmstest_get_crtc(enum pipe pipe, struct > kmstest_crtc *crtc) > crtc->active = true; > parse_crtc(tmp, crtc); > > - crtc->nplanes = parse_planes(fid, > NULL); > - crtc->plane = calloc(crtc->nplanes, > sizeof(*crtc->plane)); > + crtc->n_planes = parse_planes(fid, > NULL); > + crtc->planes = calloc(crtc- > >n_planes, sizeof(*crtc->planes)); > + igt_assert_f(crtc->planes, "Failed > to allocate memory for %d planes\n", crtc->n_planes); > + > fseek(fid, 0, SEEK_END); > fseek(fid, 0, SEEK_SET); > - parse_planes(fid, crtc->plane); > + parse_planes(fid, crtc->planes); > > if (crtc->pipe != pipe) > crtc = NULL; > @@ -1340,14 +1342,14 @@ void igt_assert_plane_visible(enum pipe pipe, > bool visibility) > kmstest_get_crtc(pipe, &crtc); > > visible = true; > - for (i = 0; i < crtc.nplanes; i++) { > - if (crtc.plane[i].type == DRM_PLANE_TYPE_PRIMARY) > + for (i = 0; i < crtc.n_planes; i++) { > + if (crtc.planes[i].type == DRM_PLANE_TYPE_PRIMARY) > continue; > > - if (crtc.plane[i].pos_x > crtc.width) { > + if (crtc.planes[i].pos_x > crtc.width) { > visible = false; > break; > - } else if (crtc.plane[i].pos_y > crtc.height) { > + } else if (crtc.planes[i].pos_y > crtc.height) { > visible = false; > break; > } > diff --git a/lib/igt_kms.h b/lib/igt_kms.h > index 44602fdd..859c79aa 100644 > --- a/lib/igt_kms.h > +++ b/lib/igt_kms.h > @@ -149,8 +149,8 @@ struct kmstest_crtc { > bool active; > int width; > int height; > - int nplanes; > - struct kmstest_plane *plane; > + int n_planes; > + struct kmstest_plane *planes; > }; > > /** > diff --git a/tests/kms_plane_lowres.c b/tests/kms_plane_lowres.c > index 858cc482..424ecb97 100644 > --- a/tests/kms_plane_lowres.c > +++ b/tests/kms_plane_lowres.c > @@ -181,11 +181,11 @@ test_setup(data_t *data, enum pipe pipe, > uint64_t modifier, int flags, > igt_output_set_pipe(output, pipe); > > kmstest_get_crtc(pipe, &crtc); > - igt_skip_on(crtc.nplanes > data- > >display.pipes[pipe].n_planes); > - igt_skip_on(crtc.nplanes == 0); > + igt_skip_on(crtc.n_planes > data- > >display.pipes[pipe].n_planes); > + igt_skip_on(crtc.n_planes == 0); > > - for (i = 0; i < crtc.nplanes; i++) > - data->plane[i] = igt_output_get_plane(output, > crtc.plane[i].index); > + for (i = 0; i < crtc.n_planes; i++) > + data->plane[i] = igt_output_get_plane(output, > crtc.planes[i].index); > > mode = igt_output_get_mode(output); > > @@ -198,7 +198,7 @@ test_setup(data_t *data, enum pipe pipe, uint64_t > modifier, int flags, > igt_plane_set_fb(data->plane[0], &data->fb[0]); > > /* yellow sprite plane in lower left corner */ > - for (i = IGT_PLANE_2; i < crtc.nplanes; i++) { > + for (i = IGT_PLANE_2; i < crtc.n_planes; i++) { > if (data->plane[i]->is_cursor) > size = 64; > else
diff --git a/lib/igt_kms.c b/lib/igt_kms.c index 922bba63..8fa40c28 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -1310,11 +1310,13 @@ void kmstest_get_crtc(enum pipe pipe, struct kmstest_crtc *crtc) crtc->active = true; parse_crtc(tmp, crtc); - crtc->nplanes = parse_planes(fid, NULL); - crtc->plane = calloc(crtc->nplanes, sizeof(*crtc->plane)); + crtc->n_planes = parse_planes(fid, NULL); + crtc->planes = calloc(crtc->n_planes, sizeof(*crtc->planes)); + igt_assert_f(crtc->planes, "Failed to allocate memory for %d planes\n", crtc->n_planes); + fseek(fid, 0, SEEK_END); fseek(fid, 0, SEEK_SET); - parse_planes(fid, crtc->plane); + parse_planes(fid, crtc->planes); if (crtc->pipe != pipe) crtc = NULL; @@ -1340,14 +1342,14 @@ void igt_assert_plane_visible(enum pipe pipe, bool visibility) kmstest_get_crtc(pipe, &crtc); visible = true; - for (i = 0; i < crtc.nplanes; i++) { - if (crtc.plane[i].type == DRM_PLANE_TYPE_PRIMARY) + for (i = 0; i < crtc.n_planes; i++) { + if (crtc.planes[i].type == DRM_PLANE_TYPE_PRIMARY) continue; - if (crtc.plane[i].pos_x > crtc.width) { + if (crtc.planes[i].pos_x > crtc.width) { visible = false; break; - } else if (crtc.plane[i].pos_y > crtc.height) { + } else if (crtc.planes[i].pos_y > crtc.height) { visible = false; break; } diff --git a/lib/igt_kms.h b/lib/igt_kms.h index 44602fdd..859c79aa 100644 --- a/lib/igt_kms.h +++ b/lib/igt_kms.h @@ -149,8 +149,8 @@ struct kmstest_crtc { bool active; int width; int height; - int nplanes; - struct kmstest_plane *plane; + int n_planes; + struct kmstest_plane *planes; }; /** diff --git a/tests/kms_plane_lowres.c b/tests/kms_plane_lowres.c index 858cc482..424ecb97 100644 --- a/tests/kms_plane_lowres.c +++ b/tests/kms_plane_lowres.c @@ -181,11 +181,11 @@ test_setup(data_t *data, enum pipe pipe, uint64_t modifier, int flags, igt_output_set_pipe(output, pipe); kmstest_get_crtc(pipe, &crtc); - igt_skip_on(crtc.nplanes > data->display.pipes[pipe].n_planes); - igt_skip_on(crtc.nplanes == 0); + igt_skip_on(crtc.n_planes > data->display.pipes[pipe].n_planes); + igt_skip_on(crtc.n_planes == 0); - for (i = 0; i < crtc.nplanes; i++) - data->plane[i] = igt_output_get_plane(output, crtc.plane[i].index); + for (i = 0; i < crtc.n_planes; i++) + data->plane[i] = igt_output_get_plane(output, crtc.planes[i].index); mode = igt_output_get_mode(output); @@ -198,7 +198,7 @@ test_setup(data_t *data, enum pipe pipe, uint64_t modifier, int flags, igt_plane_set_fb(data->plane[0], &data->fb[0]); /* yellow sprite plane in lower left corner */ - for (i = IGT_PLANE_2; i < crtc.nplanes; i++) { + for (i = IGT_PLANE_2; i < crtc.n_planes; i++) { if (data->plane[i]->is_cursor) size = 64; else
Rename these properties to have them use the same naming convention as the igt_*_t structs. Signed-off-by: Robert Foss <robert.foss@collabora.com> --- lib/igt_kms.c | 16 +++++++++------- lib/igt_kms.h | 4 ++-- tests/kms_plane_lowres.c | 10 +++++----- 3 files changed, 16 insertions(+), 14 deletions(-)