flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-21 14:56:18 +00:00
Code Issues Releases Wiki Activity

kms_frontbuffer_tracking: add a wrapper for igt_create_fb()

Browse Source 
The wrapper will do a few additional things when we add support for
formats different than XRGB8888.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
This commit is contained in:
Paulo Zanoni 2015-08-11 10:26:46 -03:00
parent 445182f26b
commit e4b94900b5
1 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
tests/kms_frontbuffer_tracking.c
View File

@ -454,6 +454,12 @@ static bool init_modeset_cached_params(void)
return true; return true;
} }
static void create_fb(int width, int height, uint32_t format, uint64_t tiling,
struct igt_fb *fb)
{
igt_create_fb(drm.fd, width, height, format, tiling, fb);
}
#define BIGFB_X_OFFSET 500 #define BIGFB_X_OFFSET 500
#define BIGFB_Y_OFFSET 500 #define BIGFB_Y_OFFSET 500
/* /*
@ -508,42 +514,39 @@ static void create_big_fb(void)
big_h = prim_h + scnd_h + offs_h + BIGFB_Y_OFFSET; big_h = prim_h + scnd_h + offs_h + BIGFB_Y_OFFSET;
igt_create_fb(drm.fd, big_w, big_h, DRM_FORMAT_XRGB8888, create_fb(big_w, big_h, DRM_FORMAT_XRGB8888,
LOCAL_I915_FORMAT_MOD_X_TILED, &fbs.big); LOCAL_I915_FORMAT_MOD_X_TILED, &fbs.big);
} }
static void create_fbs(void) static void create_fbs(void)
{ {
igt_create_fb(drm.fd, prim_mode_params.mode->hdisplay, create_fb(prim_mode_params.mode->hdisplay,
prim_mode_params.mode->vdisplay, prim_mode_params.mode->vdisplay, DRM_FORMAT_XRGB8888,
DRM_FORMAT_XRGB8888, LOCAL_I915_FORMAT_MOD_X_TILED, LOCAL_I915_FORMAT_MOD_X_TILED, &fbs.prim_pri);
&fbs.prim_pri); create_fb(prim_mode_params.cursor.w,
igt_create_fb(drm.fd, prim_mode_params.cursor.w,
prim_mode_params.cursor.h, DRM_FORMAT_ARGB8888, prim_mode_params.cursor.h, DRM_FORMAT_ARGB8888,
LOCAL_DRM_FORMAT_MOD_NONE, &fbs.prim_cur); LOCAL_DRM_FORMAT_MOD_NONE, &fbs.prim_cur);
igt_create_fb(drm.fd, prim_mode_params.sprite.w, create_fb(prim_mode_params.sprite.w,
prim_mode_params.sprite.h, DRM_FORMAT_XRGB8888, prim_mode_params.sprite.h, DRM_FORMAT_XRGB8888,
LOCAL_I915_FORMAT_MOD_X_TILED, &fbs.prim_spr); LOCAL_I915_FORMAT_MOD_X_TILED, &fbs.prim_spr);
igt_create_fb(drm.fd, offscreen_fb.w, offscreen_fb.h, create_fb(offscreen_fb.w, offscreen_fb.h, DRM_FORMAT_XRGB8888,
DRM_FORMAT_XRGB8888, LOCAL_I915_FORMAT_MOD_X_TILED, LOCAL_I915_FORMAT_MOD_X_TILED, &fbs.offscreen);
&fbs.offscreen);
create_big_fb(); create_big_fb();
if (!scnd_mode_params.connector_id) if (!scnd_mode_params.connector_id)
return; return;
igt_create_fb(drm.fd, scnd_mode_params.mode->hdisplay, create_fb(scnd_mode_params.mode->hdisplay,
scnd_mode_params.mode->vdisplay, scnd_mode_params.mode->vdisplay, DRM_FORMAT_XRGB8888,
LOCAL_I915_FORMAT_MOD_X_TILED, &fbs.scnd_pri);
create_fb(scnd_mode_params.cursor.w, scnd_mode_params.cursor.h,
DRM_FORMAT_ARGB8888, LOCAL_DRM_FORMAT_MOD_NONE,
&fbs.scnd_cur);
create_fb(scnd_mode_params.sprite.w, scnd_mode_params.sprite.h,
DRM_FORMAT_XRGB8888, LOCAL_I915_FORMAT_MOD_X_TILED, DRM_FORMAT_XRGB8888, LOCAL_I915_FORMAT_MOD_X_TILED,
&fbs.scnd_pri); &fbs.scnd_spr);
igt_create_fb(drm.fd, scnd_mode_params.cursor.w,
scnd_mode_params.cursor.h, DRM_FORMAT_ARGB8888,
LOCAL_DRM_FORMAT_MOD_NONE, &fbs.scnd_cur);
igt_create_fb(drm.fd, scnd_mode_params.sprite.w,
scnd_mode_params.sprite.h, DRM_FORMAT_XRGB8888,
LOCAL_I915_FORMAT_MOD_X_TILED, &fbs.scnd_spr);
} }
static bool set_mode_for_params(struct modeset_params *params) static bool set_mode_for_params(struct modeset_params *params)
@ -970,7 +973,7 @@ static void init_blue_crc(void)
disable_features(); disable_features();
unset_all_crtcs(); unset_all_crtcs();
igt_create_fb(drm.fd, prim_mode_params.mode->hdisplay, create_fb(prim_mode_params.mode->hdisplay,
prim_mode_params.mode->vdisplay, DRM_FORMAT_XRGB8888, prim_mode_params.mode->vdisplay, DRM_FORMAT_XRGB8888,
LOCAL_I915_FORMAT_MOD_X_TILED, &blue); LOCAL_I915_FORMAT_MOD_X_TILED, &blue);
@ -998,9 +1001,8 @@ static void init_crcs(struct draw_pattern_info *pattern)
pattern->crcs = calloc(pattern->n_rects, sizeof(*(pattern->crcs))); pattern->crcs = calloc(pattern->n_rects, sizeof(*(pattern->crcs)));
for (r = 0; r < pattern->n_rects; r++) for (r = 0; r < pattern->n_rects; r++)
igt_create_fb(drm.fd, prim_mode_params.mode->hdisplay, create_fb(prim_mode_params.mode->hdisplay,
prim_mode_params.mode->vdisplay, prim_mode_params.mode->vdisplay, DRM_FORMAT_XRGB8888,
DRM_FORMAT_XRGB8888,
LOCAL_I915_FORMAT_MOD_X_TILED, &tmp_fbs[r]); LOCAL_I915_FORMAT_MOD_X_TILED, &tmp_fbs[r]);
for (r = 0; r < pattern->n_rects; r++) for (r = 0; r < pattern->n_rects; r++)
@ -1880,7 +1882,7 @@ static void flip_subtest(const struct test_mode *t, enum flip_type type)
prepare_subtest(t, pattern); prepare_subtest(t, pattern);
igt_create_fb(drm.fd, params->fb.fb->width, params->fb.fb->height, create_fb(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);
orig_fb = params->fb.fb; orig_fb = params->fb.fb;
@ -2155,7 +2157,7 @@ static void fullscreen_plane_subtest(const struct test_mode *t)
prepare_subtest(t, pattern); prepare_subtest(t, pattern);
rect = pattern->get_rect(&params->fb, 0); rect = pattern->get_rect(&params->fb, 0);
igt_create_fb(drm.fd, rect.w, rect.h, DRM_FORMAT_XRGB8888, create_fb(rect.w, rect.h, DRM_FORMAT_XRGB8888,
LOCAL_I915_FORMAT_MOD_X_TILED, &fullscreen_fb); LOCAL_I915_FORMAT_MOD_X_TILED, &fullscreen_fb);
igt_draw_fill_fb(drm.fd, &fullscreen_fb, rect.color); igt_draw_fill_fb(drm.fd, &fullscreen_fb, rect.color);
@ -2219,7 +2221,7 @@ static void modesetfrombusy_subtest(const struct test_mode *t)
prepare_subtest(t, NULL); prepare_subtest(t, NULL);
igt_create_fb(drm.fd, params->fb.fb->width, params->fb.fb->height, create_fb(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, 0xFF); igt_draw_fill_fb(drm.fd, &fb2, 0xFF);
@ -2318,9 +2320,8 @@ static void farfromfence_subtest(const struct test_mode *t)
prepare_subtest(t, pattern); prepare_subtest(t, pattern);
target = pick_target(t, params); target = pick_target(t, params);
igt_create_fb(drm.fd, params->mode->hdisplay, max_height, create_fb(params->mode->hdisplay, max_height, DRM_FORMAT_XRGB8888,
DRM_FORMAT_XRGB8888, LOCAL_I915_FORMAT_MOD_X_TILED, LOCAL_I915_FORMAT_MOD_X_TILED, &tall_fb);
&tall_fb);
igt_draw_fill_fb(drm.fd, &tall_fb, 0xFF); igt_draw_fill_fb(drm.fd, &tall_fb, 0xFF);
@ -2389,9 +2390,8 @@ static void badstride_subtest(const struct test_mode *t)
prepare_subtest(t, NULL); prepare_subtest(t, NULL);
igt_create_fb(drm.fd, params->fb.fb->width + 4096, create_fb(params->fb.fb->width + 4096, params->fb.fb->height,
params->fb.fb->height, DRM_FORMAT_XRGB8888, DRM_FORMAT_XRGB8888, LOCAL_I915_FORMAT_MOD_X_TILED, &wide_fb);
LOCAL_I915_FORMAT_MOD_X_TILED, &wide_fb);
igt_assert(wide_fb.stride > 16384); igt_assert(wide_fb.stride > 16384);
igt_draw_fill_fb(drm.fd, &wide_fb, 0xFF); igt_draw_fill_fb(drm.fd, &wide_fb, 0xFF);