diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/kms_ccs.c | 2 | ||||
| -rw-r--r-- | tests/kms_flip.c | 4 | ||||
| -rw-r--r-- | tests/kms_frontbuffer_tracking.c | 6 | ||||
| -rw-r--r-- | tests/pm_rpm.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/tests/kms_ccs.c b/tests/kms_ccs.c index e1ee5880..e03f947e 100644 --- a/tests/kms_ccs.c +++ b/tests/kms_ccs.c @@ -378,7 +378,7 @@ static void generate_fb(data_t *data, struct igt_fb *fb, fb->drm_format = f.pixel_format; fb->width = f.width; fb->height = f.height; - fb->stride = f.pitches[0]; + fb->strides[0] = f.pitches[0]; fb->tiling = f.modifier[0]; fb->size = size[0]; fb->cairo_surface = NULL; diff --git a/tests/kms_flip.c b/tests/kms_flip.c index 393d690a..f7d08a60 100644 --- a/tests/kms_flip.c +++ b/tests/kms_flip.c @@ -592,7 +592,7 @@ static void recreate_fb(struct test_output *o) igt_assert(r); do_or_die(drmModeAddFB(drm_fd, o->fb_width, o->fb_height, o->depth, - o->bpp, fb_info->stride, + o->bpp, fb_info->strides[0], r->handle, &new_fb_id)); gem_close(drm_fd, r->handle); @@ -612,7 +612,7 @@ static void set_y_tiling(struct test_output *o, int fb_idx) r = drmModeGetFB(drm_fd, fb_info->fb_id); igt_assert(r); /* Newer kernels don't allow such shenagians any more, so skip the test. */ - igt_require(__gem_set_tiling(drm_fd, r->handle, I915_TILING_Y, fb_info->stride) == 0); + igt_require(__gem_set_tiling(drm_fd, r->handle, I915_TILING_Y, fb_info->strides[0]) == 0); gem_close(drm_fd, r->handle); drmFree(r); } diff --git a/tests/kms_frontbuffer_tracking.c b/tests/kms_frontbuffer_tracking.c index 1bce6760..265c313a 100644 --- a/tests/kms_frontbuffer_tracking.c +++ b/tests/kms_frontbuffer_tracking.c @@ -1157,7 +1157,7 @@ static void start_busy_thread(struct igt_fb *fb) busy_thread.stop = false; busy_thread.handle = fb->gem_handle; busy_thread.size = fb->size; - busy_thread.stride = fb->stride; + busy_thread.stride = fb->strides[0]; busy_thread.width = fb->width; busy_thread.height = fb->height; busy_thread.color = pick_color(fb, COLOR_PRIM_BG); @@ -2859,7 +2859,7 @@ static void badstride_subtest(const struct test_mode *t) create_fb(t->format, params->primary.fb->width + 4096, params->primary.fb->height, opt.tiling, t->plane, &wide_fb); - igt_assert(wide_fb.stride > 16384); + igt_assert(wide_fb.strides[0] > 16384); fill_fb(&wide_fb, COLOR_PRIM_BG); @@ -2928,7 +2928,7 @@ static void stridechange_subtest(const struct test_mode *t) opt.tiling, t->plane, &new_fb); fill_fb(&new_fb, COLOR_PRIM_BG); - igt_assert(old_fb->stride != new_fb.stride); + igt_assert(old_fb->strides[0] != new_fb.strides[0]); /* We can't assert that FBC will be enabled since there may not be * enough space for the CFB, but we can check the CRC. */ diff --git a/tests/pm_rpm.c b/tests/pm_rpm.c index c24fd95b..2d6c5b49 100644 --- a/tests/pm_rpm.c +++ b/tests/pm_rpm.c @@ -1547,7 +1547,7 @@ static void cursor_subtest(bool dpms) * hopefully it has some fences around it. */ rc = drmModeRmFB(drm_fd, cursor_fb3.fb_id); igt_assert_eq(rc, 0); - gem_set_tiling(drm_fd, cursor_fb3.gem_handle, false, cursor_fb3.stride); + gem_set_tiling(drm_fd, cursor_fb3.gem_handle, false, cursor_fb3.strides[0]); igt_assert(wait_for_suspended()); rc = drmModeSetCursor(drm_fd, crtc_id, cursor_fb3.gem_handle, |