From: Robert Foss <robert.foss@collabora.com>
To: intel-gfx@lists.freedesktop.org,
Tomeu Vizoso <tomeu.vizoso@collabora.com>,
Maarten Lankhorst <maarten.lankhorst@intel.com>,
Gustavo Padovan <gustavo.padovan@collabora.com>,
Daniel Stone <daniels@collabora.com>,
Mika Kahola <mika.kahola@intel.com>,
Petri Latvala <petri.latvala@intel.com>
Subject: [PATCH i-g-t v3 03/33] lib/igt_kms: Rename kmstest properties nplanes and plane
Date: Mon, 30 Jan 2017 09:11:54 -0500 [thread overview]
Message-ID: <20170130141224.25063-4-robert.foss@collabora.com> (raw)
In-Reply-To: <20170130141224.25063-1-robert.foss@collabora.com>
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>
Reviewed-by: Mika Kahola <mika.kahola@intel.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 382b0864..a073c8c3 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -1348,11 +1348,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;
@@ -1378,14 +1380,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 635702b6..4e298f89 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
--
2.11.0.453.g787f75f05
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-01-30 14:12 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-30 14:11 [PATCH i-g-t v3 00/33] lib/igt_kms: Implement dynamic plane count support Robert Foss
2017-01-30 14:11 ` [PATCH i-g-t v3 01/33] lib/igt_kms: Add index property to kmstest_plane struct Robert Foss
2017-01-30 14:11 ` [PATCH i-g-t v3 02/33] lib/igt_kms: Avoid depencency on static plane count Robert Foss
2017-01-30 14:11 ` Robert Foss [this message]
2017-01-30 14:11 ` [PATCH i-g-t v3 04/33] lib/igt_kms: Implement dynamic plane count support Robert Foss
2017-01-30 14:11 ` [PATCH i-g-t v3 05/33] tests/kms_atomic_transition: Add support for dynamic number of planes Robert Foss
2017-01-30 14:11 ` [PATCH i-g-t v3 06/33] tests/kms_busy: " Robert Foss
2017-01-30 14:11 ` [PATCH i-g-t v3 07/33] tests/kms_chv_cursor_fail: " Robert Foss
2017-01-30 14:11 ` [PATCH i-g-t v3 08/33] tests/kms_crtc_background_color: " Robert Foss
2017-01-30 14:12 ` [PATCH i-g-t v3 09/33] tests/kms_cursor_crc: " Robert Foss
2017-01-30 14:12 ` [PATCH i-g-t v3 10/33] tests/kms_cursor_legacy: " Robert Foss
2017-01-30 14:12 ` [PATCH i-g-t v3 11/33] tests/kms_fbc_crc: " Robert Foss
2017-01-30 14:12 ` [PATCH i-g-t v3 12/33] tests/kms_fence_pin_leak: " Robert Foss
2017-01-30 14:12 ` [PATCH i-g-t v3 13/33] tests/kms_flip_event_leak: " Robert Foss
2017-01-30 14:12 ` [PATCH i-g-t v3 14/33] tests/kms_legacy_colorkey: " Robert Foss
2017-01-30 14:12 ` [PATCH i-g-t v3 15/33] tests/kms_mmap_write_crc: " Robert Foss
2017-01-30 14:12 ` [PATCH i-g-t v3 16/33] tests/kms_mmio_vs_cs_flip: " Robert Foss
2017-01-30 14:12 ` [PATCH i-g-t v3 17/33] tests/kms_panel_fitting: " Robert Foss
2017-01-30 14:12 ` [PATCH i-g-t v3 18/33] tests/kms_pipe_color: " Robert Foss
2017-01-30 14:12 ` [PATCH i-g-t v3 19/33] tests/kms_plane: " Robert Foss
2017-01-30 14:12 ` [PATCH i-g-t v3 20/33] tests/kms_plane_multiple: " Robert Foss
2017-01-30 14:12 ` [PATCH i-g-t v3 21/33] tests/kms_plane_scaling: " Robert Foss
2017-01-30 14:12 ` [PATCH i-g-t v3 22/33] tests/kms_properties: " Robert Foss
2017-01-30 14:12 ` [PATCH i-g-t v3 23/33] tests/kms_psr_sink_crc: " Robert Foss
2017-01-30 14:12 ` [PATCH i-g-t v3 24/33] tests/kms_pwrite_crc: " Robert Foss
2017-01-30 14:12 ` [PATCH i-g-t v3 25/33] tests/kms_rmfb: " Robert Foss
2017-01-30 14:12 ` [PATCH i-g-t v3 26/33] tests/kms_rotation_crc: " Robert Foss
2017-03-28 22:06 ` Jordan Justen
2017-03-28 22:19 ` Robert Foss
2017-03-28 23:08 ` Jordan Justen
2017-01-30 14:12 ` [PATCH i-g-t v3 27/33] tests/kms_sink_crc_basic: " Robert Foss
2017-01-30 14:12 ` [PATCH i-g-t v3 28/33] tests/kms_universal_plane: " Robert Foss
2017-01-30 14:12 ` [PATCH i-g-t v3 29/33] tests/kms_vblank: " Robert Foss
2017-01-30 14:12 ` [PATCH i-g-t v3 30/33] tests/prime_mmap_kms: " Robert Foss
2017-01-30 14:12 ` [PATCH i-g-t v3 31/33] tests/kms_ccs: " Robert Foss
2017-01-30 14:12 ` [PATCH i-g-t v3 32/33] tests/kms_plane_lowres: " Robert Foss
2017-01-30 14:12 ` [PATCH i-g-t v3 33/33] lib/igt_kms: Remove code obsoleted by dyn n_planes implementation Robert Foss
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170130141224.25063-4-robert.foss@collabora.com \
--to=robert.foss@collabora.com \
--cc=daniels@collabora.com \
--cc=gustavo.padovan@collabora.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=maarten.lankhorst@intel.com \
--cc=mika.kahola@intel.com \
--cc=petri.latvala@intel.com \
--cc=tomeu.vizoso@collabora.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.