From: Mika Kahola <mika.kahola@intel.com>
To: Robert Foss <robert.foss@collabora.com>,
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>,
Petri Latvala <petri.latvala@intel.com>
Subject: Re: [PATCH i-g-t v2 23/33] tests/kms_psr_sink_crc: Add support for dynamic number of planes
Date: Thu, 26 Jan 2017 13:00:28 +0200 [thread overview]
Message-ID: <1485428428.9014.116.camel@intel.com> (raw)
In-Reply-To: <20170124233400.5053-24-robert.foss@collabora.com>
Reviewed-by: Mika Kahola <mika.kahola@intel.com>
On Tue, 2017-01-24 at 18:33 -0500, Robert Foss wrote:
> Add changes reflecting the new support for dynamic number of planes
> per pipe.
>
> Signed-off-by: Robert Foss <robert.foss@collabora.com>
> ---
> tests/kms_psr_sink_crc.c | 52 +++++++++++++++++++++-----------------
> ----------
> 1 file changed, 23 insertions(+), 29 deletions(-)
>
> diff --git a/tests/kms_psr_sink_crc.c b/tests/kms_psr_sink_crc.c
> index 926b8578..8f6bdc0d 100644
> --- a/tests/kms_psr_sink_crc.c
> +++ b/tests/kms_psr_sink_crc.c
> @@ -34,12 +34,6 @@ bool running_with_psr_disabled;
>
> #define CRC_BLACK "000000000000"
>
> -enum planes {
> - PRIMARY,
> - SPRITE,
> - CURSOR,
> -};
> -
> enum operations {
> PAGE_FLIP,
> MMAP_GTT,
> @@ -69,7 +63,7 @@ static const char *op_str(enum operations op)
>
> typedef struct {
> int drm_fd;
> - enum planes test_plane;
> + int test_plane;
> enum operations op;
> uint32_t devid;
> uint32_t crtc_id;
> @@ -313,9 +307,9 @@ static void run_test(data_t *data)
>
> /* Setting a secondary fb/plane */
> switch (data->test_plane) {
> - case PRIMARY: default: test_plane = data->primary; break;
> - case SPRITE: test_plane = data->sprite; break;
> - case CURSOR: test_plane = data->cursor; break;
> + case DRM_PLANE_TYPE_PRIMARY: default: test_plane = data-
> >primary; break;
> + case DRM_PLANE_TYPE_OVERLAY: test_plane = data->sprite;
> break;
> + case DRM_PLANE_TYPE_CURSOR: test_plane = data->cursor;
> break;
> }
> igt_plane_set_fb(test_plane, &data->fb_white);
> igt_display_commit(&data->display);
> @@ -323,7 +317,7 @@ static void run_test(data_t *data)
> /* Confirm it is not Green anymore */
> igt_assert(wait_psr_entry(data));
> get_sink_crc(data, ref_crc);
> - if (data->test_plane == PRIMARY)
> + if (data->test_plane == DRM_PLANE_TYPE_PRIMARY)
> assert_or_manual(!is_green(ref_crc), "screen
> WHITE");
> else
> assert_or_manual(!is_green(ref_crc), "GREEN
> background with WHITE box");
> @@ -355,7 +349,7 @@ static void run_test(data_t *data)
> /* Printing white on white so the screen shouldn't
> change */
> memset(ptr, 0xff, data->mod_size);
> get_sink_crc(data, crc);
> - if (data->test_plane == PRIMARY)
> + if (data->test_plane == DRM_PLANE_TYPE_PRIMARY)
> assert_or_manual(strcmp(ref_crc, crc) == 0,
> "screen WHITE");
> else
> assert_or_manual(strcmp(ref_crc, crc) == 0,
> @@ -406,9 +400,9 @@ static void run_test(data_t *data)
>
> static void test_cleanup(data_t *data) {
> igt_plane_set_fb(data->primary, NULL);
> - if (data->test_plane == SPRITE)
> + if (data->test_plane == DRM_PLANE_TYPE_OVERLAY)
> igt_plane_set_fb(data->sprite, NULL);
> - if (data->test_plane == CURSOR)
> + if (data->test_plane == DRM_PLANE_TYPE_CURSOR)
> igt_plane_set_fb(data->cursor, NULL);
>
> igt_display_commit(&data->display);
> @@ -428,7 +422,7 @@ static void setup_test_plane(data_t *data)
> 0.0, 1.0, 0.0,
> &data->fb_green);
>
> - data->primary = igt_output_get_plane(data->output,
> IGT_PLANE_PRIMARY);
> + data->primary = igt_output_get_plane_type(data->output,
> DRM_PLANE_TYPE_PRIMARY);
> igt_plane_set_fb(data->primary, NULL);
>
> white_h = data->mode->hdisplay;
> @@ -439,16 +433,16 @@ static void setup_test_plane(data_t *data)
> data->mod_stride = white_h * 4;
>
> switch (data->test_plane) {
> - case SPRITE:
> - data->sprite = igt_output_get_plane(data->output,
> - IGT_PLANE_2);
> + case DRM_PLANE_TYPE_OVERLAY:
> + data->sprite = igt_output_get_plane_type(data-
> >output,
> + DRM_PLANE_TYPE_O
> VERLAY);
> igt_plane_set_fb(data->sprite, NULL);
> /* To make it different for human eyes let's make
> * sprite visible in only one quarter of the primary
> */
> white_h = white_h/2;
> white_v = white_v/2;
> - case PRIMARY:
> + case DRM_PLANE_TYPE_PRIMARY:
> igt_create_color_fb(data->drm_fd,
> white_h, white_v,
> DRM_FORMAT_XRGB8888,
> @@ -456,9 +450,9 @@ static void setup_test_plane(data_t *data)
> 1.0, 1.0, 1.0,
> &data->fb_white);
> break;
> - case CURSOR:
> - data->cursor = igt_output_get_plane(data->output,
> - IGT_PLANE_CURSOR
> );
> + case DRM_PLANE_TYPE_CURSOR:
> + data->cursor = igt_output_get_plane_type(data-
> >output,
> + DRM_PLANE_TYPE_C
> URSOR);
> igt_plane_set_fb(data->cursor, NULL);
> create_cursor_fb(data);
> igt_plane_set_position(data->cursor, 0, 0);
> @@ -535,7 +529,7 @@ int main(int argc, char *argv[])
>
> for (op = PAGE_FLIP; op <= RENDER; op++) {
> igt_subtest_f("primary_%s", op_str(op)) {
> - data.test_plane = PRIMARY;
> + data.test_plane = DRM_PLANE_TYPE_PRIMARY;
> data.op = op;
> setup_test_plane(&data);
> igt_assert(wait_psr_entry(&data));
> @@ -546,7 +540,7 @@ int main(int argc, char *argv[])
>
> for (op = MMAP_GTT; op <= PLANE_ONOFF; op++) {
> igt_subtest_f("sprite_%s", op_str(op)) {
> - data.test_plane = SPRITE;
> + data.test_plane = DRM_PLANE_TYPE_OVERLAY;
> data.op = op;
> setup_test_plane(&data);
> igt_assert(wait_psr_entry(&data));
> @@ -557,7 +551,7 @@ int main(int argc, char *argv[])
>
> for (op = MMAP_GTT; op <= PLANE_ONOFF; op++) {
> igt_subtest_f("cursor_%s", op_str(op)) {
> - data.test_plane = CURSOR;
> + data.test_plane = DRM_PLANE_TYPE_CURSOR;
> data.op = op;
> setup_test_plane(&data);
> igt_assert(wait_psr_entry(&data));
> @@ -567,7 +561,7 @@ int main(int argc, char *argv[])
> }
>
> igt_subtest_f("dpms_off_psr_active") {
> - data.test_plane = PRIMARY;
> + data.test_plane = DRM_PLANE_TYPE_PRIMARY;
> data.op = RENDER;
> setup_test_plane(&data);
> igt_assert(wait_psr_entry(&data));
> @@ -579,7 +573,7 @@ int main(int argc, char *argv[])
> }
>
> igt_subtest_f("dpms_off_psr_exit") {
> - data.test_plane = SPRITE;
> + data.test_plane = DRM_PLANE_TYPE_OVERLAY;
> data.op = PLANE_ONOFF;
> setup_test_plane(&data);
>
> @@ -591,7 +585,7 @@ int main(int argc, char *argv[])
> }
>
> igt_subtest_f("suspend_psr_active") {
> - data.test_plane = PRIMARY;
> + data.test_plane = DRM_PLANE_TYPE_PRIMARY;
> data.op = PAGE_FLIP;
> setup_test_plane(&data);
> igt_assert(wait_psr_entry(&data));
> @@ -604,7 +598,7 @@ int main(int argc, char *argv[])
> }
>
> igt_subtest_f("suspend_psr_exit") {
> - data.test_plane = CURSOR;
> + data.test_plane = DRM_PLANE_TYPE_CURSOR;
> data.op = PLANE_ONOFF;
> setup_test_plane(&data);
>
--
Mika Kahola - Intel OTC
_______________________________________________
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-26 10:59 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-24 23:33 [PATCH i-g-t v2 00/33] lib/igt_kms: Implement dynamic plane count support Robert Foss
2017-01-24 23:33 ` [PATCH i-g-t v2 01/33] lib/igt_kms: Add index property to kmstest_plane struct Robert Foss
2017-01-25 8:51 ` Mika Kahola
2017-01-24 23:33 ` [PATCH i-g-t v2 02/33] lib/igt_kms: Avoid depencency on static plane count Robert Foss
2017-01-25 8:52 ` Mika Kahola
2017-01-24 23:33 ` [PATCH i-g-t v2 03/33] lib/igt_kms: Rename kmstest properties nplanes and plane Robert Foss
2017-01-25 8:52 ` Mika Kahola
2017-01-24 23:33 ` [PATCH i-g-t v2 04/33] lib/igt_kms: Implement dynamic plane count support Robert Foss
2017-01-25 10:28 ` Mika Kahola
2017-01-24 23:33 ` [PATCH i-g-t v2 05/33] tests/kms_atomic_transition: Add support for dynamic number of planes Robert Foss
2017-01-25 11:22 ` Mika Kahola
2017-01-24 23:33 ` [PATCH i-g-t v2 06/33] tests/kms_busy: " Robert Foss
2017-01-25 11:23 ` Mika Kahola
2017-01-24 23:33 ` [PATCH i-g-t v2 07/33] tests/kms_chv_cursor_fail: " Robert Foss
2017-01-25 11:31 ` Mika Kahola
2017-01-24 23:33 ` [PATCH i-g-t v2 08/33] tests/kms_crtc_background_color: " Robert Foss
2017-01-25 11:32 ` Mika Kahola
2017-01-24 23:33 ` [PATCH i-g-t v2 09/33] tests/kms_cursor_crc: " Robert Foss
2017-01-25 11:33 ` Mika Kahola
2017-01-24 23:33 ` [PATCH i-g-t v2 10/33] tests/kms_cursor_legacy: " Robert Foss
2017-01-24 23:33 ` [PATCH i-g-t v2 11/33] tests/kms_fbc_crc: " Robert Foss
2017-01-25 12:22 ` Mika Kahola
2017-01-24 23:33 ` [PATCH i-g-t v2 12/33] tests/kms_fence_pin_leak: " Robert Foss
2017-01-25 12:25 ` Mika Kahola
2017-01-24 23:33 ` [PATCH i-g-t v2 13/33] tests/kms_flip_event_leak: " Robert Foss
2017-01-25 12:28 ` Mika Kahola
2017-01-24 23:33 ` [PATCH i-g-t v2 14/33] tests/kms_legacy_colorkey: " Robert Foss
2017-01-25 12:31 ` Mika Kahola
2017-01-24 23:33 ` [PATCH i-g-t v2 15/33] tests/kms_mmap_write_crc: " Robert Foss
2017-01-25 12:33 ` Mika Kahola
2017-01-24 23:33 ` [PATCH i-g-t v2 16/33] tests/kms_mmio_vs_cs_flip: " Robert Foss
2017-01-25 12:34 ` Mika Kahola
2017-01-24 23:33 ` [PATCH i-g-t v2 17/33] tests/kms_panel_fitting: " Robert Foss
2017-01-25 12:38 ` Mika Kahola
2017-01-24 23:33 ` [PATCH i-g-t v2 18/33] tests/kms_pipe_color: " Robert Foss
2017-01-25 12:41 ` Mika Kahola
2017-01-24 23:33 ` [PATCH i-g-t v2 19/33] tests/kms_plane: " Robert Foss
2017-01-25 12:48 ` Mika Kahola
2017-01-24 23:33 ` [PATCH i-g-t v2 20/33] tests/kms_plane_multiple: " Robert Foss
2017-01-26 10:47 ` Mika Kahola
2017-01-24 23:33 ` [PATCH i-g-t v2 21/33] tests/kms_plane_scaling: " Robert Foss
2017-01-26 10:52 ` Mika Kahola
2017-01-24 23:33 ` [PATCH i-g-t v2 22/33] tests/kms_properties: " Robert Foss
2017-01-26 10:57 ` Mika Kahola
2017-01-24 23:33 ` [PATCH i-g-t v2 23/33] tests/kms_psr_sink_crc: " Robert Foss
2017-01-26 11:00 ` Mika Kahola [this message]
2017-01-24 23:33 ` [PATCH i-g-t v2 24/33] tests/kms_pwrite_crc: " Robert Foss
2017-01-26 11:02 ` Mika Kahola
2017-01-24 23:33 ` [PATCH i-g-t v2 25/33] tests/kms_rmfb: " Robert Foss
2017-01-26 11:04 ` Mika Kahola
2017-01-24 23:33 ` [PATCH i-g-t v2 26/33] tests/kms_rotation_crc: " Robert Foss
2017-01-26 11:12 ` Mika Kahola
2017-01-24 23:33 ` [PATCH i-g-t v2 27/33] tests/kms_sink_crc_basic: " Robert Foss
2017-01-26 11:13 ` Mika Kahola
2017-01-24 23:33 ` [PATCH i-g-t v2 28/33] tests/kms_universal_plane: " Robert Foss
2017-01-26 11:15 ` Mika Kahola
2017-01-24 23:33 ` [PATCH i-g-t v2 29/33] tests/kms_vblank: " Robert Foss
2017-01-26 11:19 ` Mika Kahola
2017-01-24 23:33 ` [PATCH i-g-t v2 30/33] tests/prime_mmap_kms: " Robert Foss
2017-01-26 11:21 ` Mika Kahola
2017-01-24 23:33 ` [PATCH i-g-t v2 31/33] tests/kms_ccs: " Robert Foss
2017-01-26 11:26 ` Mika Kahola
2017-01-24 23:33 ` [PATCH i-g-t v2 32/33] tests/kms_plane_lowres: " Robert Foss
2017-01-26 11:30 ` Mika Kahola
2017-01-24 23:34 ` [PATCH i-g-t v2 33/33] lib/igt_kms: Remove code obsoleted by dyn n_planes implementation Robert Foss
2017-01-26 11:50 ` Mika Kahola
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=1485428428.9014.116.camel@intel.com \
--to=mika.kahola@intel.com \
--cc=daniels@collabora.com \
--cc=gustavo.padovan@collabora.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=maarten.lankhorst@intel.com \
--cc=petri.latvala@intel.com \
--cc=robert.foss@collabora.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.