flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-27 09:46:28 +00:00
Code Issues Releases Wiki Activity

tests/kms_frontbuffer_tracking: simplify flib_subtest fb handling

Browse Source 
Get rid of fb2_region, use params->fb directly instead.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
This commit is contained in:
Paulo Zanoni 2015-06-23 10:49:54 -03:00
parent 77e1bac6eb
commit 7756e88445
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/kms_frontbuffer_tracking.c
View File

@ -1717,8 +1717,7 @@ static void flip_subtest(const struct test_mode *t)
{ {
int r, rc; int r, rc;
int assertions = 0; int assertions = 0;
struct igt_fb fb2; struct igt_fb fb2, *orig_fb;
struct fb_region fb2_region, *target;
struct modeset_params *params = pick_params(t); struct modeset_params *params = pick_params(t);
struct draw_pattern_info *pattern = &pattern1; struct draw_pattern_info *pattern = &pattern1;
uint32_t bg_color; uint32_t bg_color;
@ -1741,22 +1740,18 @@ static void flip_subtest(const struct test_mode *t)
igt_create_fb(drm.fd, params->fb.fb->width, params->fb.fb->height, igt_create_fb(drm.fd, params->fb.fb->width, params->fb.fb->height,
DRM_FORMAT_XRGB8888, LOCAL_I915_FORMAT_MOD_X_TILED, &fb2); DRM_FORMAT_XRGB8888, LOCAL_I915_FORMAT_MOD_X_TILED, &fb2);
igt_draw_fill_fb(drm.fd, &fb2, bg_color); igt_draw_fill_fb(drm.fd, &fb2, bg_color);
fb2_region.fb = &fb2; orig_fb = params->fb.fb;
fb2_region.x = params->fb.x;
fb2_region.y = params->fb.y;
fb2_region.w = params->fb.w;
fb2_region.h = params->fb.h;
for (r = 0; r < pattern->n_rects; r++) { for (r = 0; r < pattern->n_rects; r++) {
target = (r % 2 == 0) ? &fb2_region : &params->fb; params->fb.fb = (r % 2 == 0) ? &fb2 : orig_fb;
if (r != 0) if (r != 0)
draw_rect(pattern, target, t->method, r - 1); draw_rect(pattern, &params->fb, t->method, r - 1);
draw_rect(pattern, target, t->method, r); draw_rect(pattern, &params->fb, t->method, r);
update_wanted_crc(t, &pattern->crcs[r]); update_wanted_crc(t, &pattern->crcs[r]);
rc = drmModePageFlip(drm.fd, params->crtc_id, target->fb->fb_id, rc = drmModePageFlip(drm.fd, params->crtc_id,
0, NULL); params->fb.fb->fb_id, 0, NULL);
igt_assert(rc == 0); igt_assert(rc == 0);
do_assertions(assertions); do_assertions(assertions);