diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-08-26 20:48:08 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2016-08-26 20:52:05 +0100 |
| commit | 9d5e393da3f58c4d7bbdb61c96b01416e043836f (patch) | |
| tree | 8af578e2be814e1d5761871b9813fc5ac787eb2c /tests/kms_flip.c | |
| parent | c1e0e30a4ad0658b159d2e7fc605ad4925edfcb0 (diff) | |
igt/kms_flip: There's no such thing as bo-too-big
Since we can now use the entire global GTT for display, we can handle
framebuffers that no longer fit into the mappable aperture. Update the
kms_flip/bo-too-big expectations.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97502
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'tests/kms_flip.c')
| -rw-r--r-- | tests/kms_flip.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/tests/kms_flip.c b/tests/kms_flip.c index f144b1e7..d33a4c47 100644 --- a/tests/kms_flip.c +++ b/tests/kms_flip.c @@ -1352,8 +1352,10 @@ static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs, /* 256 MB is usually the maximum mappable aperture, * (make it 4x times that to ensure failure) */ - if (o->flags & TEST_BO_TOOBIG) - bo_size = 4*256*1024*1024; + if (o->flags & TEST_BO_TOOBIG) { + bo_size = 4*gem_mappable_aperture_size(); + igt_require(bo_size < gem_global_aperture_size(drm_fd)); + } o->fb_ids[0] = igt_create_fb(drm_fd, o->fb_width, o->fb_height, igt_bpp_depth_to_drm_format(o->bpp, o->depth), @@ -1401,11 +1403,7 @@ static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs, if (o->flags & TEST_CHECK_TS) sleep(1); - if (o->flags & TEST_BO_TOOBIG) { - igt_assert_eq(do_page_flip(o, o->fb_ids[1], true), -E2BIG); - goto out; - } else - igt_assert_eq(do_page_flip(o, o->fb_ids[1], true), 0); + igt_assert_eq(do_page_flip(o, o->fb_ids[1], true), 0); wait_for_events(o); o->current_fb_id = 1; |