[Intel-gfx] [PATCH i-g-t v3 2/4] tests/ chamelium: Remove the frame dump tests

Lyude Paul lyude at redhat.com
Wed Jul 5 20:53:54 UTC 2017


NAK. You're right that these don't actually give us any advantage over
just using CRCs and are just slower, however I left these tests in here
moreso just so we had something to actually test the frame dumping
functions so that we could avoid regressing them by accident since
we're the only users of those functions right now.

If I recall properly, isn't there a list of tests in igt's source that
they use for determining which tests to run on the CI? I think a better
solution would be to just disable this for CI runs, and maybe add some
comments pointing out that this test is only really useful for
developers making changes to the chamelium library.

On Wed, 2017-07-05 at 11:04 +0300, Paul Kocialkowski wrote:
> The frame dump tests provide no additional functionality over CRC
> tests
> and are considerably slower. Thus, these tests should be considered
> as
> poorer duplicates and removed.
> 
> Signed-off-by: Paul Kocialkowski <paul.kocialkowski at linux.intel.com>
> ---
>  tests/chamelium.c | 53 -------------------------------------------
> ----------
>  1 file changed, 53 deletions(-)
> 
> diff --git a/tests/chamelium.c b/tests/chamelium.c
> index 3fd2b02c..5cf8b3af 100644
> --- a/tests/chamelium.c
> +++ b/tests/chamelium.c
> @@ -496,53 +496,6 @@ test_display_crc_multiple(data_t *data, struct
> chamelium_port *port)
>  }
>  
>  static void
> -test_display_frame_dump(data_t *data, struct chamelium_port *port)
> -{
> -	igt_display_t display;
> -	igt_output_t *output;
> -	igt_plane_t *primary;
> -	struct igt_fb fb;
> -	struct chamelium_frame_dump *frame;
> -	drmModeModeInfo *mode;
> -	drmModeConnector *connector;
> -	int fb_id, i, j;
> -
> -	reset_state(data, port);
> -
> -	output = prepare_output(data, &display, port);
> -	connector = chamelium_port_get_connector(data->chamelium,
> port, false);
> -	primary = igt_output_get_plane_type(output,
> DRM_PLANE_TYPE_PRIMARY);
> -	igt_assert(primary);
> -
> -	for (i = 0; i < connector->count_modes; i++) {
> -		mode = &connector->modes[i];
> -		fb_id = igt_create_color_pattern_fb(data->drm_fd,
> -						    mode->hdisplay,
> mode->vdisplay,
> -						    DRM_FORMAT_XRGB8
> 888,
> -						    LOCAL_DRM_FORMAT
> _MOD_NONE,
> -						    0, 0, 0, &fb);
> -		igt_assert(fb_id > 0);
> -
> -		enable_output(data, port, output, mode, &fb);
> -
> -		igt_debug("Reading frame dumps from
> Chamelium...\n");
> -		chamelium_capture(data->chamelium, port, 0, 0, 0, 0,
> 5);
> -		for (j = 0; j < 5; j++) {
> -			frame = chamelium_read_captured_frame(
> -			    data->chamelium, j);
> -			chamelium_assert_frame_eq(data->chamelium,
> frame, &fb);
> -			chamelium_destroy_frame_dump(frame);
> -		}
> -
> -		disable_output(data, port, output);
> -		igt_remove_fb(data->drm_fd, &fb);
> -	}
> -
> -	drmModeFreeConnector(connector);
> -	igt_display_fini(&display);
> -}
> -
> -static void
>  test_hpd_without_ddc(data_t *data, struct chamelium_port *port)
>  {
>  	struct udev_monitor *mon = igt_watch_hotplug();
> @@ -695,9 +648,6 @@ igt_main
>  
>  		connector_subtest("dp-crc-multiple", DisplayPort)
>  			test_display_crc_multiple(&data, port);
> -
> -		connector_subtest("dp-frame-dump", DisplayPort)
> -			test_display_frame_dump(&data, port);
>  	}
>  
>  	igt_subtest_group {
> @@ -752,9 +702,6 @@ igt_main
>  
>  		connector_subtest("hdmi-crc-multiple", HDMIA)
>  			test_display_crc_multiple(&data, port);
> -
> -		connector_subtest("hdmi-frame-dump", HDMIA)
> -			test_display_frame_dump(&data, port);
>  	}
>  
>  	igt_subtest_group {
-- 
Cheers,
	Lyude


More information about the Intel-gfx mailing list