Quoting Maarten Lankhorst (2017-09-12 10:57:13) > This tests the various parts of atomic that I want to make > interruptible. Running with --debug shows the stats from > __igt_sigiter_continue, which can be used to make sure that > we don't fall over. > > The default igt kms helpers use drmIoctl, which is not intercepted > by igt_while_interruptible. Only igt_ioctl is. This means we have > to call the ioctls manually here. > > Changes since v1: > - Implement interruptible DPMS checking too. > - Use igt_ioctl + igt_while_interruptible, instead of the signal helper > shotgun. > Changes since v2: > - Bump whitespace to get rid of the weird double } at same indent. > - Use more newlines in the call to the atomic ioctl. > > Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com> > Cc: Daniel Stone <dani...@collabora.com> > Acked-by: Daniel Vetter <daniel.vet...@ffwll.ch> > --- > lib/igt_kms.c | 3 +- > lib/igt_kms.h | 1 + > tests/Makefile.sources | 1 + > tests/kms_atomic_interruptible.c | 323 > +++++++++++++++++++++++++++++++++++++++ > 4 files changed, 327 insertions(+), 1 deletion(-) > create mode 100644 tests/kms_atomic_interruptible.c > > diff --git a/lib/igt_kms.c b/lib/igt_kms.c > index 72fde792ba89..7bcafc072f70 100644 > --- a/lib/igt_kms.c > +++ b/lib/igt_kms.c > @@ -186,7 +186,8 @@ const char *igt_crtc_prop_names[IGT_NUM_CRTC_PROPS] = { > > const char *igt_connector_prop_names[IGT_NUM_CONNECTOR_PROPS] = { > "scaling mode", > - "CRTC_ID" > + "CRTC_ID", > + "DPMS" > }; > > /* > diff --git a/lib/igt_kms.h b/lib/igt_kms.h > index e5dc329b161e..3d1061fa08c8 100644 > --- a/lib/igt_kms.h > +++ b/lib/igt_kms.h > @@ -114,6 +114,7 @@ extern const char *igt_crtc_prop_names[]; > enum igt_atomic_connector_properties { > IGT_CONNECTOR_SCALING_MODE = 0, > IGT_CONNECTOR_CRTC_ID, > + IGT_CONNECTOR_DPMS, > IGT_NUM_CONNECTOR_PROPS > }; > > diff --git a/tests/Makefile.sources b/tests/Makefile.sources > index 0f4e39af10a1..cf542df181a8 100644 > --- a/tests/Makefile.sources > +++ b/tests/Makefile.sources > @@ -172,6 +172,7 @@ TESTS_progs = \ > kms_3d \ > kms_addfb_basic \ > kms_atomic \ > + kms_atomic_interruptible \ > kms_atomic_transition \ > kms_busy \ > kms_ccs \ > diff --git a/tests/kms_atomic_interruptible.c > b/tests/kms_atomic_interruptible.c > new file mode 100644 > index 000000000000..dcc60f1c654a > --- /dev/null > +++ b/tests/kms_atomic_interruptible.c > @@ -0,0 +1,323 @@ > +/* > + * Copyright © 2016 Intel Corporation > + * > + * Permission is hereby granted, free of charge, to any person obtaining a > + * copy of this software and associated documentation files (the "Software"), > + * to deal in the Software without restriction, including without limitation > + * the rights to use, copy, modify, merge, publish, distribute, sublicense, > + * and/or sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice (including the next > + * paragraph) shall be included in all copies or substantial portions of the > + * Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER > DEALINGS > + * IN THE SOFTWARE. > + */ > + > +#include "igt.h" > +#include "drmtest.h" > +#include "sw_sync.h" > + > +enum plane_test_type > +{ > + test_legacy_modeset, > + test_atomic_modeset, > + test_legacy_dpms, > + test_setplane, > + test_setcursor, > + test_pageflip > +}; > + > +static int block_plane(igt_display_t *display, igt_output_t *output, enum > plane_test_type test_type, igt_plane_t *plane) > +{ > + int timeline = sw_sync_timeline_create(); > + > + igt_fork(child, 1) { > + /* Ignore the signal helper, we need to block indefinitely on > the fence. */ > + signal(SIGCONT, SIG_IGN); > + > + if (test_type == test_legacy_modeset || test_type == > test_atomic_modeset) { > + igt_output_set_pipe(output, PIPE_NONE); > + igt_plane_set_fb(plane, NULL); > + } > + igt_plane_set_fence_fd(plane, > sw_sync_timeline_create_fence(timeline, 1));
Does igt_plane_set_fence_fd() consume the fd? If it does, that's nasty, but if it doesn't we have a leak. From my inspection, igt_plane_set_fence_fd creates a private copy of the fence fd, and doesn't bother to check if it was successful.... > + > + igt_display_commit2(display, COMMIT_ATOMIC); > + } > + > + return timeline; > +} > + > +static void unblock(int block) > +{ > + sw_sync_timeline_inc(block, 1); > + close(block); > +} > + > +static void ev_page_flip(int fd, unsigned seq, unsigned tv_sec, unsigned > tv_usec, void *user_data) > +{ > + igt_debug("Retrieved vblank seq: %u on unk\n", seq); > +} > + > +static drmEventContext drm_events = { > + .version = 2, > + .page_flip_handler = ev_page_flip > +}; > + > +static void run_plane_test(igt_display_t *display, enum pipe pipe, > igt_output_t *output, > + enum plane_test_type test_type, unsigned > plane_type) > +{ > + drmModeModeInfo *mode; > + igt_fb_t fb, fb2; > + igt_plane_t *primary, *plane; > + int block; > + > + /* > + * Make sure we start with everything disabled to force a real > modeset. > + * igt_display_init only sets sw state, and assumes the first test > doesn't care > + * about hw state. > + */ > + igt_display_commit2(display, COMMIT_ATOMIC); > + > + igt_output_set_pipe(output, pipe); > + > + primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); > + plane = igt_output_get_plane_type(output, plane_type); > + mode = igt_output_get_mode(output); > + > + igt_create_fb(display->drm_fd, mode->hdisplay, mode->vdisplay, > + DRM_FORMAT_XRGB8888, LOCAL_DRM_FORMAT_MOD_NONE, &fb); > + > + switch (plane_type) { > + case DRM_PLANE_TYPE_PRIMARY: > + igt_create_fb(display->drm_fd, mode->hdisplay, mode->vdisplay, > + DRM_FORMAT_XRGB8888, LOCAL_DRM_FORMAT_MOD_NONE, > &fb2); > + break; > + case DRM_PLANE_TYPE_CURSOR: > + igt_create_fb(display->drm_fd, 64, 64, > + DRM_FORMAT_ARGB8888, LOCAL_DRM_FORMAT_MOD_NONE, &fb2); > + break; > + } > + > + if (test_type != test_legacy_modeset && test_type != > test_atomic_modeset) { > + igt_plane_set_fb(primary, &fb); > + igt_display_commit2(display, COMMIT_ATOMIC); > + } > + > + igt_plane_set_fb(plane, &fb2); > + > + block = block_plane(display, output, test_type, plane); > + sleep(1); > + > + igt_fork(child, 1) { > + signal(SIGCONT, SIG_IGN); > + igt_assert(sleep(5) == 0); > + > + unblock(block); > + } > + > + /* run the test */ > + igt_while_interruptible(true) { > + switch (test_type) { > + case test_legacy_modeset: { > + struct drm_mode_crtc crtc = { > + .set_connectors_ptr = > (uint64_t)(uintptr_t)&output->id, > + .count_connectors = 1, > + .crtc_id = primary->pipe->crtc_id, > + .fb_id = fb2.fb_id, > + .mode_valid = 1, > + .mode = *(struct > drm_mode_modeinfo*)mode, > + }; > + > + do_or_die(igt_ioctl(display->drm_fd, > DRM_IOCTL_MODE_SETCRTC, &crtc)); > + break; > + } > + case test_atomic_modeset: { > + uint32_t objs[3] = { > + plane->pipe->crtc_id, > + output->id, > + plane->drm_plane->plane_id > + }; > + uint32_t count_props[3] = { 2, 1, 6 }; > + uint32_t props[] = { > + /* crtc: 2 props */ > + > plane->pipe->atomic_props_crtc[IGT_CRTC_MODE_ID], > + > plane->pipe->atomic_props_crtc[IGT_CRTC_ACTIVE], > + /* connector: 1 prop */ > + > output->config.atomic_props_connector[IGT_CONNECTOR_CRTC_ID], > + /* plane: remainder props */ > + > plane->atomic_props_plane[IGT_PLANE_CRTC_ID], > + > plane->atomic_props_plane[IGT_PLANE_FB_ID], > + > plane->atomic_props_plane[IGT_PLANE_SRC_W], > + > plane->atomic_props_plane[IGT_PLANE_SRC_H], > + > plane->atomic_props_plane[IGT_PLANE_CRTC_W], > + > plane->atomic_props_plane[IGT_PLANE_CRTC_H] > + }; > + uint64_t prop_vals[] = { > + /* crtc */ > + 0, /* mode_id, filled in below */ > + true, > + /* connector */ > + plane->pipe->crtc_id, > + /* plane */ > + plane->pipe->crtc_id, > + fb2.fb_id, > + IGT_FIXED(fb2.width, 0), > + IGT_FIXED(fb2.height, 0), > + fb2.width, > + fb2.height > + }; > + uint32_t mode_blob; > + > + struct drm_mode_atomic atm = { > + .flags = > DRM_MODE_ATOMIC_ALLOW_MODESET, > + .count_objs = 3, /* crtc, connector, > plane */ > + .objs_ptr = > (uint64_t)(uintptr_t)&objs, > + .count_props_ptr = > (uint64_t)(uintptr_t)&count_props, > + .props_ptr = > (uint64_t)(uintptr_t)&props, > + .prop_values_ptr = > (uint64_t)(uintptr_t)&prop_vals, > + }; > + > + > do_or_die(drmModeCreatePropertyBlob(display->drm_fd, mode, sizeof(*mode), > &mode_blob)); > + prop_vals[0] = mode_blob; > + > + do_or_die(igt_ioctl(display->drm_fd, > DRM_IOCTL_MODE_ATOMIC, &atm)); > + > + > do_or_die(drmModeDestroyPropertyBlob(display->drm_fd, mode_blob)); > + break; > + } > + case test_legacy_dpms: { > + struct drm_mode_connector_set_property prop = > { > + .value = DRM_MODE_DPMS_OFF, > + .prop_id = > output->config.atomic_props_connector[IGT_CONNECTOR_DPMS], > + .connector_id = output->id, > + }; > + > + do_or_die(igt_ioctl(display->drm_fd, > DRM_IOCTL_MODE_SETPROPERTY, &prop)); > + break; > + } > + case test_setcursor: { > + struct drm_mode_cursor cur = { > + .flags = DRM_MODE_CURSOR_BO, > + .crtc_id = plane->pipe->crtc_id, > + .width = fb2.width, > + .height = fb2.height, > + .handle = fb2.gem_handle, > + }; > + do_or_die(igt_ioctl(display->drm_fd, > DRM_IOCTL_MODE_CURSOR, &cur)); > + break; > + } > + case test_setplane: { > + struct drm_mode_set_plane setplane = { > + .plane_id = > plane->drm_plane->plane_id, > + .crtc_id = plane->pipe->crtc_id, > + .fb_id = fb2.fb_id, > + .crtc_w = fb2.width, > + .crtc_h = fb2.height, > + .src_w = IGT_FIXED(fb2.width, 0), > + .src_h = IGT_FIXED(fb2.height, 0), > + }; > + > + do_or_die(igt_ioctl(display->drm_fd, > DRM_IOCTL_MODE_SETPLANE, &setplane)); > + break; > + } > + case test_pageflip: { > + struct drm_mode_crtc_page_flip pageflip = { > + .crtc_id = plane->pipe->crtc_id, > + .fb_id = fb2.fb_id, > + .flags = DRM_MODE_PAGE_FLIP_EVENT, > + }; > + > + do_or_die(igt_ioctl(display->drm_fd, > DRM_IOCTL_MODE_PAGE_FLIP, &pageflip)); > + > + drmHandleEvent(display->drm_fd, &drm_events); > + break; > + } > + } > + } Looks ok. You might want to refactor out the do_or_die() if you ever hit them in practice, but in the mean time they make it clear what you want to check. -Chris _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx