lib/igt_kms: s/kmstest_create_fb2/kmstest_create_fb/

Simplify the name since the old _fb function is now gone.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index c752490..ad97606 100644 (file)
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -299,7 +299,7 @@ uint32_t drm_format_to_bpp(uint32_t drm_format)
        abort();
 }
 
-unsigned int kmstest_create_fb2(int fd, int width, int height, uint32_t format,
+unsigned int kmstest_create_fb(int fd, int width, int height, uint32_t format,
                                bool tiled, struct kmstest_fb *fb)
 {
        uint32_t handles[4];
@@ -346,7 +346,7 @@ unsigned int kmstest_create_color_fb(int fd, int width, int height,
        unsigned int fb_id;
        cairo_t *cr;
 
-       fb_id = kmstest_create_fb2(fd, width, height, format, tiled, fb);
+       fb_id = kmstest_create_fb(fd, width, height, format, tiled, fb);
        igt_assert(fb_id);
 
        cr = kmstest_get_cairo_ctx(fd, fb);

diff --git a/lib/igt_kms.h b/lib/igt_kms.h
index 1f61358..519fea0 100644 (file)
--- a/lib/igt_kms.h
+++ b/lib/igt_kms.h
@@ -77,8 +77,8 @@ int kmstest_cairo_printf_line(cairo_t *cr, enum kmstest_text_align align,
                               double yspacing, const char *fmt, ...)
                               __attribute__((format (printf, 4, 5)));
 
-unsigned int kmstest_create_fb2(int fd, int width, int height, uint32_t format,
-                               bool tiled, struct kmstest_fb *fb);
+unsigned int kmstest_create_fb(int fd, int width, int height, uint32_t format,
+                              bool tiled, struct kmstest_fb *fb);
 unsigned int kmstest_create_color_fb(int fd, int width, int height,
                                     uint32_t format, bool tiled,
                                     double r, double g, double b,

diff --git a/tests/kms_cursor_crc.c b/tests/kms_cursor_crc.c
index f95448f..dd4c727 100644 (file)
--- a/tests/kms_cursor_crc.c
+++ b/tests/kms_cursor_crc.c
@@ -302,9 +302,9 @@ static void create_cursor_fb(data_t *data,
        cairo_t *cr;
        uint32_t fb_id[NUM_CURSOR_TYPES];
 
-       fb_id[cursor_type] = kmstest_create_fb2(data->drm_fd, cur_w, cur_h,
-                                               DRM_FORMAT_ARGB8888, false,
-                                               &data->fb[cursor_type]);
+       fb_id[cursor_type] = kmstest_create_fb(data->drm_fd, cur_w, cur_h,
+                                              DRM_FORMAT_ARGB8888, false,
+                                              &data->fb[cursor_type]);
        igt_assert(fb_id[cursor_type]);
 
        cr = kmstest_get_cairo_ctx(data->drm_fd,

diff --git a/tests/kms_fbc_crc.c b/tests/kms_fbc_crc.c
index f1d918b..d60aaaa 100644 (file)
--- a/tests/kms_fbc_crc.c
+++ b/tests/kms_fbc_crc.c
@@ -95,8 +95,8 @@ static uint32_t create_fb(data_t *data,
        uint32_t fb_id;
        cairo_t *cr;
 
-       fb_id = kmstest_create_fb2(data->drm_fd, w, h,
-                                  DRM_FORMAT_XRGB8888, true, fb);
+       fb_id = kmstest_create_fb(data->drm_fd, w, h,
+                                 DRM_FORMAT_XRGB8888, true, fb);
        igt_assert(fb_id);
 
        cr = kmstest_get_cairo_ctx(data->drm_fd, fb);

diff --git a/tests/kms_flip.c b/tests/kms_flip.c
index d147bf4..c31a1e3 100644 (file)
--- a/tests/kms_flip.c
+++ b/tests/kms_flip.c
@@ -1290,13 +1290,13 @@ static void run_test_on_crtc_set(struct test_output *o, int *crtc_idxs,
        if (o->flags & TEST_FENCE_STRESS)
                tiled = true;
 
-       o->fb_ids[0] = kmstest_create_fb2(drm_fd, o->fb_width, o->fb_height,
+       o->fb_ids[0] = kmstest_create_fb(drm_fd, o->fb_width, o->fb_height,
                                         bpp_depth_to_drm_format(o->bpp, o->depth),
                                         tiled, &o->fb_info[0]);
-       o->fb_ids[1] = kmstest_create_fb2(drm_fd, o->fb_width, o->fb_height,
+       o->fb_ids[1] = kmstest_create_fb(drm_fd, o->fb_width, o->fb_height,
                                         bpp_depth_to_drm_format(o->bpp, o->depth),
                                         tiled, &o->fb_info[1]);
-       o->fb_ids[2] = kmstest_create_fb2(drm_fd, o->fb_width, o->fb_height,
+       o->fb_ids[2] = kmstest_create_fb(drm_fd, o->fb_width, o->fb_height,
                                         bpp_depth_to_drm_format(o->bpp, o->depth),
                                         true, &o->fb_info[2]);
        igt_assert(o->fb_ids[0]);

diff --git a/tests/kms_plane.c b/tests/kms_plane.c
index ca73f4f..b24a1b7 100644 (file)
--- a/tests/kms_plane.c
+++ b/tests/kms_plane.c
@@ -68,7 +68,7 @@ create_fb_for_mode__position(data_t *data, drmModeModeInfo *mode,
        unsigned int fb_id;
        cairo_t *cr;
 
-       fb_id = kmstest_create_fb2(data->drm_fd,
+       fb_id = kmstest_create_fb(data->drm_fd,
                                  mode->hdisplay, mode->vdisplay,
                                  DRM_FORMAT_XRGB8888,
                                  false /* tiling */,

diff --git a/tests/kms_render.c b/tests/kms_render.c
index dda8442..493bb5e 100644 (file)
--- a/tests/kms_render.c
+++ b/tests/kms_render.c
@@ -128,10 +128,10 @@ static int test_format(const char *test_name,
        width = mode->hdisplay;
        height = mode->vdisplay;
 
-       if (!kmstest_create_fb2(drm_fd, width, height, format, false, &fb[0]))
+       if (!kmstest_create_fb(drm_fd, width, height, format, false, &fb[0]))
                goto err1;
 
-       if (!kmstest_create_fb2(drm_fd, width, height, format, false, &fb[1]))
+       if (!kmstest_create_fb(drm_fd, width, height, format, false, &fb[1]))
                goto err2;
 
        if (drmModeSetCrtc(drm_fd, cconf->crtc->crtc_id, fb[0].fb_id,

diff --git a/tests/kms_setmode.c b/tests/kms_setmode.c
index 3a764c3..e873fb2 100644 (file)
--- a/tests/kms_setmode.c
+++ b/tests/kms_setmode.c
@@ -188,7 +188,7 @@ static void create_fb_for_crtc(struct crtc_config *crtc,
        bpp = 32;
        depth = 24;
        enable_tiling = false;
-       fb_id = kmstest_create_fb2(drm_fd, crtc->mode.hdisplay,
+       fb_id = kmstest_create_fb(drm_fd, crtc->mode.hdisplay,
                                  crtc->mode.vdisplay,
                                  bpp_depth_to_drm_format(bpp, depth),
                                  enable_tiling, fb_info);

diff --git a/tests/pm_lpsp.c b/tests/pm_lpsp.c
index aba6f7b..e8033cf 100644 (file)
--- a/tests/pm_lpsp.c
+++ b/tests/pm_lpsp.c
@@ -95,7 +95,7 @@ static uint32_t create_fb(int drm_fd, int width, int height)
        cairo_t *cr;
        uint32_t buffer_id;
 
-       buffer_id = kmstest_create_fb2(drm_fd, width, height,
+       buffer_id = kmstest_create_fb(drm_fd, width, height,
                                      DRM_FORMAT_XRGB8888,
                                      false, &fb);
        cr = kmstest_get_cairo_ctx(drm_fd, &fb);

diff --git a/tests/pm_pc8.c b/tests/pm_pc8.c
index 5e4a1f9..bed69c5 100644 (file)
--- a/tests/pm_pc8.c
+++ b/tests/pm_pc8.c
@@ -275,7 +275,7 @@ static struct scanout_fb *create_fb(struct mode_set_data *data, int width,
        fb_info = malloc(sizeof(struct scanout_fb));
        igt_assert(fb_info);
 
-       fb_info->handle = kmstest_create_fb2(drm_fd, width, height,
+       fb_info->handle = kmstest_create_fb(drm_fd, width, height,
                                            DRM_FORMAT_XRGB8888,
                                            false, &fb);
        fb_info->width = width;

diff --git a/tests/testdisplay.c b/tests/testdisplay.c
index 3641220..1319731 100644 (file)
--- a/tests/testdisplay.c
+++ b/tests/testdisplay.c
@@ -405,7 +405,7 @@ set_mode(struct connector *c)
                width = c->mode.hdisplay;
                height = c->mode.vdisplay;
 
-               fb_id = kmstest_create_fb2(drm_fd, width, height,
+               fb_id = kmstest_create_fb(drm_fd, width, height,
                                          bpp_depth_to_drm_format(bpp, depth),
                                          enable_tiling, &fb_info[current_fb]);
                paint_output_info(c, &fb_info[current_fb]);
@@ -532,7 +532,7 @@ static uint32_t create_stereo_fb(drmModeModeInfo *mode, struct kmstest_fb *fb)
        uint32_t fb_id;
 
        stereo_fb_layout_from_mode(&layout, mode);
-       fb_id = kmstest_create_fb2(drm_fd, layout.fb_width, layout.fb_height,
+       fb_id = kmstest_create_fb(drm_fd, layout.fb_width, layout.fb_height,
                                  bpp_depth_to_drm_format(bpp, depth),
                                  enable_tiling, fb);
        cr = kmstest_get_cairo_ctx(drm_fd, fb);