| Message ID | 1461164389-15726-8-git-send-email-robert.foss@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Apr 20, 2016 at 10:59:49AM -0400, robert.foss@collabora.com wrote: > From: Robert Foss <robert.foss@collabora.com> > > Change DRIVER_INTEL to DRIVER_ANY to enable tests/kms_flip_event_leak > on any driver. > Switch the tiling format to something intel indenpendant. > > Signed-off-by: Robert Foss <robert.foss@collabora.com> I thought we need the same treatment of explicitly setting a mode here as with drm_event? Or was that another one? And where's the patch to make drm_event generic? With my confusion about all the pending patches resolved, ack on this one too. -Daniel > --- > tests/kms_flip_event_leak.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/tests/kms_flip_event_leak.c b/tests/kms_flip_event_leak.c > index c19ed98..a1389b4 100644 > --- a/tests/kms_flip_event_leak.c > +++ b/tests/kms_flip_event_leak.c > @@ -62,13 +62,13 @@ static bool test(data_t *data, enum pipe pipe, igt_output_t *output) > > igt_create_color_fb(data->drm_fd, mode->hdisplay, mode->vdisplay, > DRM_FORMAT_XRGB8888, > - LOCAL_I915_FORMAT_MOD_X_TILED, > + LOCAL_DRM_FORMAT_MOD_NONE, > 0.0, 0.0, 0.0, &fb[0]); > > igt_plane_set_fb(primary, &fb[0]); > igt_display_commit2(&data->display, COMMIT_LEGACY); > > - fd = drm_open_driver(DRIVER_INTEL); > + fd = drm_open_driver(DRIVER_ANY); > > ret = drmDropMaster(data->drm_fd); > igt_assert_eq(ret, 0); > @@ -78,7 +78,7 @@ static bool test(data_t *data, enum pipe pipe, igt_output_t *output) > > igt_create_color_fb(fd, mode->hdisplay, mode->vdisplay, > DRM_FORMAT_XRGB8888, > - LOCAL_I915_FORMAT_MOD_X_TILED, > + LOCAL_DRM_FORMAT_MOD_NONE, > 0.0, 0.0, 0.0, &fb[1]); > ret = drmModePageFlip(fd, output->config.crtc->crtc_id, > fb[1].fb_id, DRM_MODE_PAGE_FLIP_EVENT, > @@ -109,7 +109,7 @@ igt_simple_main > > igt_skip_on_simulation(); > > - data.drm_fd = drm_open_driver_master(DRIVER_INTEL); > + data.drm_fd = drm_open_driver_master(DRIVER_ANY); > kmstest_set_vt_graphics_mode(); > > igt_display_init(&data.display, data.drm_fd); > -- > 2.5.0 >
diff --git a/tests/kms_flip_event_leak.c b/tests/kms_flip_event_leak.c index c19ed98..a1389b4 100644 --- a/tests/kms_flip_event_leak.c +++ b/tests/kms_flip_event_leak.c @@ -62,13 +62,13 @@ static bool test(data_t *data, enum pipe pipe, igt_output_t *output) igt_create_color_fb(data->drm_fd, mode->hdisplay, mode->vdisplay, DRM_FORMAT_XRGB8888, - LOCAL_I915_FORMAT_MOD_X_TILED, + LOCAL_DRM_FORMAT_MOD_NONE, 0.0, 0.0, 0.0, &fb[0]); igt_plane_set_fb(primary, &fb[0]); igt_display_commit2(&data->display, COMMIT_LEGACY); - fd = drm_open_driver(DRIVER_INTEL); + fd = drm_open_driver(DRIVER_ANY); ret = drmDropMaster(data->drm_fd); igt_assert_eq(ret, 0); @@ -78,7 +78,7 @@ static bool test(data_t *data, enum pipe pipe, igt_output_t *output) igt_create_color_fb(fd, mode->hdisplay, mode->vdisplay, DRM_FORMAT_XRGB8888, - LOCAL_I915_FORMAT_MOD_X_TILED, + LOCAL_DRM_FORMAT_MOD_NONE, 0.0, 0.0, 0.0, &fb[1]); ret = drmModePageFlip(fd, output->config.crtc->crtc_id, fb[1].fb_id, DRM_MODE_PAGE_FLIP_EVENT, @@ -109,7 +109,7 @@ igt_simple_main igt_skip_on_simulation(); - data.drm_fd = drm_open_driver_master(DRIVER_INTEL); + data.drm_fd = drm_open_driver_master(DRIVER_ANY); kmstest_set_vt_graphics_mode(); igt_display_init(&data.display, data.drm_fd);