[igt-dev] [PATCH i-g-t] tests: Remove kms_render
Maarten Lankhorst
maarten.lankhorst at linux.intel.com
Thu Feb 1 11:52:43 UTC 2018
This was a test that required manual verification to see whether FBC,
was handled correctly. But the automated testing has been added with
kms_frontbuffer_tracking, so this test no longer serves a purpose.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
Cc: Imre Deak <imre.deak at intel.com>
Cc: Chris Wilson <chris at chris-wilson.co.uk>
Suggested-by: Chris Wilson <chris at chris-wilson.co.uk>
Acked-by: Imre Deak <imre.deak at intel.com>
---
tests/Makefile.sources | 1 -
tests/kms_render.c | 253 -------------------------------------------------
tests/meson.build | 1 -
3 files changed, 255 deletions(-)
delete mode 100644 tests/kms_render.c
diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index e4e06d01d7f9..870c9093550b 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -202,7 +202,6 @@ TESTS_progs = \
kms_properties \
kms_psr_sink_crc \
kms_pwrite_crc \
- kms_render \
kms_rmfb \
kms_rotation_crc \
kms_setmode \
diff --git a/tests/kms_render.c b/tests/kms_render.c
deleted file mode 100644
index d2208e38f84e..000000000000
--- a/tests/kms_render.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * Authors:
- * Imre Deak <imre.deak at intel.com>
- */
-#include "config.h"
-
-#include "igt.h"
-#include <cairo.h>
-#include <errno.h>
-#include <stdint.h>
-#include <unistd.h>
-#include <sys/time.h>
-
-#include "intel_bufmgr.h"
-
-drmModeRes *resources;
-int drm_fd;
-
-enum test_flags {
- TEST_DIRECT_RENDER = 0x01,
- TEST_GPU_BLIT = 0x02,
-};
-
-static int paint_fb(struct igt_fb *fb, const char *test_name,
- const char *mode_format_str, const char *cconf_str)
-{
- cairo_t *cr;
-
- cr = igt_get_cairo_ctx(drm_fd, fb);
-
- igt_paint_color_gradient(cr, 0, 0, fb->width, fb->height, 1, 1, 1);
- igt_paint_test_pattern(cr, fb->width, fb->height);
-
- cairo_move_to(cr, fb->width / 2, fb->height / 2);
- cairo_set_font_size(cr, 36);
- igt_cairo_printf_line(cr, align_hcenter, 10, "%s", test_name);
- igt_cairo_printf_line(cr, align_hcenter, 10, "%s", mode_format_str);
- igt_cairo_printf_line(cr, align_hcenter, 10, "%s", cconf_str);
-
- cairo_destroy(cr);
-
- return 0;
-}
-
-static void gpu_blit(struct igt_fb *dst_fb, struct igt_fb *src_fb)
-{
- drm_intel_bo *dst_bo;
- drm_intel_bo *src_bo;
- int bpp;
- static drm_intel_bufmgr *bufmgr;
- struct intel_batchbuffer *batch;
- uint32_t devid;
-
- igt_require_intel(drm_fd);
- igt_require_gem(drm_fd);
-
- bufmgr = drm_intel_bufmgr_gem_init(drm_fd, 4096);
- devid = intel_get_drm_devid(drm_fd);
- batch = intel_batchbuffer_alloc(bufmgr, devid);
-
- igt_assert(dst_fb->drm_format == src_fb->drm_format);
- igt_assert(src_fb->drm_format == DRM_FORMAT_RGB565 ||
- igt_drm_format_to_bpp(src_fb->drm_format) != 16);
- bpp = igt_drm_format_to_bpp(src_fb->drm_format);
- dst_bo = gem_handle_to_libdrm_bo(bufmgr, drm_fd, "destination",
- dst_fb->gem_handle);
- igt_assert(dst_bo);
- src_bo = gem_handle_to_libdrm_bo(bufmgr, drm_fd, "source",
- src_fb->gem_handle);
- igt_assert(src_bo);
-
- intel_blt_copy(batch,
- src_bo, 0, 0, src_fb->width * bpp / 8,
- dst_bo, 0, 0, dst_fb->width * bpp / 8,
- src_fb->width, src_fb->height, bpp);
- intel_batchbuffer_flush(batch);
- gem_quiescent_gpu(drm_fd);
-
- drm_intel_bo_unreference(src_bo);
- drm_intel_bo_unreference(dst_bo);
-}
-
-static int test_format(const char *test_name,
- struct kmstest_connector_config *cconf,
- drmModeModeInfo *mode, uint32_t format,
- enum test_flags flags)
-{
- int width;
- int height;
- struct igt_fb fb[2];
- char *mode_format_str;
- char *cconf_str;
- int ret;
-
- ret = asprintf(&mode_format_str, "%s @ %dHz / %s",
- mode->name, mode->vrefresh, igt_format_str(format));
- igt_assert_lt(0, ret);
- ret = asprintf(&cconf_str, "pipe %s, encoder %s, connector %s",
- kmstest_pipe_name(cconf->pipe),
- kmstest_encoder_type_str(cconf->encoder->encoder_type),
- kmstest_connector_type_str(cconf->connector->connector_type));
- igt_assert_lt(0, ret);
-
- igt_info("Beginning test %s with %s on %s\n",
- test_name, mode_format_str, cconf_str);
-
- width = mode->hdisplay;
- height = mode->vdisplay;
-
- if (!igt_create_fb(drm_fd, width, height, format,
- LOCAL_DRM_FORMAT_MOD_NONE, &fb[0]))
- goto err1;
-
- if (!igt_create_fb(drm_fd, width, height, format,
- LOCAL_DRM_FORMAT_MOD_NONE, &fb[1]))
- goto err2;
-
- if (drmModeSetCrtc(drm_fd, cconf->crtc->crtc_id, fb[0].fb_id,
- 0, 0, &cconf->connector->connector_id, 1,
- mode))
- goto err2;
- do_or_die(drmModePageFlip(drm_fd, cconf->crtc->crtc_id, fb[0].fb_id,
- 0, NULL));
- sleep(2);
-
- if (flags & TEST_DIRECT_RENDER) {
- paint_fb(&fb[0], test_name, mode_format_str, cconf_str);
- } else if (flags & TEST_GPU_BLIT) {
- paint_fb(&fb[1], test_name, mode_format_str, cconf_str);
- gpu_blit(&fb[0], &fb[1]);
- }
- sleep(5);
-
- igt_info("Test %s with %s on %s: PASSED\n",
- test_name, mode_format_str, cconf_str);
- free(mode_format_str);
- free(cconf_str);
-
- igt_remove_fb(drm_fd, &fb[1]);
- igt_remove_fb(drm_fd, &fb[0]);
-
- return 0;
-
-err2:
- igt_remove_fb(drm_fd, &fb[0]);
-err1:
- igt_info("Test %s with %s on %s: SKIPPED\n",
- test_name, mode_format_str, cconf_str);
- free(mode_format_str);
- free(cconf_str);
-
- return -1;
-}
-
-static void test_connector(const char *test_name,
- struct kmstest_connector_config *cconf,
- enum test_flags flags)
-{
- const uint32_t *formats;
- int format_count;
- int i;
-
- igt_get_all_cairo_formats(&formats, &format_count);
- for (i = 0; i < format_count; i++) {
- if (is_i915_device(drm_fd)
- && intel_gen(intel_get_drm_devid(drm_fd)) < 4
- && formats[i] == DRM_FORMAT_XRGB2101010) {
- igt_info("gen2/3 don't support 10bpc, skipping\n");
- continue;
- }
-
- test_format(test_name,
- cconf, &cconf->connector->modes[0],
- formats[i], flags);
- }
-}
-
-static int run_test(const char *test_name, enum test_flags flags)
-{
- int i;
-
- resources = drmModeGetResources(drm_fd);
- igt_assert(resources);
-
- /* Find any connected displays */
- for (i = 0; i < resources->count_connectors; i++) {
- uint32_t connector_id;
- int j;
-
- connector_id = resources->connectors[i];
- for (j = 0; j < resources->count_crtcs; j++) {
- struct kmstest_connector_config cconf;
-
- if (!kmstest_get_connector_config(drm_fd, connector_id,
- 1 << j, &cconf))
- continue;
-
- test_connector(test_name, &cconf, flags);
-
- kmstest_free_connector_config(&cconf);
- }
- }
-
- drmModeFreeResources(resources);
-
- return 1;
-}
-
-igt_main
-{
- struct {
- enum test_flags flags;
- const char *name;
- } tests[] = {
- { TEST_DIRECT_RENDER, "direct-render" },
- { TEST_GPU_BLIT, "gpu-blit" },
- };
- int i;
-
- igt_skip_on_simulation();
-
- igt_fixture {
- drm_fd = drm_open_driver_master(DRIVER_ANY);
-
- kmstest_set_vt_graphics_mode();
- }
-
- for (i = 0; i < ARRAY_SIZE(tests); i++) {
- igt_subtest(tests[i].name)
- run_test(tests[i].name, tests[i].flags);
- }
-
- igt_fixture
- close(drm_fd);
-}
diff --git a/tests/meson.build b/tests/meson.build
index 2322217df99b..521a4c425a68 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -180,7 +180,6 @@ test_progs = [
'kms_properties',
'kms_psr_sink_crc',
'kms_pwrite_crc',
- 'kms_render',
'kms_rmfb',
'kms_rotation_crc',
'kms_setmode',
--
2.15.1
More information about the igt-dev
mailing list