* [PATCH i-g-t] tests: remove kms_fbc_crc
@ 2017-10-17 15:16 Daniel Vetter
2017-10-17 15:59 ` Ville Syrjälä
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Daniel Vetter @ 2017-10-17 15:16 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter, Paulo Zanoni, Daniel Vetter
This was the predecessor test to kms_frontbuffer_tracking, which not
just tests fbc, and also in a much more through-out fashion.
Both tests authored by Paulo, but looking at git history there's a
clear switch with the introduction of kms_frontbuffer_tracking. After
that only maintenance commits to kms_fbc_crc. Not point having
redundant tests, so lets remove the old one.
This will cut a bit more than 3 minutes of test-time from kbl-shard.
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
tests/Makefile.sources | 1 -
tests/kms_fbc_crc.c | 580 -------------------------------------------------
tests/meson.build | 1 -
3 files changed, 582 deletions(-)
delete mode 100644 tests/kms_fbc_crc.c
diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index 9c9fb316fc71..2313c12b508c 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -182,7 +182,6 @@ TESTS_progs = \
kms_cursor_crc \
kms_cursor_legacy \
kms_draw_crc \
- kms_fbc_crc \
kms_fbcon_fbt \
kms_fence_pin_leak \
kms_flip \
diff --git a/tests/kms_fbc_crc.c b/tests/kms_fbc_crc.c
deleted file mode 100644
index 06234566c232..000000000000
--- a/tests/kms_fbc_crc.c
+++ /dev/null
@@ -1,580 +0,0 @@
-/*
- * Copyright © 2013 Intel Corporation
- *
- * 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 (including the next
- * paragraph) 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.
- *
- */
-
-#include "igt.h"
-#include <errno.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <string.h>
-
-
-IGT_TEST_DESCRIPTION(
- "Performs various write operations to the scanout buffer while FBC is "
- "enabled. CRC checks will be used to make sure the modifications to scanout "
- "buffer are detected.");
-
-enum test_mode {
- TEST_PAGE_FLIP,
- TEST_MMAP_CPU,
- TEST_MMAP_GTT,
- TEST_BLT,
- TEST_RENDER,
- TEST_CONTEXT,
- TEST_PAGE_FLIP_AND_MMAP_CPU,
- TEST_PAGE_FLIP_AND_MMAP_GTT,
- TEST_PAGE_FLIP_AND_BLT,
- TEST_PAGE_FLIP_AND_RENDER,
- TEST_PAGE_FLIP_AND_CONTEXT,
-};
-
-typedef struct {
- int drm_fd;
- igt_crc_t ref_crc[4];
- igt_pipe_crc_t *pipe_crc;
- drm_intel_bufmgr *bufmgr;
- drm_intel_context *ctx[2];
- uint32_t devid;
- igt_display_t display;
- igt_output_t *output;
- enum pipe pipe;
- igt_plane_t *primary;
- struct igt_fb fb[2];
-} data_t;
-
-static const char *test_mode_str(enum test_mode mode)
-{
- static const char * const test_modes[] = {
- [TEST_PAGE_FLIP] = "page_flip",
- [TEST_MMAP_CPU] = "mmap_cpu",
- [TEST_MMAP_GTT] = "mmap_gtt",
- [TEST_BLT] = "blt",
- [TEST_RENDER] = "render",
- [TEST_CONTEXT] = "context",
- [TEST_PAGE_FLIP_AND_MMAP_CPU] = "page_flip_and_mmap_cpu",
- [TEST_PAGE_FLIP_AND_MMAP_GTT] = "page_flip_and_mmap_gtt",
- [TEST_PAGE_FLIP_AND_BLT] = "page_flip_and_blt",
- [TEST_PAGE_FLIP_AND_RENDER] = "page_flip_and_render",
- [TEST_PAGE_FLIP_AND_CONTEXT] = "page_flip_and_context",
- };
-
- return test_modes[mode];
-}
-
-static void fill_blt(data_t *data,
- uint32_t handle,
- struct igt_fb *fb,
- unsigned char color)
-{
- drm_intel_bo *dst = gem_handle_to_libdrm_bo(data->bufmgr,
- data->drm_fd,
- "", handle);
- struct intel_batchbuffer *batch;
- unsigned flags;
- int pitch;
- uint32_t pixel = color | (color << 8) | (color << 16) | (color << 24);
-
- batch = intel_batchbuffer_alloc(data->bufmgr, data->devid);
- igt_assert(batch);
-
- pitch = fb->stride;
- flags = XY_COLOR_BLT_WRITE_ALPHA |
- XY_COLOR_BLT_WRITE_RGB;
- if (fb->tiling && batch->gen >= 4) {
- flags |= XY_COLOR_BLT_TILED;
- pitch /= 4;
- }
-
- COLOR_BLIT_COPY_BATCH_START(flags);
- OUT_BATCH(3 << 24 | 0xf0 << 16 | pitch);
- OUT_BATCH(0);
- OUT_BATCH(1 << 16 | 1);
- OUT_RELOC_FENCED(dst, I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0);
- OUT_BATCH(pixel);
- ADVANCE_BATCH();
-
- intel_batchbuffer_flush(batch);
- intel_batchbuffer_free(batch);
-
- gem_bo_busy(data->drm_fd, handle);
-}
-
-static void scratch_buf_init(struct igt_buf *buf, drm_intel_bo *bo)
-{
- buf->bo = bo;
- buf->stride = 4096;
- buf->tiling = I915_TILING_X;
- buf->size = 4096;
-}
-
-static void exec_nop(data_t *data, uint32_t handle, drm_intel_context *context)
-{
- drm_intel_bo *dst;
- struct intel_batchbuffer *batch;
-
- dst = gem_handle_to_libdrm_bo(data->bufmgr, data->drm_fd, "", handle);
- igt_assert(dst);
-
- batch = intel_batchbuffer_alloc(data->bufmgr, data->devid);
- igt_assert(batch);
-
- /* add the reloc to make sure the kernel will think we write to dst */
- BEGIN_BATCH(4, 1);
- OUT_BATCH(MI_BATCH_BUFFER_END);
- OUT_BATCH(MI_NOOP);
- OUT_RELOC(dst, I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0);
- OUT_BATCH(MI_NOOP);
- ADVANCE_BATCH();
-
- intel_batchbuffer_flush_with_context(batch, context);
- intel_batchbuffer_free(batch);
-}
-
-static void fill_render(data_t *data, uint32_t handle,
- drm_intel_context *context, unsigned char color)
-{
- drm_intel_bo *src, *dst;
- struct intel_batchbuffer *batch;
- struct igt_buf src_buf, dst_buf;
- const uint8_t buf[4] = { color, color, color, color };
- igt_render_copyfunc_t rendercopy = igt_get_render_copyfunc(data->devid);
-
- igt_skip_on(!rendercopy);
-
- dst = gem_handle_to_libdrm_bo(data->bufmgr, data->drm_fd, "", handle);
- igt_assert(dst);
-
- src = drm_intel_bo_alloc(data->bufmgr, "", 4096, 4096);
- igt_assert(src);
-
- gem_write(data->drm_fd, src->handle, 0, buf, 4);
-
- scratch_buf_init(&src_buf, src);
- scratch_buf_init(&dst_buf, dst);
-
- batch = intel_batchbuffer_alloc(data->bufmgr, data->devid);
- igt_assert(batch);
-
- rendercopy(batch, context,
- &src_buf, 0, 0, 1, 1,
- &dst_buf, 0, 0);
-
- intel_batchbuffer_free(batch);
-
- gem_bo_busy(data->drm_fd, handle);
-}
-
-static void fill_mmap_cpu(data_t *data, uint32_t handle, unsigned char color)
-{
- void *ptr;
-
- ptr = gem_mmap__cpu(data->drm_fd, handle, 0, 4096, PROT_WRITE);
- gem_set_domain(data->drm_fd, handle, I915_GEM_DOMAIN_CPU,
- I915_GEM_DOMAIN_CPU);
- memset(ptr, color, 4);
- munmap(ptr, 4096);
- gem_sw_finish(data->drm_fd, handle);
-}
-
-static void fill_mmap_gtt(data_t *data, uint32_t handle, unsigned char color)
-{
- void *ptr;
-
- ptr = gem_mmap__gtt(data->drm_fd, handle, 4096, PROT_WRITE);
- gem_set_domain(data->drm_fd, handle, I915_GEM_DOMAIN_GTT,
- I915_GEM_DOMAIN_GTT);
- memset(ptr, color, 4);
- munmap(ptr, 4096);
-}
-
-static bool fbc_enabled(data_t *data)
-{
- char str[128] = {};
-
- igt_debugfs_read(data->drm_fd, "i915_fbc_status", str);
- return strstr(str, "FBC enabled") != NULL;
-}
-
-static bool wait_for_fbc_enabled(data_t *data)
-{
- return igt_wait(fbc_enabled(data), 3000, 30);
-}
-
-static void check_crc(data_t *data, enum test_mode mode)
-{
- igt_pipe_crc_t *pipe_crc = data->pipe_crc;
- igt_crc_t crc, *ref_crc;
-
- switch (mode) {
- case TEST_PAGE_FLIP:
- ref_crc = &data->ref_crc[1];
- break;
- case TEST_MMAP_CPU:
- case TEST_MMAP_GTT:
- case TEST_BLT:
- case TEST_RENDER:
- case TEST_CONTEXT:
- ref_crc = &data->ref_crc[2];
- break;
- case TEST_PAGE_FLIP_AND_MMAP_CPU:
- case TEST_PAGE_FLIP_AND_MMAP_GTT:
- case TEST_PAGE_FLIP_AND_BLT:
- case TEST_PAGE_FLIP_AND_RENDER:
- case TEST_PAGE_FLIP_AND_CONTEXT:
- ref_crc = &data->ref_crc[3];
- break;
- default:
- igt_assert(false);
- }
-
- igt_pipe_crc_collect_crc(pipe_crc, &crc);
- igt_assert_crc_equal(&crc, ref_crc);
-}
-
-static void test_crc(data_t *data, enum test_mode mode)
-{
- uint32_t crtc_id = data->output->config.crtc->crtc_id;
- uint32_t handle = data->fb[0].gem_handle;
- drm_intel_context *context = NULL;
-
- igt_assert(fbc_enabled(data));
-
- if (mode == TEST_PAGE_FLIP || mode >= TEST_PAGE_FLIP_AND_MMAP_CPU) {
- handle = data->fb[1].gem_handle;
- igt_assert(drmModePageFlip(data->drm_fd, crtc_id,
- data->fb[1].fb_id, 0, NULL) == 0);
-
- if (mode != TEST_PAGE_FLIP)
- igt_assert(wait_for_fbc_enabled(data));
- }
-
- switch (mode) {
- case TEST_PAGE_FLIP:
- break;
- case TEST_MMAP_CPU:
- case TEST_PAGE_FLIP_AND_MMAP_CPU:
- fill_mmap_cpu(data, handle, 0xff);
- break;
- case TEST_MMAP_GTT:
- case TEST_PAGE_FLIP_AND_MMAP_GTT:
- fill_mmap_gtt(data, handle, 0xff);
- break;
- case TEST_BLT:
- case TEST_PAGE_FLIP_AND_BLT:
- fill_blt(data, handle, data->fb, ~0);
- break;
- case TEST_CONTEXT:
- case TEST_PAGE_FLIP_AND_CONTEXT:
- context = data->ctx[1];
- case TEST_RENDER:
- case TEST_PAGE_FLIP_AND_RENDER:
- fill_render(data, handle, context, 0xff);
- break;
- }
-
- /*
- * Make sure we're looking at new data (two vblanks
- * to leave some leeway for the kernel if we ever do
- * some kind of delayed FBC disable for GTT mmaps.
- */
- igt_wait_for_vblank(data->drm_fd, data->pipe);
- igt_wait_for_vblank(data->drm_fd, data->pipe);
-
- check_crc(data, mode);
-
- /*
- * Allow time for FBC to kick in again if it
- * got disabled during dirtyfb or page flip.
- */
- igt_assert(wait_for_fbc_enabled(data));
-
- check_crc(data, mode);
-}
-
-static void prepare_crtc(data_t *data)
-{
- igt_output_t *output = data->output;
-
- igt_output_set_pipe(output, data->pipe);
-}
-
-static void create_fbs(data_t *data, uint64_t tiling, struct igt_fb *fbs)
-{
- int rc;
- drmModeModeInfo *mode = igt_output_get_mode(data->output);
-
- rc = igt_create_color_fb(data->drm_fd, mode->hdisplay, mode->vdisplay,
- DRM_FORMAT_XRGB8888, tiling,
- 0.0, 0.0, 0.0, &fbs[0]);
- igt_assert(rc);
- rc = igt_create_color_fb(data->drm_fd, mode->hdisplay, mode->vdisplay,
- DRM_FORMAT_XRGB8888, tiling,
- 0.1, 0.1, 0.1, &fbs[1]);
- igt_assert(rc);
-}
-
-/* Since we want to be really safe that the CRCs are actually what we really
- * want, use untiled FBs, so FBC won't happen to disrupt things. Also do the
- * drawing before setting the modes, just to be sure. */
-static void get_ref_crcs(data_t *data)
-{
- igt_display_t *display = &data->display;
- struct igt_fb fbs[4];
- int i;
-
- create_fbs(data, LOCAL_DRM_FORMAT_MOD_NONE, &fbs[0]);
- create_fbs(data, LOCAL_DRM_FORMAT_MOD_NONE, &fbs[2]);
-
- fill_mmap_gtt(data, fbs[2].gem_handle, 0xff);
- fill_mmap_gtt(data, fbs[3].gem_handle, 0xff);
-
- for (i = 0; i < 4; i++) {
- igt_plane_set_fb(data->primary, &fbs[i]);
- igt_display_commit(display);
- igt_wait_for_vblank(data->drm_fd, data->pipe);
- igt_assert(!fbc_enabled(data));
- igt_pipe_crc_collect_crc(data->pipe_crc, &data->ref_crc[i]);
- igt_assert(!fbc_enabled(data));
- }
-
- igt_plane_set_fb(data->primary, &data->fb[1]);
- igt_display_commit(display);
-
- for (i = 0; i < 4; i++)
- igt_remove_fb(data->drm_fd, &fbs[i]);
-}
-
-static bool prepare_test(data_t *data, enum test_mode test_mode, uint64_t tiling)
-{
- igt_display_t *display = &data->display;
- igt_output_t *output = data->output;
- igt_pipe_crc_t *pipe_crc;
-
- data->primary = igt_output_get_plane_type(data->output, DRM_PLANE_TYPE_PRIMARY);
-
- create_fbs(data, tiling, data->fb);
-
- igt_pipe_crc_free(data->pipe_crc);
- data->pipe_crc = NULL;
- pipe_crc = igt_pipe_crc_new(data->drm_fd, data->pipe,
- INTEL_PIPE_CRC_SOURCE_AUTO);
- data->pipe_crc = pipe_crc;
-
- get_ref_crcs(data);
-
- /* scanout = fb[1] */
- igt_plane_set_fb(data->primary, &data->fb[1]);
- igt_display_commit(display);
-
- if (!wait_for_fbc_enabled(data)) {
- igt_info("FBC not enabled\n");
-
- igt_plane_set_fb(data->primary, NULL);
- igt_output_set_pipe(output, PIPE_ANY);
- igt_display_commit(display);
-
- igt_remove_fb(data->drm_fd, &data->fb[0]);
- igt_remove_fb(data->drm_fd, &data->fb[1]);
- return false;
- }
-
- if (test_mode == TEST_CONTEXT || test_mode == TEST_PAGE_FLIP_AND_CONTEXT) {
- data->ctx[0] = drm_intel_gem_context_create(data->bufmgr);
- igt_assert(data->ctx[0]);
- data->ctx[1] = drm_intel_gem_context_create(data->bufmgr);
- igt_assert(data->ctx[1]);
-
- /*
- * Disable FBC RT address for both contexts
- * (by "rendering" to a non-scanout buffer).
- */
- exec_nop(data, data->fb[0].gem_handle, data->ctx[1]);
- exec_nop(data, data->fb[0].gem_handle, data->ctx[0]);
- exec_nop(data, data->fb[0].gem_handle, data->ctx[1]);
- exec_nop(data, data->fb[0].gem_handle, data->ctx[0]);
- }
-
- /* scanout = fb[0] */
- igt_plane_set_fb(data->primary, &data->fb[0]);
- igt_display_commit(display);
-
- igt_assert(wait_for_fbc_enabled(data));
-
- if (test_mode == TEST_CONTEXT || test_mode == TEST_PAGE_FLIP_AND_CONTEXT) {
- /*
- * make ctx[0] FBC RT address point to fb[0], ctx[1]
- * FBC RT address is left as disabled.
- */
- exec_nop(data, data->fb[0].gem_handle, data->ctx[0]);
- igt_assert(wait_for_fbc_enabled(data));
- }
-
- igt_wait_for_vblank(data->drm_fd, data->pipe);
-
- return true;
-}
-
-static void finish_crtc(data_t *data, enum test_mode mode)
-{
- igt_pipe_crc_free(data->pipe_crc);
- data->pipe_crc = NULL;
-
- if (mode == TEST_CONTEXT || mode == TEST_PAGE_FLIP_AND_CONTEXT) {
- drm_intel_gem_context_destroy(data->ctx[0]);
- drm_intel_gem_context_destroy(data->ctx[1]);
- }
-
- igt_plane_set_fb(data->primary, NULL);
- igt_output_set_pipe(data->output, PIPE_ANY);
- igt_display_commit(&data->display);
-
- igt_remove_fb(data->drm_fd, &data->fb[0]);
- igt_remove_fb(data->drm_fd, &data->fb[1]);
-}
-
-static void reset_display(data_t *data)
-{
- igt_display_t *display = &data->display;
- enum pipe pipe_id;
-
- for_each_pipe(display, pipe_id) {
- igt_pipe_t *pipe = &display->pipes[pipe_id];
- igt_plane_t *plane = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
-
- igt_plane_set_fb(plane, NULL);
- }
-
- for_each_connected_output(display, data->output)
- igt_output_set_pipe(data->output, PIPE_ANY);
-}
-
-static void run_test(data_t *data, enum test_mode mode)
-{
- igt_display_t *display = &data->display;
- int valid_tests = 0, i;
- uint64_t tiling_methods[] = {
- LOCAL_I915_FORMAT_MOD_X_TILED, LOCAL_I915_FORMAT_MOD_Y_TILED,
- };
-
- if (mode == TEST_CONTEXT || mode == TEST_PAGE_FLIP_AND_CONTEXT) {
- drm_intel_context *ctx = drm_intel_gem_context_create(data->bufmgr);
- igt_require(ctx);
- drm_intel_gem_context_destroy(ctx);
- }
-
- reset_display(data);
-
- for (i = 0; i < ARRAY_SIZE(tiling_methods); i++) {
- uint64_t tiling = tiling_methods[i];
-
- if (intel_gen(data->devid) < 9 &&
- tiling == LOCAL_I915_FORMAT_MOD_Y_TILED) {
- igt_info("%s y-tiled: SKIPPED\n", igt_subtest_name());
- continue;
- }
-
- for_each_pipe_with_valid_output(display,
- data->pipe, data->output) {
- const char *tiling_name =
- tiling == LOCAL_I915_FORMAT_MOD_Y_TILED ?
- "y" : "x";
-
- prepare_crtc(data);
-
- igt_info("Beginning %s on pipe %s, connector "
- "%s, %s-tiled\n",
- igt_subtest_name(),
- kmstest_pipe_name(data->pipe),
- igt_output_name(data->output),
- tiling_name);
-
- if (!prepare_test(data, mode, tiling)) {
- igt_info("%s on pipe %s, connector "
- "%s, %s-tiled: SKIPPED\n",
- igt_subtest_name(),
- kmstest_pipe_name(data->pipe),
- igt_output_name(data->output),
- tiling_name);
- continue;
- }
-
- valid_tests++;
-
- test_crc(data, mode);
-
- igt_info("%s on pipe %s, connector %s,"
- "%s-tiled: PASSED\n",
- igt_subtest_name(),
- kmstest_pipe_name(data->pipe),
- igt_output_name(data->output),
- tiling_name);
-
- finish_crtc(data, mode);
- }
- }
-
- igt_require_f(valid_tests, "no valid crtc/connector combinations found\n");
-}
-
-igt_main
-{
- data_t data = {};
- enum test_mode mode;
-
- igt_skip_on_simulation();
-
- igt_fixture {
- char buf[128];
-
- data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
- kmstest_set_vt_graphics_mode();
-
- data.devid = intel_get_drm_devid(data.drm_fd);
-
- igt_require_pipe_crc(data.drm_fd);
-
- igt_debugfs_read(data.drm_fd, "i915_fbc_status", buf);
- igt_require_f(!strstr(buf, "unsupported on this chipset"),
- "FBC not supported\n");
-
- if (intel_gen(data.devid) >= 6)
- igt_set_module_param_int("enable_fbc", 1);
-
- data.bufmgr = drm_intel_bufmgr_gem_init(data.drm_fd, 4096);
- igt_assert(data.bufmgr);
- drm_intel_bufmgr_gem_enable_reuse(data.bufmgr);
-
- igt_display_init(&data.display, data.drm_fd);
- }
-
- for (mode = TEST_PAGE_FLIP; mode <= TEST_PAGE_FLIP_AND_CONTEXT; mode++) {
- igt_subtest_f("%s", test_mode_str(mode)) {
- run_test(&data, mode);
- }
- }
-
- igt_fixture {
- drm_intel_bufmgr_destroy(data.bufmgr);
- igt_display_fini(&data.display);
- }
-}
diff --git a/tests/meson.build b/tests/meson.build
index 835adc007e95..c3d5372f78ac 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -162,7 +162,6 @@ test_progs = [
'kms_cursor_crc',
'kms_cursor_legacy',
'kms_draw_crc',
- 'kms_fbc_crc',
'kms_fbcon_fbt',
'kms_fence_pin_leak',
'kms_flip',
--
2.14.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH i-g-t] tests: remove kms_fbc_crc
2017-10-17 15:16 [PATCH i-g-t] tests: remove kms_fbc_crc Daniel Vetter
@ 2017-10-17 15:59 ` Ville Syrjälä
2017-10-17 19:10 ` Paulo Zanoni
2017-10-17 17:08 ` ✓ Fi.CI.BAT: success for " Patchwork
2017-10-18 5:18 ` ✓ Fi.CI.IGT: " Patchwork
2 siblings, 1 reply; 6+ messages in thread
From: Ville Syrjälä @ 2017-10-17 15:59 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Daniel Vetter, Intel Graphics Development, Paulo Zanoni
On Tue, Oct 17, 2017 at 05:16:40PM +0200, Daniel Vetter wrote:
> This was the predecessor test to kms_frontbuffer_tracking, which not
> just tests fbc, and also in a much more through-out fashion.
>
> Both tests authored by Paulo,
I wrote kms_fbc_crc.
> but looking at git history there's a
> clear switch with the introduction of kms_frontbuffer_tracking. After
> that only maintenance commits to kms_fbc_crc. Not point having
> redundant tests, so lets remove the old one.
kms_fbc_crc was more geared towards testing the hardware tracking, but
since we no longer use that apart from the GTT tracking I guess
kms_fbc_crc can go.
Acked-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> This will cut a bit more than 3 minutes of test-time from kbl-shard.
>
> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
> tests/Makefile.sources | 1 -
> tests/kms_fbc_crc.c | 580 -------------------------------------------------
> tests/meson.build | 1 -
> 3 files changed, 582 deletions(-)
> delete mode 100644 tests/kms_fbc_crc.c
>
> diff --git a/tests/Makefile.sources b/tests/Makefile.sources
> index 9c9fb316fc71..2313c12b508c 100644
> --- a/tests/Makefile.sources
> +++ b/tests/Makefile.sources
> @@ -182,7 +182,6 @@ TESTS_progs = \
> kms_cursor_crc \
> kms_cursor_legacy \
> kms_draw_crc \
> - kms_fbc_crc \
> kms_fbcon_fbt \
> kms_fence_pin_leak \
> kms_flip \
> diff --git a/tests/kms_fbc_crc.c b/tests/kms_fbc_crc.c
> deleted file mode 100644
> index 06234566c232..000000000000
> --- a/tests/kms_fbc_crc.c
> +++ /dev/null
> @@ -1,580 +0,0 @@
> -/*
> - * Copyright © 2013 Intel Corporation
> - *
> - * 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 (including the next
> - * paragraph) 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.
> - *
> - */
> -
> -#include "igt.h"
> -#include <errno.h>
> -#include <stdbool.h>
> -#include <stdio.h>
> -#include <string.h>
> -
> -
> -IGT_TEST_DESCRIPTION(
> - "Performs various write operations to the scanout buffer while FBC is "
> - "enabled. CRC checks will be used to make sure the modifications to scanout "
> - "buffer are detected.");
> -
> -enum test_mode {
> - TEST_PAGE_FLIP,
> - TEST_MMAP_CPU,
> - TEST_MMAP_GTT,
> - TEST_BLT,
> - TEST_RENDER,
> - TEST_CONTEXT,
> - TEST_PAGE_FLIP_AND_MMAP_CPU,
> - TEST_PAGE_FLIP_AND_MMAP_GTT,
> - TEST_PAGE_FLIP_AND_BLT,
> - TEST_PAGE_FLIP_AND_RENDER,
> - TEST_PAGE_FLIP_AND_CONTEXT,
> -};
> -
> -typedef struct {
> - int drm_fd;
> - igt_crc_t ref_crc[4];
> - igt_pipe_crc_t *pipe_crc;
> - drm_intel_bufmgr *bufmgr;
> - drm_intel_context *ctx[2];
> - uint32_t devid;
> - igt_display_t display;
> - igt_output_t *output;
> - enum pipe pipe;
> - igt_plane_t *primary;
> - struct igt_fb fb[2];
> -} data_t;
> -
> -static const char *test_mode_str(enum test_mode mode)
> -{
> - static const char * const test_modes[] = {
> - [TEST_PAGE_FLIP] = "page_flip",
> - [TEST_MMAP_CPU] = "mmap_cpu",
> - [TEST_MMAP_GTT] = "mmap_gtt",
> - [TEST_BLT] = "blt",
> - [TEST_RENDER] = "render",
> - [TEST_CONTEXT] = "context",
> - [TEST_PAGE_FLIP_AND_MMAP_CPU] = "page_flip_and_mmap_cpu",
> - [TEST_PAGE_FLIP_AND_MMAP_GTT] = "page_flip_and_mmap_gtt",
> - [TEST_PAGE_FLIP_AND_BLT] = "page_flip_and_blt",
> - [TEST_PAGE_FLIP_AND_RENDER] = "page_flip_and_render",
> - [TEST_PAGE_FLIP_AND_CONTEXT] = "page_flip_and_context",
> - };
> -
> - return test_modes[mode];
> -}
> -
> -static void fill_blt(data_t *data,
> - uint32_t handle,
> - struct igt_fb *fb,
> - unsigned char color)
> -{
> - drm_intel_bo *dst = gem_handle_to_libdrm_bo(data->bufmgr,
> - data->drm_fd,
> - "", handle);
> - struct intel_batchbuffer *batch;
> - unsigned flags;
> - int pitch;
> - uint32_t pixel = color | (color << 8) | (color << 16) | (color << 24);
> -
> - batch = intel_batchbuffer_alloc(data->bufmgr, data->devid);
> - igt_assert(batch);
> -
> - pitch = fb->stride;
> - flags = XY_COLOR_BLT_WRITE_ALPHA |
> - XY_COLOR_BLT_WRITE_RGB;
> - if (fb->tiling && batch->gen >= 4) {
> - flags |= XY_COLOR_BLT_TILED;
> - pitch /= 4;
> - }
> -
> - COLOR_BLIT_COPY_BATCH_START(flags);
> - OUT_BATCH(3 << 24 | 0xf0 << 16 | pitch);
> - OUT_BATCH(0);
> - OUT_BATCH(1 << 16 | 1);
> - OUT_RELOC_FENCED(dst, I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0);
> - OUT_BATCH(pixel);
> - ADVANCE_BATCH();
> -
> - intel_batchbuffer_flush(batch);
> - intel_batchbuffer_free(batch);
> -
> - gem_bo_busy(data->drm_fd, handle);
> -}
> -
> -static void scratch_buf_init(struct igt_buf *buf, drm_intel_bo *bo)
> -{
> - buf->bo = bo;
> - buf->stride = 4096;
> - buf->tiling = I915_TILING_X;
> - buf->size = 4096;
> -}
> -
> -static void exec_nop(data_t *data, uint32_t handle, drm_intel_context *context)
> -{
> - drm_intel_bo *dst;
> - struct intel_batchbuffer *batch;
> -
> - dst = gem_handle_to_libdrm_bo(data->bufmgr, data->drm_fd, "", handle);
> - igt_assert(dst);
> -
> - batch = intel_batchbuffer_alloc(data->bufmgr, data->devid);
> - igt_assert(batch);
> -
> - /* add the reloc to make sure the kernel will think we write to dst */
> - BEGIN_BATCH(4, 1);
> - OUT_BATCH(MI_BATCH_BUFFER_END);
> - OUT_BATCH(MI_NOOP);
> - OUT_RELOC(dst, I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0);
> - OUT_BATCH(MI_NOOP);
> - ADVANCE_BATCH();
> -
> - intel_batchbuffer_flush_with_context(batch, context);
> - intel_batchbuffer_free(batch);
> -}
> -
> -static void fill_render(data_t *data, uint32_t handle,
> - drm_intel_context *context, unsigned char color)
> -{
> - drm_intel_bo *src, *dst;
> - struct intel_batchbuffer *batch;
> - struct igt_buf src_buf, dst_buf;
> - const uint8_t buf[4] = { color, color, color, color };
> - igt_render_copyfunc_t rendercopy = igt_get_render_copyfunc(data->devid);
> -
> - igt_skip_on(!rendercopy);
> -
> - dst = gem_handle_to_libdrm_bo(data->bufmgr, data->drm_fd, "", handle);
> - igt_assert(dst);
> -
> - src = drm_intel_bo_alloc(data->bufmgr, "", 4096, 4096);
> - igt_assert(src);
> -
> - gem_write(data->drm_fd, src->handle, 0, buf, 4);
> -
> - scratch_buf_init(&src_buf, src);
> - scratch_buf_init(&dst_buf, dst);
> -
> - batch = intel_batchbuffer_alloc(data->bufmgr, data->devid);
> - igt_assert(batch);
> -
> - rendercopy(batch, context,
> - &src_buf, 0, 0, 1, 1,
> - &dst_buf, 0, 0);
> -
> - intel_batchbuffer_free(batch);
> -
> - gem_bo_busy(data->drm_fd, handle);
> -}
> -
> -static void fill_mmap_cpu(data_t *data, uint32_t handle, unsigned char color)
> -{
> - void *ptr;
> -
> - ptr = gem_mmap__cpu(data->drm_fd, handle, 0, 4096, PROT_WRITE);
> - gem_set_domain(data->drm_fd, handle, I915_GEM_DOMAIN_CPU,
> - I915_GEM_DOMAIN_CPU);
> - memset(ptr, color, 4);
> - munmap(ptr, 4096);
> - gem_sw_finish(data->drm_fd, handle);
> -}
> -
> -static void fill_mmap_gtt(data_t *data, uint32_t handle, unsigned char color)
> -{
> - void *ptr;
> -
> - ptr = gem_mmap__gtt(data->drm_fd, handle, 4096, PROT_WRITE);
> - gem_set_domain(data->drm_fd, handle, I915_GEM_DOMAIN_GTT,
> - I915_GEM_DOMAIN_GTT);
> - memset(ptr, color, 4);
> - munmap(ptr, 4096);
> -}
> -
> -static bool fbc_enabled(data_t *data)
> -{
> - char str[128] = {};
> -
> - igt_debugfs_read(data->drm_fd, "i915_fbc_status", str);
> - return strstr(str, "FBC enabled") != NULL;
> -}
> -
> -static bool wait_for_fbc_enabled(data_t *data)
> -{
> - return igt_wait(fbc_enabled(data), 3000, 30);
> -}
> -
> -static void check_crc(data_t *data, enum test_mode mode)
> -{
> - igt_pipe_crc_t *pipe_crc = data->pipe_crc;
> - igt_crc_t crc, *ref_crc;
> -
> - switch (mode) {
> - case TEST_PAGE_FLIP:
> - ref_crc = &data->ref_crc[1];
> - break;
> - case TEST_MMAP_CPU:
> - case TEST_MMAP_GTT:
> - case TEST_BLT:
> - case TEST_RENDER:
> - case TEST_CONTEXT:
> - ref_crc = &data->ref_crc[2];
> - break;
> - case TEST_PAGE_FLIP_AND_MMAP_CPU:
> - case TEST_PAGE_FLIP_AND_MMAP_GTT:
> - case TEST_PAGE_FLIP_AND_BLT:
> - case TEST_PAGE_FLIP_AND_RENDER:
> - case TEST_PAGE_FLIP_AND_CONTEXT:
> - ref_crc = &data->ref_crc[3];
> - break;
> - default:
> - igt_assert(false);
> - }
> -
> - igt_pipe_crc_collect_crc(pipe_crc, &crc);
> - igt_assert_crc_equal(&crc, ref_crc);
> -}
> -
> -static void test_crc(data_t *data, enum test_mode mode)
> -{
> - uint32_t crtc_id = data->output->config.crtc->crtc_id;
> - uint32_t handle = data->fb[0].gem_handle;
> - drm_intel_context *context = NULL;
> -
> - igt_assert(fbc_enabled(data));
> -
> - if (mode == TEST_PAGE_FLIP || mode >= TEST_PAGE_FLIP_AND_MMAP_CPU) {
> - handle = data->fb[1].gem_handle;
> - igt_assert(drmModePageFlip(data->drm_fd, crtc_id,
> - data->fb[1].fb_id, 0, NULL) == 0);
> -
> - if (mode != TEST_PAGE_FLIP)
> - igt_assert(wait_for_fbc_enabled(data));
> - }
> -
> - switch (mode) {
> - case TEST_PAGE_FLIP:
> - break;
> - case TEST_MMAP_CPU:
> - case TEST_PAGE_FLIP_AND_MMAP_CPU:
> - fill_mmap_cpu(data, handle, 0xff);
> - break;
> - case TEST_MMAP_GTT:
> - case TEST_PAGE_FLIP_AND_MMAP_GTT:
> - fill_mmap_gtt(data, handle, 0xff);
> - break;
> - case TEST_BLT:
> - case TEST_PAGE_FLIP_AND_BLT:
> - fill_blt(data, handle, data->fb, ~0);
> - break;
> - case TEST_CONTEXT:
> - case TEST_PAGE_FLIP_AND_CONTEXT:
> - context = data->ctx[1];
> - case TEST_RENDER:
> - case TEST_PAGE_FLIP_AND_RENDER:
> - fill_render(data, handle, context, 0xff);
> - break;
> - }
> -
> - /*
> - * Make sure we're looking at new data (two vblanks
> - * to leave some leeway for the kernel if we ever do
> - * some kind of delayed FBC disable for GTT mmaps.
> - */
> - igt_wait_for_vblank(data->drm_fd, data->pipe);
> - igt_wait_for_vblank(data->drm_fd, data->pipe);
> -
> - check_crc(data, mode);
> -
> - /*
> - * Allow time for FBC to kick in again if it
> - * got disabled during dirtyfb or page flip.
> - */
> - igt_assert(wait_for_fbc_enabled(data));
> -
> - check_crc(data, mode);
> -}
> -
> -static void prepare_crtc(data_t *data)
> -{
> - igt_output_t *output = data->output;
> -
> - igt_output_set_pipe(output, data->pipe);
> -}
> -
> -static void create_fbs(data_t *data, uint64_t tiling, struct igt_fb *fbs)
> -{
> - int rc;
> - drmModeModeInfo *mode = igt_output_get_mode(data->output);
> -
> - rc = igt_create_color_fb(data->drm_fd, mode->hdisplay, mode->vdisplay,
> - DRM_FORMAT_XRGB8888, tiling,
> - 0.0, 0.0, 0.0, &fbs[0]);
> - igt_assert(rc);
> - rc = igt_create_color_fb(data->drm_fd, mode->hdisplay, mode->vdisplay,
> - DRM_FORMAT_XRGB8888, tiling,
> - 0.1, 0.1, 0.1, &fbs[1]);
> - igt_assert(rc);
> -}
> -
> -/* Since we want to be really safe that the CRCs are actually what we really
> - * want, use untiled FBs, so FBC won't happen to disrupt things. Also do the
> - * drawing before setting the modes, just to be sure. */
> -static void get_ref_crcs(data_t *data)
> -{
> - igt_display_t *display = &data->display;
> - struct igt_fb fbs[4];
> - int i;
> -
> - create_fbs(data, LOCAL_DRM_FORMAT_MOD_NONE, &fbs[0]);
> - create_fbs(data, LOCAL_DRM_FORMAT_MOD_NONE, &fbs[2]);
> -
> - fill_mmap_gtt(data, fbs[2].gem_handle, 0xff);
> - fill_mmap_gtt(data, fbs[3].gem_handle, 0xff);
> -
> - for (i = 0; i < 4; i++) {
> - igt_plane_set_fb(data->primary, &fbs[i]);
> - igt_display_commit(display);
> - igt_wait_for_vblank(data->drm_fd, data->pipe);
> - igt_assert(!fbc_enabled(data));
> - igt_pipe_crc_collect_crc(data->pipe_crc, &data->ref_crc[i]);
> - igt_assert(!fbc_enabled(data));
> - }
> -
> - igt_plane_set_fb(data->primary, &data->fb[1]);
> - igt_display_commit(display);
> -
> - for (i = 0; i < 4; i++)
> - igt_remove_fb(data->drm_fd, &fbs[i]);
> -}
> -
> -static bool prepare_test(data_t *data, enum test_mode test_mode, uint64_t tiling)
> -{
> - igt_display_t *display = &data->display;
> - igt_output_t *output = data->output;
> - igt_pipe_crc_t *pipe_crc;
> -
> - data->primary = igt_output_get_plane_type(data->output, DRM_PLANE_TYPE_PRIMARY);
> -
> - create_fbs(data, tiling, data->fb);
> -
> - igt_pipe_crc_free(data->pipe_crc);
> - data->pipe_crc = NULL;
> - pipe_crc = igt_pipe_crc_new(data->drm_fd, data->pipe,
> - INTEL_PIPE_CRC_SOURCE_AUTO);
> - data->pipe_crc = pipe_crc;
> -
> - get_ref_crcs(data);
> -
> - /* scanout = fb[1] */
> - igt_plane_set_fb(data->primary, &data->fb[1]);
> - igt_display_commit(display);
> -
> - if (!wait_for_fbc_enabled(data)) {
> - igt_info("FBC not enabled\n");
> -
> - igt_plane_set_fb(data->primary, NULL);
> - igt_output_set_pipe(output, PIPE_ANY);
> - igt_display_commit(display);
> -
> - igt_remove_fb(data->drm_fd, &data->fb[0]);
> - igt_remove_fb(data->drm_fd, &data->fb[1]);
> - return false;
> - }
> -
> - if (test_mode == TEST_CONTEXT || test_mode == TEST_PAGE_FLIP_AND_CONTEXT) {
> - data->ctx[0] = drm_intel_gem_context_create(data->bufmgr);
> - igt_assert(data->ctx[0]);
> - data->ctx[1] = drm_intel_gem_context_create(data->bufmgr);
> - igt_assert(data->ctx[1]);
> -
> - /*
> - * Disable FBC RT address for both contexts
> - * (by "rendering" to a non-scanout buffer).
> - */
> - exec_nop(data, data->fb[0].gem_handle, data->ctx[1]);
> - exec_nop(data, data->fb[0].gem_handle, data->ctx[0]);
> - exec_nop(data, data->fb[0].gem_handle, data->ctx[1]);
> - exec_nop(data, data->fb[0].gem_handle, data->ctx[0]);
> - }
> -
> - /* scanout = fb[0] */
> - igt_plane_set_fb(data->primary, &data->fb[0]);
> - igt_display_commit(display);
> -
> - igt_assert(wait_for_fbc_enabled(data));
> -
> - if (test_mode == TEST_CONTEXT || test_mode == TEST_PAGE_FLIP_AND_CONTEXT) {
> - /*
> - * make ctx[0] FBC RT address point to fb[0], ctx[1]
> - * FBC RT address is left as disabled.
> - */
> - exec_nop(data, data->fb[0].gem_handle, data->ctx[0]);
> - igt_assert(wait_for_fbc_enabled(data));
> - }
> -
> - igt_wait_for_vblank(data->drm_fd, data->pipe);
> -
> - return true;
> -}
> -
> -static void finish_crtc(data_t *data, enum test_mode mode)
> -{
> - igt_pipe_crc_free(data->pipe_crc);
> - data->pipe_crc = NULL;
> -
> - if (mode == TEST_CONTEXT || mode == TEST_PAGE_FLIP_AND_CONTEXT) {
> - drm_intel_gem_context_destroy(data->ctx[0]);
> - drm_intel_gem_context_destroy(data->ctx[1]);
> - }
> -
> - igt_plane_set_fb(data->primary, NULL);
> - igt_output_set_pipe(data->output, PIPE_ANY);
> - igt_display_commit(&data->display);
> -
> - igt_remove_fb(data->drm_fd, &data->fb[0]);
> - igt_remove_fb(data->drm_fd, &data->fb[1]);
> -}
> -
> -static void reset_display(data_t *data)
> -{
> - igt_display_t *display = &data->display;
> - enum pipe pipe_id;
> -
> - for_each_pipe(display, pipe_id) {
> - igt_pipe_t *pipe = &display->pipes[pipe_id];
> - igt_plane_t *plane = igt_pipe_get_plane_type(pipe, DRM_PLANE_TYPE_PRIMARY);
> -
> - igt_plane_set_fb(plane, NULL);
> - }
> -
> - for_each_connected_output(display, data->output)
> - igt_output_set_pipe(data->output, PIPE_ANY);
> -}
> -
> -static void run_test(data_t *data, enum test_mode mode)
> -{
> - igt_display_t *display = &data->display;
> - int valid_tests = 0, i;
> - uint64_t tiling_methods[] = {
> - LOCAL_I915_FORMAT_MOD_X_TILED, LOCAL_I915_FORMAT_MOD_Y_TILED,
> - };
> -
> - if (mode == TEST_CONTEXT || mode == TEST_PAGE_FLIP_AND_CONTEXT) {
> - drm_intel_context *ctx = drm_intel_gem_context_create(data->bufmgr);
> - igt_require(ctx);
> - drm_intel_gem_context_destroy(ctx);
> - }
> -
> - reset_display(data);
> -
> - for (i = 0; i < ARRAY_SIZE(tiling_methods); i++) {
> - uint64_t tiling = tiling_methods[i];
> -
> - if (intel_gen(data->devid) < 9 &&
> - tiling == LOCAL_I915_FORMAT_MOD_Y_TILED) {
> - igt_info("%s y-tiled: SKIPPED\n", igt_subtest_name());
> - continue;
> - }
> -
> - for_each_pipe_with_valid_output(display,
> - data->pipe, data->output) {
> - const char *tiling_name =
> - tiling == LOCAL_I915_FORMAT_MOD_Y_TILED ?
> - "y" : "x";
> -
> - prepare_crtc(data);
> -
> - igt_info("Beginning %s on pipe %s, connector "
> - "%s, %s-tiled\n",
> - igt_subtest_name(),
> - kmstest_pipe_name(data->pipe),
> - igt_output_name(data->output),
> - tiling_name);
> -
> - if (!prepare_test(data, mode, tiling)) {
> - igt_info("%s on pipe %s, connector "
> - "%s, %s-tiled: SKIPPED\n",
> - igt_subtest_name(),
> - kmstest_pipe_name(data->pipe),
> - igt_output_name(data->output),
> - tiling_name);
> - continue;
> - }
> -
> - valid_tests++;
> -
> - test_crc(data, mode);
> -
> - igt_info("%s on pipe %s, connector %s,"
> - "%s-tiled: PASSED\n",
> - igt_subtest_name(),
> - kmstest_pipe_name(data->pipe),
> - igt_output_name(data->output),
> - tiling_name);
> -
> - finish_crtc(data, mode);
> - }
> - }
> -
> - igt_require_f(valid_tests, "no valid crtc/connector combinations found\n");
> -}
> -
> -igt_main
> -{
> - data_t data = {};
> - enum test_mode mode;
> -
> - igt_skip_on_simulation();
> -
> - igt_fixture {
> - char buf[128];
> -
> - data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
> - kmstest_set_vt_graphics_mode();
> -
> - data.devid = intel_get_drm_devid(data.drm_fd);
> -
> - igt_require_pipe_crc(data.drm_fd);
> -
> - igt_debugfs_read(data.drm_fd, "i915_fbc_status", buf);
> - igt_require_f(!strstr(buf, "unsupported on this chipset"),
> - "FBC not supported\n");
> -
> - if (intel_gen(data.devid) >= 6)
> - igt_set_module_param_int("enable_fbc", 1);
> -
> - data.bufmgr = drm_intel_bufmgr_gem_init(data.drm_fd, 4096);
> - igt_assert(data.bufmgr);
> - drm_intel_bufmgr_gem_enable_reuse(data.bufmgr);
> -
> - igt_display_init(&data.display, data.drm_fd);
> - }
> -
> - for (mode = TEST_PAGE_FLIP; mode <= TEST_PAGE_FLIP_AND_CONTEXT; mode++) {
> - igt_subtest_f("%s", test_mode_str(mode)) {
> - run_test(&data, mode);
> - }
> - }
> -
> - igt_fixture {
> - drm_intel_bufmgr_destroy(data.bufmgr);
> - igt_display_fini(&data.display);
> - }
> -}
> diff --git a/tests/meson.build b/tests/meson.build
> index 835adc007e95..c3d5372f78ac 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -162,7 +162,6 @@ test_progs = [
> 'kms_cursor_crc',
> 'kms_cursor_legacy',
> 'kms_draw_crc',
> - 'kms_fbc_crc',
> 'kms_fbcon_fbt',
> 'kms_fence_pin_leak',
> 'kms_flip',
> --
> 2.14.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* ✓ Fi.CI.BAT: success for tests: remove kms_fbc_crc
2017-10-17 15:16 [PATCH i-g-t] tests: remove kms_fbc_crc Daniel Vetter
2017-10-17 15:59 ` Ville Syrjälä
@ 2017-10-17 17:08 ` Patchwork
2017-10-18 5:18 ` ✓ Fi.CI.IGT: " Patchwork
2 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2017-10-17 17:08 UTC (permalink / raw)
To: Daniel Vetter; +Cc: intel-gfx
== Series Details ==
Series: tests: remove kms_fbc_crc
URL : https://patchwork.freedesktop.org/series/32143/
State : success
== Summary ==
IGT patchset tested on top of latest successful build
62616c672a623b635141473133674321a4acbdc5 igt/pm_rc6_residency: Allow some leeway on the upper %% bound
with latest DRM-Tip kernel build CI_DRM_3254
79104a2f00df drm-tip: 2017y-10m-17d-15h-35m-59s UTC integration manifest
Testlist changes:
-igt@kms_fbc_crc@blt
-igt@kms_fbc_crc@context
-igt@kms_fbc_crc@mmap_cpu
-igt@kms_fbc_crc@mmap_gtt
-igt@kms_fbc_crc@page_flip
-igt@kms_fbc_crc@page_flip_and_blt
-igt@kms_fbc_crc@page_flip_and_context
-igt@kms_fbc_crc@page_flip_and_mmap_cpu
-igt@kms_fbc_crc@page_flip_and_mmap_gtt
-igt@kms_fbc_crc@page_flip_and_render
-igt@kms_fbc_crc@render
Test chamelium:
Subgroup dp-crc-fast:
fail -> PASS (fi-kbl-7500u) fdo#102514
Test debugfs_test:
Subgroup read_all_entries:
dmesg-warn -> PASS (fi-kbl-7500u) fdo#103285
Test gem_exec_reloc:
Subgroup basic-cpu-active:
fail -> PASS (fi-gdg-551) fdo#102582 +2
Subgroup basic-write-gtt-active:
fail -> PASS (fi-gdg-551)
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-c:
pass -> INCOMPLETE (fi-skl-6260u) fdo#100461
fdo#102514 https://bugs.freedesktop.org/show_bug.cgi?id=102514
fdo#103285 https://bugs.freedesktop.org/show_bug.cgi?id=103285
fdo#102582 https://bugs.freedesktop.org/show_bug.cgi?id=102582
fdo#100461 https://bugs.freedesktop.org/show_bug.cgi?id=100461
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:444s
fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:453s
fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:373s
fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:538s
fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:264s
fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:499s
fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:497s
fi-byt-j1900 total:289 pass:253 dwarn:1 dfail:0 fail:0 skip:35 time:496s
fi-byt-n2820 total:289 pass:249 dwarn:1 dfail:0 fail:0 skip:39 time:484s
fi-cfl-s total:289 pass:253 dwarn:4 dfail:0 fail:0 skip:32 time:565s
fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:416s
fi-gdg-551 total:289 pass:176 dwarn:1 dfail:0 fail:3 skip:109 time:252s
fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:576s
fi-hsw-4770r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:426s
fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:441s
fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:486s
fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:461s
fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:490s
fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:574s
fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:475s
fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:583s
fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:544s
fi-skl-6260u total:247 pass:230 dwarn:0 dfail:0 fail:0 skip:16
fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:644s
fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:519s
fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:500s
fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:462s
fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:571s
fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:420s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_371/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH i-g-t] tests: remove kms_fbc_crc
2017-10-17 15:59 ` Ville Syrjälä
@ 2017-10-17 19:10 ` Paulo Zanoni
2017-10-18 8:30 ` Daniel Vetter
0 siblings, 1 reply; 6+ messages in thread
From: Paulo Zanoni @ 2017-10-17 19:10 UTC (permalink / raw)
To: Ville Syrjälä, Daniel Vetter
Cc: Daniel Vetter, Intel Graphics Development
Em Ter, 2017-10-17 às 18:59 +0300, Ville Syrjälä escreveu:
> On Tue, Oct 17, 2017 at 05:16:40PM +0200, Daniel Vetter wrote:
> > This was the predecessor test to kms_frontbuffer_tracking, which
> > not
> > just tests fbc, and also in a much more through-out fashion.
> >
> > Both tests authored by Paulo,
>
> I wrote kms_fbc_crc.
>
> > but looking at git history there's a
> > clear switch with the introduction of kms_frontbuffer_tracking.
> > After
> > that only maintenance commits to kms_fbc_crc. Not point having
> > redundant tests, so lets remove the old one.
>
> kms_fbc_crc was more geared towards testing the hardware tracking,
> but
That's pretty much the reason I was always a little hesitant to remove
it. Both programs test the same thing, but they have very different
approaches, which is sometimes a good thing. But since you think it's
worth it and Ville acked it, feel free to remove it.
since we no longer use that apart from the GTT tracking I guess
> kms_fbc_crc can go.
>
> Acked-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> >
> > This will cut a bit more than 3 minutes of test-time from kbl-
> > shard.
> >
> > Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> > ---
> > tests/Makefile.sources | 1 -
> > tests/kms_fbc_crc.c | 580 -----------------------------------
> > --------------
> > tests/meson.build | 1 -
> > 3 files changed, 582 deletions(-)
> > delete mode 100644 tests/kms_fbc_crc.c
> >
> > diff --git a/tests/Makefile.sources b/tests/Makefile.sources
> > index 9c9fb316fc71..2313c12b508c 100644
> > --- a/tests/Makefile.sources
> > +++ b/tests/Makefile.sources
> > @@ -182,7 +182,6 @@ TESTS_progs = \
> > kms_cursor_crc \
> > kms_cursor_legacy \
> > kms_draw_crc \
> > - kms_fbc_crc \
> > kms_fbcon_fbt \
> > kms_fence_pin_leak \
> > kms_flip \
> > diff --git a/tests/kms_fbc_crc.c b/tests/kms_fbc_crc.c
> > deleted file mode 100644
> > index 06234566c232..000000000000
> > --- a/tests/kms_fbc_crc.c
> > +++ /dev/null
> > @@ -1,580 +0,0 @@
> > -/*
> > - * Copyright © 2013 Intel Corporation
> > - *
> > - * 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
> > (including the next
> > - * paragraph) 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.
> > - *
> > - */
> > -
> > -#include "igt.h"
> > -#include <errno.h>
> > -#include <stdbool.h>
> > -#include <stdio.h>
> > -#include <string.h>
> > -
> > -
> > -IGT_TEST_DESCRIPTION(
> > - "Performs various write operations to the scanout buffer while
> > FBC is "
> > - "enabled. CRC checks will be used to make sure the
> > modifications to scanout "
> > - "buffer are detected.");
> > -
> > -enum test_mode {
> > - TEST_PAGE_FLIP,
> > - TEST_MMAP_CPU,
> > - TEST_MMAP_GTT,
> > - TEST_BLT,
> > - TEST_RENDER,
> > - TEST_CONTEXT,
> > - TEST_PAGE_FLIP_AND_MMAP_CPU,
> > - TEST_PAGE_FLIP_AND_MMAP_GTT,
> > - TEST_PAGE_FLIP_AND_BLT,
> > - TEST_PAGE_FLIP_AND_RENDER,
> > - TEST_PAGE_FLIP_AND_CONTEXT,
> > -};
> > -
> > -typedef struct {
> > - int drm_fd;
> > - igt_crc_t ref_crc[4];
> > - igt_pipe_crc_t *pipe_crc;
> > - drm_intel_bufmgr *bufmgr;
> > - drm_intel_context *ctx[2];
> > - uint32_t devid;
> > - igt_display_t display;
> > - igt_output_t *output;
> > - enum pipe pipe;
> > - igt_plane_t *primary;
> > - struct igt_fb fb[2];
> > -} data_t;
> > -
> > -static const char *test_mode_str(enum test_mode mode)
> > -{
> > - static const char * const test_modes[] = {
> > - [TEST_PAGE_FLIP] = "page_flip",
> > - [TEST_MMAP_CPU] = "mmap_cpu",
> > - [TEST_MMAP_GTT] = "mmap_gtt",
> > - [TEST_BLT] = "blt",
> > - [TEST_RENDER] = "render",
> > - [TEST_CONTEXT] = "context",
> > - [TEST_PAGE_FLIP_AND_MMAP_CPU] =
> > "page_flip_and_mmap_cpu",
> > - [TEST_PAGE_FLIP_AND_MMAP_GTT] =
> > "page_flip_and_mmap_gtt",
> > - [TEST_PAGE_FLIP_AND_BLT] = "page_flip_and_blt",
> > - [TEST_PAGE_FLIP_AND_RENDER] =
> > "page_flip_and_render",
> > - [TEST_PAGE_FLIP_AND_CONTEXT] =
> > "page_flip_and_context",
> > - };
> > -
> > - return test_modes[mode];
> > -}
> > -
> > -static void fill_blt(data_t *data,
> > - uint32_t handle,
> > - struct igt_fb *fb,
> > - unsigned char color)
> > -{
> > - drm_intel_bo *dst = gem_handle_to_libdrm_bo(data->bufmgr,
> > - data->drm_fd,
> > - "", handle);
> > - struct intel_batchbuffer *batch;
> > - unsigned flags;
> > - int pitch;
> > - uint32_t pixel = color | (color << 8) | (color << 16) |
> > (color << 24);
> > -
> > - batch = intel_batchbuffer_alloc(data->bufmgr, data-
> > >devid);
> > - igt_assert(batch);
> > -
> > - pitch = fb->stride;
> > - flags = XY_COLOR_BLT_WRITE_ALPHA |
> > - XY_COLOR_BLT_WRITE_RGB;
> > - if (fb->tiling && batch->gen >= 4) {
> > - flags |= XY_COLOR_BLT_TILED;
> > - pitch /= 4;
> > - }
> > -
> > - COLOR_BLIT_COPY_BATCH_START(flags);
> > - OUT_BATCH(3 << 24 | 0xf0 << 16 | pitch);
> > - OUT_BATCH(0);
> > - OUT_BATCH(1 << 16 | 1);
> > - OUT_RELOC_FENCED(dst, I915_GEM_DOMAIN_RENDER,
> > I915_GEM_DOMAIN_RENDER, 0);
> > - OUT_BATCH(pixel);
> > - ADVANCE_BATCH();
> > -
> > - intel_batchbuffer_flush(batch);
> > - intel_batchbuffer_free(batch);
> > -
> > - gem_bo_busy(data->drm_fd, handle);
> > -}
> > -
> > -static void scratch_buf_init(struct igt_buf *buf, drm_intel_bo
> > *bo)
> > -{
> > - buf->bo = bo;
> > - buf->stride = 4096;
> > - buf->tiling = I915_TILING_X;
> > - buf->size = 4096;
> > -}
> > -
> > -static void exec_nop(data_t *data, uint32_t handle,
> > drm_intel_context *context)
> > -{
> > - drm_intel_bo *dst;
> > - struct intel_batchbuffer *batch;
> > -
> > - dst = gem_handle_to_libdrm_bo(data->bufmgr, data->drm_fd,
> > "", handle);
> > - igt_assert(dst);
> > -
> > - batch = intel_batchbuffer_alloc(data->bufmgr, data-
> > >devid);
> > - igt_assert(batch);
> > -
> > - /* add the reloc to make sure the kernel will think we
> > write to dst */
> > - BEGIN_BATCH(4, 1);
> > - OUT_BATCH(MI_BATCH_BUFFER_END);
> > - OUT_BATCH(MI_NOOP);
> > - OUT_RELOC(dst, I915_GEM_DOMAIN_RENDER,
> > I915_GEM_DOMAIN_RENDER, 0);
> > - OUT_BATCH(MI_NOOP);
> > - ADVANCE_BATCH();
> > -
> > - intel_batchbuffer_flush_with_context(batch, context);
> > - intel_batchbuffer_free(batch);
> > -}
> > -
> > -static void fill_render(data_t *data, uint32_t handle,
> > - drm_intel_context *context, unsigned char
> > color)
> > -{
> > - drm_intel_bo *src, *dst;
> > - struct intel_batchbuffer *batch;
> > - struct igt_buf src_buf, dst_buf;
> > - const uint8_t buf[4] = { color, color, color, color };
> > - igt_render_copyfunc_t rendercopy =
> > igt_get_render_copyfunc(data->devid);
> > -
> > - igt_skip_on(!rendercopy);
> > -
> > - dst = gem_handle_to_libdrm_bo(data->bufmgr, data->drm_fd,
> > "", handle);
> > - igt_assert(dst);
> > -
> > - src = drm_intel_bo_alloc(data->bufmgr, "", 4096, 4096);
> > - igt_assert(src);
> > -
> > - gem_write(data->drm_fd, src->handle, 0, buf, 4);
> > -
> > - scratch_buf_init(&src_buf, src);
> > - scratch_buf_init(&dst_buf, dst);
> > -
> > - batch = intel_batchbuffer_alloc(data->bufmgr, data-
> > >devid);
> > - igt_assert(batch);
> > -
> > - rendercopy(batch, context,
> > - &src_buf, 0, 0, 1, 1,
> > - &dst_buf, 0, 0);
> > -
> > - intel_batchbuffer_free(batch);
> > -
> > - gem_bo_busy(data->drm_fd, handle);
> > -}
> > -
> > -static void fill_mmap_cpu(data_t *data, uint32_t handle, unsigned
> > char color)
> > -{
> > - void *ptr;
> > -
> > - ptr = gem_mmap__cpu(data->drm_fd, handle, 0, 4096,
> > PROT_WRITE);
> > - gem_set_domain(data->drm_fd, handle, I915_GEM_DOMAIN_CPU,
> > - I915_GEM_DOMAIN_CPU);
> > - memset(ptr, color, 4);
> > - munmap(ptr, 4096);
> > - gem_sw_finish(data->drm_fd, handle);
> > -}
> > -
> > -static void fill_mmap_gtt(data_t *data, uint32_t handle, unsigned
> > char color)
> > -{
> > - void *ptr;
> > -
> > - ptr = gem_mmap__gtt(data->drm_fd, handle, 4096,
> > PROT_WRITE);
> > - gem_set_domain(data->drm_fd, handle, I915_GEM_DOMAIN_GTT,
> > - I915_GEM_DOMAIN_GTT);
> > - memset(ptr, color, 4);
> > - munmap(ptr, 4096);
> > -}
> > -
> > -static bool fbc_enabled(data_t *data)
> > -{
> > - char str[128] = {};
> > -
> > - igt_debugfs_read(data->drm_fd, "i915_fbc_status", str);
> > - return strstr(str, "FBC enabled") != NULL;
> > -}
> > -
> > -static bool wait_for_fbc_enabled(data_t *data)
> > -{
> > - return igt_wait(fbc_enabled(data), 3000, 30);
> > -}
> > -
> > -static void check_crc(data_t *data, enum test_mode mode)
> > -{
> > - igt_pipe_crc_t *pipe_crc = data->pipe_crc;
> > - igt_crc_t crc, *ref_crc;
> > -
> > - switch (mode) {
> > - case TEST_PAGE_FLIP:
> > - ref_crc = &data->ref_crc[1];
> > - break;
> > - case TEST_MMAP_CPU:
> > - case TEST_MMAP_GTT:
> > - case TEST_BLT:
> > - case TEST_RENDER:
> > - case TEST_CONTEXT:
> > - ref_crc = &data->ref_crc[2];
> > - break;
> > - case TEST_PAGE_FLIP_AND_MMAP_CPU:
> > - case TEST_PAGE_FLIP_AND_MMAP_GTT:
> > - case TEST_PAGE_FLIP_AND_BLT:
> > - case TEST_PAGE_FLIP_AND_RENDER:
> > - case TEST_PAGE_FLIP_AND_CONTEXT:
> > - ref_crc = &data->ref_crc[3];
> > - break;
> > - default:
> > - igt_assert(false);
> > - }
> > -
> > - igt_pipe_crc_collect_crc(pipe_crc, &crc);
> > - igt_assert_crc_equal(&crc, ref_crc);
> > -}
> > -
> > -static void test_crc(data_t *data, enum test_mode mode)
> > -{
> > - uint32_t crtc_id = data->output->config.crtc->crtc_id;
> > - uint32_t handle = data->fb[0].gem_handle;
> > - drm_intel_context *context = NULL;
> > -
> > - igt_assert(fbc_enabled(data));
> > -
> > - if (mode == TEST_PAGE_FLIP || mode >=
> > TEST_PAGE_FLIP_AND_MMAP_CPU) {
> > - handle = data->fb[1].gem_handle;
> > - igt_assert(drmModePageFlip(data->drm_fd, crtc_id,
> > - data->fb[1].fb_id, 0,
> > NULL) == 0);
> > -
> > - if (mode != TEST_PAGE_FLIP)
> > - igt_assert(wait_for_fbc_enabled(data));
> > - }
> > -
> > - switch (mode) {
> > - case TEST_PAGE_FLIP:
> > - break;
> > - case TEST_MMAP_CPU:
> > - case TEST_PAGE_FLIP_AND_MMAP_CPU:
> > - fill_mmap_cpu(data, handle, 0xff);
> > - break;
> > - case TEST_MMAP_GTT:
> > - case TEST_PAGE_FLIP_AND_MMAP_GTT:
> > - fill_mmap_gtt(data, handle, 0xff);
> > - break;
> > - case TEST_BLT:
> > - case TEST_PAGE_FLIP_AND_BLT:
> > - fill_blt(data, handle, data->fb, ~0);
> > - break;
> > - case TEST_CONTEXT:
> > - case TEST_PAGE_FLIP_AND_CONTEXT:
> > - context = data->ctx[1];
> > - case TEST_RENDER:
> > - case TEST_PAGE_FLIP_AND_RENDER:
> > - fill_render(data, handle, context, 0xff);
> > - break;
> > - }
> > -
> > - /*
> > - * Make sure we're looking at new data (two vblanks
> > - * to leave some leeway for the kernel if we ever do
> > - * some kind of delayed FBC disable for GTT mmaps.
> > - */
> > - igt_wait_for_vblank(data->drm_fd, data->pipe);
> > - igt_wait_for_vblank(data->drm_fd, data->pipe);
> > -
> > - check_crc(data, mode);
> > -
> > - /*
> > - * Allow time for FBC to kick in again if it
> > - * got disabled during dirtyfb or page flip.
> > - */
> > - igt_assert(wait_for_fbc_enabled(data));
> > -
> > - check_crc(data, mode);
> > -}
> > -
> > -static void prepare_crtc(data_t *data)
> > -{
> > - igt_output_t *output = data->output;
> > -
> > - igt_output_set_pipe(output, data->pipe);
> > -}
> > -
> > -static void create_fbs(data_t *data, uint64_t tiling, struct
> > igt_fb *fbs)
> > -{
> > - int rc;
> > - drmModeModeInfo *mode = igt_output_get_mode(data->output);
> > -
> > - rc = igt_create_color_fb(data->drm_fd, mode->hdisplay,
> > mode->vdisplay,
> > - DRM_FORMAT_XRGB8888, tiling,
> > - 0.0, 0.0, 0.0, &fbs[0]);
> > - igt_assert(rc);
> > - rc = igt_create_color_fb(data->drm_fd, mode->hdisplay,
> > mode->vdisplay,
> > - DRM_FORMAT_XRGB8888, tiling,
> > - 0.1, 0.1, 0.1, &fbs[1]);
> > - igt_assert(rc);
> > -}
> > -
> > -/* Since we want to be really safe that the CRCs are actually what
> > we really
> > - * want, use untiled FBs, so FBC won't happen to disrupt things.
> > Also do the
> > - * drawing before setting the modes, just to be sure. */
> > -static void get_ref_crcs(data_t *data)
> > -{
> > - igt_display_t *display = &data->display;
> > - struct igt_fb fbs[4];
> > - int i;
> > -
> > - create_fbs(data, LOCAL_DRM_FORMAT_MOD_NONE, &fbs[0]);
> > - create_fbs(data, LOCAL_DRM_FORMAT_MOD_NONE, &fbs[2]);
> > -
> > - fill_mmap_gtt(data, fbs[2].gem_handle, 0xff);
> > - fill_mmap_gtt(data, fbs[3].gem_handle, 0xff);
> > -
> > - for (i = 0; i < 4; i++) {
> > - igt_plane_set_fb(data->primary, &fbs[i]);
> > - igt_display_commit(display);
> > - igt_wait_for_vblank(data->drm_fd, data->pipe);
> > - igt_assert(!fbc_enabled(data));
> > - igt_pipe_crc_collect_crc(data->pipe_crc, &data-
> > >ref_crc[i]);
> > - igt_assert(!fbc_enabled(data));
> > - }
> > -
> > - igt_plane_set_fb(data->primary, &data->fb[1]);
> > - igt_display_commit(display);
> > -
> > - for (i = 0; i < 4; i++)
> > - igt_remove_fb(data->drm_fd, &fbs[i]);
> > -}
> > -
> > -static bool prepare_test(data_t *data, enum test_mode test_mode,
> > uint64_t tiling)
> > -{
> > - igt_display_t *display = &data->display;
> > - igt_output_t *output = data->output;
> > - igt_pipe_crc_t *pipe_crc;
> > -
> > - data->primary = igt_output_get_plane_type(data->output,
> > DRM_PLANE_TYPE_PRIMARY);
> > -
> > - create_fbs(data, tiling, data->fb);
> > -
> > - igt_pipe_crc_free(data->pipe_crc);
> > - data->pipe_crc = NULL;
> > - pipe_crc = igt_pipe_crc_new(data->drm_fd, data->pipe,
> > - INTEL_PIPE_CRC_SOURCE_AUTO);
> > - data->pipe_crc = pipe_crc;
> > -
> > - get_ref_crcs(data);
> > -
> > - /* scanout = fb[1] */
> > - igt_plane_set_fb(data->primary, &data->fb[1]);
> > - igt_display_commit(display);
> > -
> > - if (!wait_for_fbc_enabled(data)) {
> > - igt_info("FBC not enabled\n");
> > -
> > - igt_plane_set_fb(data->primary, NULL);
> > - igt_output_set_pipe(output, PIPE_ANY);
> > - igt_display_commit(display);
> > -
> > - igt_remove_fb(data->drm_fd, &data->fb[0]);
> > - igt_remove_fb(data->drm_fd, &data->fb[1]);
> > - return false;
> > - }
> > -
> > - if (test_mode == TEST_CONTEXT || test_mode ==
> > TEST_PAGE_FLIP_AND_CONTEXT) {
> > - data->ctx[0] = drm_intel_gem_context_create(data-
> > >bufmgr);
> > - igt_assert(data->ctx[0]);
> > - data->ctx[1] = drm_intel_gem_context_create(data-
> > >bufmgr);
> > - igt_assert(data->ctx[1]);
> > -
> > - /*
> > - * Disable FBC RT address for both contexts
> > - * (by "rendering" to a non-scanout buffer).
> > - */
> > - exec_nop(data, data->fb[0].gem_handle, data-
> > >ctx[1]);
> > - exec_nop(data, data->fb[0].gem_handle, data-
> > >ctx[0]);
> > - exec_nop(data, data->fb[0].gem_handle, data-
> > >ctx[1]);
> > - exec_nop(data, data->fb[0].gem_handle, data-
> > >ctx[0]);
> > - }
> > -
> > - /* scanout = fb[0] */
> > - igt_plane_set_fb(data->primary, &data->fb[0]);
> > - igt_display_commit(display);
> > -
> > - igt_assert(wait_for_fbc_enabled(data));
> > -
> > - if (test_mode == TEST_CONTEXT || test_mode ==
> > TEST_PAGE_FLIP_AND_CONTEXT) {
> > - /*
> > - * make ctx[0] FBC RT address point to fb[0],
> > ctx[1]
> > - * FBC RT address is left as disabled.
> > - */
> > - exec_nop(data, data->fb[0].gem_handle, data-
> > >ctx[0]);
> > - igt_assert(wait_for_fbc_enabled(data));
> > - }
> > -
> > - igt_wait_for_vblank(data->drm_fd, data->pipe);
> > -
> > - return true;
> > -}
> > -
> > -static void finish_crtc(data_t *data, enum test_mode mode)
> > -{
> > - igt_pipe_crc_free(data->pipe_crc);
> > - data->pipe_crc = NULL;
> > -
> > - if (mode == TEST_CONTEXT || mode ==
> > TEST_PAGE_FLIP_AND_CONTEXT) {
> > - drm_intel_gem_context_destroy(data->ctx[0]);
> > - drm_intel_gem_context_destroy(data->ctx[1]);
> > - }
> > -
> > - igt_plane_set_fb(data->primary, NULL);
> > - igt_output_set_pipe(data->output, PIPE_ANY);
> > - igt_display_commit(&data->display);
> > -
> > - igt_remove_fb(data->drm_fd, &data->fb[0]);
> > - igt_remove_fb(data->drm_fd, &data->fb[1]);
> > -}
> > -
> > -static void reset_display(data_t *data)
> > -{
> > - igt_display_t *display = &data->display;
> > - enum pipe pipe_id;
> > -
> > - for_each_pipe(display, pipe_id) {
> > - igt_pipe_t *pipe = &display->pipes[pipe_id];
> > - igt_plane_t *plane = igt_pipe_get_plane_type(pipe,
> > DRM_PLANE_TYPE_PRIMARY);
> > -
> > - igt_plane_set_fb(plane, NULL);
> > - }
> > -
> > - for_each_connected_output(display, data->output)
> > - igt_output_set_pipe(data->output, PIPE_ANY);
> > -}
> > -
> > -static void run_test(data_t *data, enum test_mode mode)
> > -{
> > - igt_display_t *display = &data->display;
> > - int valid_tests = 0, i;
> > - uint64_t tiling_methods[] = {
> > - LOCAL_I915_FORMAT_MOD_X_TILED,
> > LOCAL_I915_FORMAT_MOD_Y_TILED,
> > - };
> > -
> > - if (mode == TEST_CONTEXT || mode ==
> > TEST_PAGE_FLIP_AND_CONTEXT) {
> > - drm_intel_context *ctx =
> > drm_intel_gem_context_create(data->bufmgr);
> > - igt_require(ctx);
> > - drm_intel_gem_context_destroy(ctx);
> > - }
> > -
> > - reset_display(data);
> > -
> > - for (i = 0; i < ARRAY_SIZE(tiling_methods); i++) {
> > - uint64_t tiling = tiling_methods[i];
> > -
> > - if (intel_gen(data->devid) < 9 &&
> > - tiling == LOCAL_I915_FORMAT_MOD_Y_TILED) {
> > - igt_info("%s y-tiled: SKIPPED\n",
> > igt_subtest_name());
> > - continue;
> > - }
> > -
> > - for_each_pipe_with_valid_output(display,
> > - data->pipe, data-
> > >output) {
> > - const char *tiling_name =
> > - tiling ==
> > LOCAL_I915_FORMAT_MOD_Y_TILED ?
> > - "y" : "x";
> > -
> > - prepare_crtc(data);
> > -
> > - igt_info("Beginning %s on pipe %s,
> > connector "
> > - "%s, %s-tiled\n",
> > - igt_subtest_name(),
> > - kmstest_pipe_name(data->pipe),
> > - igt_output_name(data->output),
> > - tiling_name);
> > -
> > - if (!prepare_test(data, mode, tiling)) {
> > - igt_info("%s on pipe %s, connector
> > "
> > - "%s, %s-tiled:
> > SKIPPED\n",
> > - igt_subtest_name(),
> > - kmstest_pipe_name(data-
> > >pipe),
> > - igt_output_name(data-
> > >output),
> > - tiling_name);
> > - continue;
> > - }
> > -
> > - valid_tests++;
> > -
> > - test_crc(data, mode);
> > -
> > - igt_info("%s on pipe %s, connector %s,"
> > - "%s-tiled: PASSED\n",
> > - igt_subtest_name(),
> > - kmstest_pipe_name(data->pipe),
> > - igt_output_name(data->output),
> > - tiling_name);
> > -
> > - finish_crtc(data, mode);
> > - }
> > - }
> > -
> > - igt_require_f(valid_tests, "no valid crtc/connector
> > combinations found\n");
> > -}
> > -
> > -igt_main
> > -{
> > - data_t data = {};
> > - enum test_mode mode;
> > -
> > - igt_skip_on_simulation();
> > -
> > - igt_fixture {
> > - char buf[128];
> > -
> > - data.drm_fd =
> > drm_open_driver_master(DRIVER_INTEL);
> > - kmstest_set_vt_graphics_mode();
> > -
> > - data.devid = intel_get_drm_devid(data.drm_fd);
> > -
> > - igt_require_pipe_crc(data.drm_fd);
> > -
> > - igt_debugfs_read(data.drm_fd, "i915_fbc_status",
> > buf);
> > - igt_require_f(!strstr(buf, "unsupported on this
> > chipset"),
> > - "FBC not supported\n");
> > -
> > - if (intel_gen(data.devid) >= 6)
> > - igt_set_module_param_int("enable_fbc", 1);
> > -
> > - data.bufmgr =
> > drm_intel_bufmgr_gem_init(data.drm_fd, 4096);
> > - igt_assert(data.bufmgr);
> > - drm_intel_bufmgr_gem_enable_reuse(data.bufmgr);
> > -
> > - igt_display_init(&data.display, data.drm_fd);
> > - }
> > -
> > - for (mode = TEST_PAGE_FLIP; mode <=
> > TEST_PAGE_FLIP_AND_CONTEXT; mode++) {
> > - igt_subtest_f("%s", test_mode_str(mode)) {
> > - run_test(&data, mode);
> > - }
> > - }
> > -
> > - igt_fixture {
> > - drm_intel_bufmgr_destroy(data.bufmgr);
> > - igt_display_fini(&data.display);
> > - }
> > -}
> > diff --git a/tests/meson.build b/tests/meson.build
> > index 835adc007e95..c3d5372f78ac 100644
> > --- a/tests/meson.build
> > +++ b/tests/meson.build
> > @@ -162,7 +162,6 @@ test_progs = [
> > 'kms_cursor_crc',
> > 'kms_cursor_legacy',
> > 'kms_draw_crc',
> > - 'kms_fbc_crc',
> > 'kms_fbcon_fbt',
> > 'kms_fence_pin_leak',
> > 'kms_flip',
> > --
> > 2.14.1
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* ✓ Fi.CI.IGT: success for tests: remove kms_fbc_crc
2017-10-17 15:16 [PATCH i-g-t] tests: remove kms_fbc_crc Daniel Vetter
2017-10-17 15:59 ` Ville Syrjälä
2017-10-17 17:08 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2017-10-18 5:18 ` Patchwork
2 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2017-10-18 5:18 UTC (permalink / raw)
To: Daniel Vetter; +Cc: intel-gfx
== Series Details ==
Series: tests: remove kms_fbc_crc
URL : https://patchwork.freedesktop.org/series/32143/
State : success
== Summary ==
Test kms_setmode:
Subgroup basic:
pass -> FAIL (shard-hsw) fdo#99912
Test perf:
Subgroup blocking:
pass -> FAIL (shard-hsw) fdo#102252
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
shard-hsw total:2490 pass:1405 dwarn:0 dfail:0 fail:9 skip:1076 time:9182s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_371/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH i-g-t] tests: remove kms_fbc_crc
2017-10-17 19:10 ` Paulo Zanoni
@ 2017-10-18 8:30 ` Daniel Vetter
0 siblings, 0 replies; 6+ messages in thread
From: Daniel Vetter @ 2017-10-18 8:30 UTC (permalink / raw)
To: Paulo Zanoni; +Cc: Daniel Vetter, Intel Graphics Development, Daniel Vetter
On Tue, Oct 17, 2017 at 05:10:21PM -0200, Paulo Zanoni wrote:
> Em Ter, 2017-10-17 às 18:59 +0300, Ville Syrjälä escreveu:
> > On Tue, Oct 17, 2017 at 05:16:40PM +0200, Daniel Vetter wrote:
> > > This was the predecessor test to kms_frontbuffer_tracking, which
> > > not
> > > just tests fbc, and also in a much more through-out fashion.
> > >
> > > Both tests authored by Paulo,
> >
> > I wrote kms_fbc_crc.
> >
> > > but looking at git history there's a
> > > clear switch with the introduction of kms_frontbuffer_tracking.
> > > After
> > > that only maintenance commits to kms_fbc_crc. Not point having
> > > redundant tests, so lets remove the old one.
> >
> > kms_fbc_crc was more geared towards testing the hardware tracking,
> > but
>
> That's pretty much the reason I was always a little hesitant to remove
> it. Both programs test the same thing, but they have very different
> approaches, which is sometimes a good thing. But since you think it's
> worth it and Ville acked it, feel free to remove it.
If there' is a gap in testing in kms_frontbuffer_tracking compared to
kms_fbc_crc then I think we should fill that. I'm doing just that to be
able to remove another almost-duplicated testcase. But having testcases
around just in case is imo not that good, since they do eat machine time
we don't really have a lot of, and they eat maintenance time too.
Thanks for your acks, patch applied.
-Daniel
>
>
> since we no longer use that apart from the GTT tracking I guess
> > kms_fbc_crc can go.
> >
> > Acked-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> >
> > >
> > > This will cut a bit more than 3 minutes of test-time from kbl-
> > > shard.
> > >
> > > Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
> > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> > > ---
> > > tests/Makefile.sources | 1 -
> > > tests/kms_fbc_crc.c | 580 -----------------------------------
> > > --------------
> > > tests/meson.build | 1 -
> > > 3 files changed, 582 deletions(-)
> > > delete mode 100644 tests/kms_fbc_crc.c
> > >
> > > diff --git a/tests/Makefile.sources b/tests/Makefile.sources
> > > index 9c9fb316fc71..2313c12b508c 100644
> > > --- a/tests/Makefile.sources
> > > +++ b/tests/Makefile.sources
> > > @@ -182,7 +182,6 @@ TESTS_progs = \
> > > kms_cursor_crc \
> > > kms_cursor_legacy \
> > > kms_draw_crc \
> > > - kms_fbc_crc \
> > > kms_fbcon_fbt \
> > > kms_fence_pin_leak \
> > > kms_flip \
> > > diff --git a/tests/kms_fbc_crc.c b/tests/kms_fbc_crc.c
> > > deleted file mode 100644
> > > index 06234566c232..000000000000
> > > --- a/tests/kms_fbc_crc.c
> > > +++ /dev/null
> > > @@ -1,580 +0,0 @@
> > > -/*
> > > - * Copyright © 2013 Intel Corporation
> > > - *
> > > - * 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
> > > (including the next
> > > - * paragraph) 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.
> > > - *
> > > - */
> > > -
> > > -#include "igt.h"
> > > -#include <errno.h>
> > > -#include <stdbool.h>
> > > -#include <stdio.h>
> > > -#include <string.h>
> > > -
> > > -
> > > -IGT_TEST_DESCRIPTION(
> > > - "Performs various write operations to the scanout buffer while
> > > FBC is "
> > > - "enabled. CRC checks will be used to make sure the
> > > modifications to scanout "
> > > - "buffer are detected.");
> > > -
> > > -enum test_mode {
> > > - TEST_PAGE_FLIP,
> > > - TEST_MMAP_CPU,
> > > - TEST_MMAP_GTT,
> > > - TEST_BLT,
> > > - TEST_RENDER,
> > > - TEST_CONTEXT,
> > > - TEST_PAGE_FLIP_AND_MMAP_CPU,
> > > - TEST_PAGE_FLIP_AND_MMAP_GTT,
> > > - TEST_PAGE_FLIP_AND_BLT,
> > > - TEST_PAGE_FLIP_AND_RENDER,
> > > - TEST_PAGE_FLIP_AND_CONTEXT,
> > > -};
> > > -
> > > -typedef struct {
> > > - int drm_fd;
> > > - igt_crc_t ref_crc[4];
> > > - igt_pipe_crc_t *pipe_crc;
> > > - drm_intel_bufmgr *bufmgr;
> > > - drm_intel_context *ctx[2];
> > > - uint32_t devid;
> > > - igt_display_t display;
> > > - igt_output_t *output;
> > > - enum pipe pipe;
> > > - igt_plane_t *primary;
> > > - struct igt_fb fb[2];
> > > -} data_t;
> > > -
> > > -static const char *test_mode_str(enum test_mode mode)
> > > -{
> > > - static const char * const test_modes[] = {
> > > - [TEST_PAGE_FLIP] = "page_flip",
> > > - [TEST_MMAP_CPU] = "mmap_cpu",
> > > - [TEST_MMAP_GTT] = "mmap_gtt",
> > > - [TEST_BLT] = "blt",
> > > - [TEST_RENDER] = "render",
> > > - [TEST_CONTEXT] = "context",
> > > - [TEST_PAGE_FLIP_AND_MMAP_CPU] =
> > > "page_flip_and_mmap_cpu",
> > > - [TEST_PAGE_FLIP_AND_MMAP_GTT] =
> > > "page_flip_and_mmap_gtt",
> > > - [TEST_PAGE_FLIP_AND_BLT] = "page_flip_and_blt",
> > > - [TEST_PAGE_FLIP_AND_RENDER] =
> > > "page_flip_and_render",
> > > - [TEST_PAGE_FLIP_AND_CONTEXT] =
> > > "page_flip_and_context",
> > > - };
> > > -
> > > - return test_modes[mode];
> > > -}
> > > -
> > > -static void fill_blt(data_t *data,
> > > - uint32_t handle,
> > > - struct igt_fb *fb,
> > > - unsigned char color)
> > > -{
> > > - drm_intel_bo *dst = gem_handle_to_libdrm_bo(data->bufmgr,
> > > - data->drm_fd,
> > > - "", handle);
> > > - struct intel_batchbuffer *batch;
> > > - unsigned flags;
> > > - int pitch;
> > > - uint32_t pixel = color | (color << 8) | (color << 16) |
> > > (color << 24);
> > > -
> > > - batch = intel_batchbuffer_alloc(data->bufmgr, data-
> > > >devid);
> > > - igt_assert(batch);
> > > -
> > > - pitch = fb->stride;
> > > - flags = XY_COLOR_BLT_WRITE_ALPHA |
> > > - XY_COLOR_BLT_WRITE_RGB;
> > > - if (fb->tiling && batch->gen >= 4) {
> > > - flags |= XY_COLOR_BLT_TILED;
> > > - pitch /= 4;
> > > - }
> > > -
> > > - COLOR_BLIT_COPY_BATCH_START(flags);
> > > - OUT_BATCH(3 << 24 | 0xf0 << 16 | pitch);
> > > - OUT_BATCH(0);
> > > - OUT_BATCH(1 << 16 | 1);
> > > - OUT_RELOC_FENCED(dst, I915_GEM_DOMAIN_RENDER,
> > > I915_GEM_DOMAIN_RENDER, 0);
> > > - OUT_BATCH(pixel);
> > > - ADVANCE_BATCH();
> > > -
> > > - intel_batchbuffer_flush(batch);
> > > - intel_batchbuffer_free(batch);
> > > -
> > > - gem_bo_busy(data->drm_fd, handle);
> > > -}
> > > -
> > > -static void scratch_buf_init(struct igt_buf *buf, drm_intel_bo
> > > *bo)
> > > -{
> > > - buf->bo = bo;
> > > - buf->stride = 4096;
> > > - buf->tiling = I915_TILING_X;
> > > - buf->size = 4096;
> > > -}
> > > -
> > > -static void exec_nop(data_t *data, uint32_t handle,
> > > drm_intel_context *context)
> > > -{
> > > - drm_intel_bo *dst;
> > > - struct intel_batchbuffer *batch;
> > > -
> > > - dst = gem_handle_to_libdrm_bo(data->bufmgr, data->drm_fd,
> > > "", handle);
> > > - igt_assert(dst);
> > > -
> > > - batch = intel_batchbuffer_alloc(data->bufmgr, data-
> > > >devid);
> > > - igt_assert(batch);
> > > -
> > > - /* add the reloc to make sure the kernel will think we
> > > write to dst */
> > > - BEGIN_BATCH(4, 1);
> > > - OUT_BATCH(MI_BATCH_BUFFER_END);
> > > - OUT_BATCH(MI_NOOP);
> > > - OUT_RELOC(dst, I915_GEM_DOMAIN_RENDER,
> > > I915_GEM_DOMAIN_RENDER, 0);
> > > - OUT_BATCH(MI_NOOP);
> > > - ADVANCE_BATCH();
> > > -
> > > - intel_batchbuffer_flush_with_context(batch, context);
> > > - intel_batchbuffer_free(batch);
> > > -}
> > > -
> > > -static void fill_render(data_t *data, uint32_t handle,
> > > - drm_intel_context *context, unsigned char
> > > color)
> > > -{
> > > - drm_intel_bo *src, *dst;
> > > - struct intel_batchbuffer *batch;
> > > - struct igt_buf src_buf, dst_buf;
> > > - const uint8_t buf[4] = { color, color, color, color };
> > > - igt_render_copyfunc_t rendercopy =
> > > igt_get_render_copyfunc(data->devid);
> > > -
> > > - igt_skip_on(!rendercopy);
> > > -
> > > - dst = gem_handle_to_libdrm_bo(data->bufmgr, data->drm_fd,
> > > "", handle);
> > > - igt_assert(dst);
> > > -
> > > - src = drm_intel_bo_alloc(data->bufmgr, "", 4096, 4096);
> > > - igt_assert(src);
> > > -
> > > - gem_write(data->drm_fd, src->handle, 0, buf, 4);
> > > -
> > > - scratch_buf_init(&src_buf, src);
> > > - scratch_buf_init(&dst_buf, dst);
> > > -
> > > - batch = intel_batchbuffer_alloc(data->bufmgr, data-
> > > >devid);
> > > - igt_assert(batch);
> > > -
> > > - rendercopy(batch, context,
> > > - &src_buf, 0, 0, 1, 1,
> > > - &dst_buf, 0, 0);
> > > -
> > > - intel_batchbuffer_free(batch);
> > > -
> > > - gem_bo_busy(data->drm_fd, handle);
> > > -}
> > > -
> > > -static void fill_mmap_cpu(data_t *data, uint32_t handle, unsigned
> > > char color)
> > > -{
> > > - void *ptr;
> > > -
> > > - ptr = gem_mmap__cpu(data->drm_fd, handle, 0, 4096,
> > > PROT_WRITE);
> > > - gem_set_domain(data->drm_fd, handle, I915_GEM_DOMAIN_CPU,
> > > - I915_GEM_DOMAIN_CPU);
> > > - memset(ptr, color, 4);
> > > - munmap(ptr, 4096);
> > > - gem_sw_finish(data->drm_fd, handle);
> > > -}
> > > -
> > > -static void fill_mmap_gtt(data_t *data, uint32_t handle, unsigned
> > > char color)
> > > -{
> > > - void *ptr;
> > > -
> > > - ptr = gem_mmap__gtt(data->drm_fd, handle, 4096,
> > > PROT_WRITE);
> > > - gem_set_domain(data->drm_fd, handle, I915_GEM_DOMAIN_GTT,
> > > - I915_GEM_DOMAIN_GTT);
> > > - memset(ptr, color, 4);
> > > - munmap(ptr, 4096);
> > > -}
> > > -
> > > -static bool fbc_enabled(data_t *data)
> > > -{
> > > - char str[128] = {};
> > > -
> > > - igt_debugfs_read(data->drm_fd, "i915_fbc_status", str);
> > > - return strstr(str, "FBC enabled") != NULL;
> > > -}
> > > -
> > > -static bool wait_for_fbc_enabled(data_t *data)
> > > -{
> > > - return igt_wait(fbc_enabled(data), 3000, 30);
> > > -}
> > > -
> > > -static void check_crc(data_t *data, enum test_mode mode)
> > > -{
> > > - igt_pipe_crc_t *pipe_crc = data->pipe_crc;
> > > - igt_crc_t crc, *ref_crc;
> > > -
> > > - switch (mode) {
> > > - case TEST_PAGE_FLIP:
> > > - ref_crc = &data->ref_crc[1];
> > > - break;
> > > - case TEST_MMAP_CPU:
> > > - case TEST_MMAP_GTT:
> > > - case TEST_BLT:
> > > - case TEST_RENDER:
> > > - case TEST_CONTEXT:
> > > - ref_crc = &data->ref_crc[2];
> > > - break;
> > > - case TEST_PAGE_FLIP_AND_MMAP_CPU:
> > > - case TEST_PAGE_FLIP_AND_MMAP_GTT:
> > > - case TEST_PAGE_FLIP_AND_BLT:
> > > - case TEST_PAGE_FLIP_AND_RENDER:
> > > - case TEST_PAGE_FLIP_AND_CONTEXT:
> > > - ref_crc = &data->ref_crc[3];
> > > - break;
> > > - default:
> > > - igt_assert(false);
> > > - }
> > > -
> > > - igt_pipe_crc_collect_crc(pipe_crc, &crc);
> > > - igt_assert_crc_equal(&crc, ref_crc);
> > > -}
> > > -
> > > -static void test_crc(data_t *data, enum test_mode mode)
> > > -{
> > > - uint32_t crtc_id = data->output->config.crtc->crtc_id;
> > > - uint32_t handle = data->fb[0].gem_handle;
> > > - drm_intel_context *context = NULL;
> > > -
> > > - igt_assert(fbc_enabled(data));
> > > -
> > > - if (mode == TEST_PAGE_FLIP || mode >=
> > > TEST_PAGE_FLIP_AND_MMAP_CPU) {
> > > - handle = data->fb[1].gem_handle;
> > > - igt_assert(drmModePageFlip(data->drm_fd, crtc_id,
> > > - data->fb[1].fb_id, 0,
> > > NULL) == 0);
> > > -
> > > - if (mode != TEST_PAGE_FLIP)
> > > - igt_assert(wait_for_fbc_enabled(data));
> > > - }
> > > -
> > > - switch (mode) {
> > > - case TEST_PAGE_FLIP:
> > > - break;
> > > - case TEST_MMAP_CPU:
> > > - case TEST_PAGE_FLIP_AND_MMAP_CPU:
> > > - fill_mmap_cpu(data, handle, 0xff);
> > > - break;
> > > - case TEST_MMAP_GTT:
> > > - case TEST_PAGE_FLIP_AND_MMAP_GTT:
> > > - fill_mmap_gtt(data, handle, 0xff);
> > > - break;
> > > - case TEST_BLT:
> > > - case TEST_PAGE_FLIP_AND_BLT:
> > > - fill_blt(data, handle, data->fb, ~0);
> > > - break;
> > > - case TEST_CONTEXT:
> > > - case TEST_PAGE_FLIP_AND_CONTEXT:
> > > - context = data->ctx[1];
> > > - case TEST_RENDER:
> > > - case TEST_PAGE_FLIP_AND_RENDER:
> > > - fill_render(data, handle, context, 0xff);
> > > - break;
> > > - }
> > > -
> > > - /*
> > > - * Make sure we're looking at new data (two vblanks
> > > - * to leave some leeway for the kernel if we ever do
> > > - * some kind of delayed FBC disable for GTT mmaps.
> > > - */
> > > - igt_wait_for_vblank(data->drm_fd, data->pipe);
> > > - igt_wait_for_vblank(data->drm_fd, data->pipe);
> > > -
> > > - check_crc(data, mode);
> > > -
> > > - /*
> > > - * Allow time for FBC to kick in again if it
> > > - * got disabled during dirtyfb or page flip.
> > > - */
> > > - igt_assert(wait_for_fbc_enabled(data));
> > > -
> > > - check_crc(data, mode);
> > > -}
> > > -
> > > -static void prepare_crtc(data_t *data)
> > > -{
> > > - igt_output_t *output = data->output;
> > > -
> > > - igt_output_set_pipe(output, data->pipe);
> > > -}
> > > -
> > > -static void create_fbs(data_t *data, uint64_t tiling, struct
> > > igt_fb *fbs)
> > > -{
> > > - int rc;
> > > - drmModeModeInfo *mode = igt_output_get_mode(data->output);
> > > -
> > > - rc = igt_create_color_fb(data->drm_fd, mode->hdisplay,
> > > mode->vdisplay,
> > > - DRM_FORMAT_XRGB8888, tiling,
> > > - 0.0, 0.0, 0.0, &fbs[0]);
> > > - igt_assert(rc);
> > > - rc = igt_create_color_fb(data->drm_fd, mode->hdisplay,
> > > mode->vdisplay,
> > > - DRM_FORMAT_XRGB8888, tiling,
> > > - 0.1, 0.1, 0.1, &fbs[1]);
> > > - igt_assert(rc);
> > > -}
> > > -
> > > -/* Since we want to be really safe that the CRCs are actually what
> > > we really
> > > - * want, use untiled FBs, so FBC won't happen to disrupt things.
> > > Also do the
> > > - * drawing before setting the modes, just to be sure. */
> > > -static void get_ref_crcs(data_t *data)
> > > -{
> > > - igt_display_t *display = &data->display;
> > > - struct igt_fb fbs[4];
> > > - int i;
> > > -
> > > - create_fbs(data, LOCAL_DRM_FORMAT_MOD_NONE, &fbs[0]);
> > > - create_fbs(data, LOCAL_DRM_FORMAT_MOD_NONE, &fbs[2]);
> > > -
> > > - fill_mmap_gtt(data, fbs[2].gem_handle, 0xff);
> > > - fill_mmap_gtt(data, fbs[3].gem_handle, 0xff);
> > > -
> > > - for (i = 0; i < 4; i++) {
> > > - igt_plane_set_fb(data->primary, &fbs[i]);
> > > - igt_display_commit(display);
> > > - igt_wait_for_vblank(data->drm_fd, data->pipe);
> > > - igt_assert(!fbc_enabled(data));
> > > - igt_pipe_crc_collect_crc(data->pipe_crc, &data-
> > > >ref_crc[i]);
> > > - igt_assert(!fbc_enabled(data));
> > > - }
> > > -
> > > - igt_plane_set_fb(data->primary, &data->fb[1]);
> > > - igt_display_commit(display);
> > > -
> > > - for (i = 0; i < 4; i++)
> > > - igt_remove_fb(data->drm_fd, &fbs[i]);
> > > -}
> > > -
> > > -static bool prepare_test(data_t *data, enum test_mode test_mode,
> > > uint64_t tiling)
> > > -{
> > > - igt_display_t *display = &data->display;
> > > - igt_output_t *output = data->output;
> > > - igt_pipe_crc_t *pipe_crc;
> > > -
> > > - data->primary = igt_output_get_plane_type(data->output,
> > > DRM_PLANE_TYPE_PRIMARY);
> > > -
> > > - create_fbs(data, tiling, data->fb);
> > > -
> > > - igt_pipe_crc_free(data->pipe_crc);
> > > - data->pipe_crc = NULL;
> > > - pipe_crc = igt_pipe_crc_new(data->drm_fd, data->pipe,
> > > - INTEL_PIPE_CRC_SOURCE_AUTO);
> > > - data->pipe_crc = pipe_crc;
> > > -
> > > - get_ref_crcs(data);
> > > -
> > > - /* scanout = fb[1] */
> > > - igt_plane_set_fb(data->primary, &data->fb[1]);
> > > - igt_display_commit(display);
> > > -
> > > - if (!wait_for_fbc_enabled(data)) {
> > > - igt_info("FBC not enabled\n");
> > > -
> > > - igt_plane_set_fb(data->primary, NULL);
> > > - igt_output_set_pipe(output, PIPE_ANY);
> > > - igt_display_commit(display);
> > > -
> > > - igt_remove_fb(data->drm_fd, &data->fb[0]);
> > > - igt_remove_fb(data->drm_fd, &data->fb[1]);
> > > - return false;
> > > - }
> > > -
> > > - if (test_mode == TEST_CONTEXT || test_mode ==
> > > TEST_PAGE_FLIP_AND_CONTEXT) {
> > > - data->ctx[0] = drm_intel_gem_context_create(data-
> > > >bufmgr);
> > > - igt_assert(data->ctx[0]);
> > > - data->ctx[1] = drm_intel_gem_context_create(data-
> > > >bufmgr);
> > > - igt_assert(data->ctx[1]);
> > > -
> > > - /*
> > > - * Disable FBC RT address for both contexts
> > > - * (by "rendering" to a non-scanout buffer).
> > > - */
> > > - exec_nop(data, data->fb[0].gem_handle, data-
> > > >ctx[1]);
> > > - exec_nop(data, data->fb[0].gem_handle, data-
> > > >ctx[0]);
> > > - exec_nop(data, data->fb[0].gem_handle, data-
> > > >ctx[1]);
> > > - exec_nop(data, data->fb[0].gem_handle, data-
> > > >ctx[0]);
> > > - }
> > > -
> > > - /* scanout = fb[0] */
> > > - igt_plane_set_fb(data->primary, &data->fb[0]);
> > > - igt_display_commit(display);
> > > -
> > > - igt_assert(wait_for_fbc_enabled(data));
> > > -
> > > - if (test_mode == TEST_CONTEXT || test_mode ==
> > > TEST_PAGE_FLIP_AND_CONTEXT) {
> > > - /*
> > > - * make ctx[0] FBC RT address point to fb[0],
> > > ctx[1]
> > > - * FBC RT address is left as disabled.
> > > - */
> > > - exec_nop(data, data->fb[0].gem_handle, data-
> > > >ctx[0]);
> > > - igt_assert(wait_for_fbc_enabled(data));
> > > - }
> > > -
> > > - igt_wait_for_vblank(data->drm_fd, data->pipe);
> > > -
> > > - return true;
> > > -}
> > > -
> > > -static void finish_crtc(data_t *data, enum test_mode mode)
> > > -{
> > > - igt_pipe_crc_free(data->pipe_crc);
> > > - data->pipe_crc = NULL;
> > > -
> > > - if (mode == TEST_CONTEXT || mode ==
> > > TEST_PAGE_FLIP_AND_CONTEXT) {
> > > - drm_intel_gem_context_destroy(data->ctx[0]);
> > > - drm_intel_gem_context_destroy(data->ctx[1]);
> > > - }
> > > -
> > > - igt_plane_set_fb(data->primary, NULL);
> > > - igt_output_set_pipe(data->output, PIPE_ANY);
> > > - igt_display_commit(&data->display);
> > > -
> > > - igt_remove_fb(data->drm_fd, &data->fb[0]);
> > > - igt_remove_fb(data->drm_fd, &data->fb[1]);
> > > -}
> > > -
> > > -static void reset_display(data_t *data)
> > > -{
> > > - igt_display_t *display = &data->display;
> > > - enum pipe pipe_id;
> > > -
> > > - for_each_pipe(display, pipe_id) {
> > > - igt_pipe_t *pipe = &display->pipes[pipe_id];
> > > - igt_plane_t *plane = igt_pipe_get_plane_type(pipe,
> > > DRM_PLANE_TYPE_PRIMARY);
> > > -
> > > - igt_plane_set_fb(plane, NULL);
> > > - }
> > > -
> > > - for_each_connected_output(display, data->output)
> > > - igt_output_set_pipe(data->output, PIPE_ANY);
> > > -}
> > > -
> > > -static void run_test(data_t *data, enum test_mode mode)
> > > -{
> > > - igt_display_t *display = &data->display;
> > > - int valid_tests = 0, i;
> > > - uint64_t tiling_methods[] = {
> > > - LOCAL_I915_FORMAT_MOD_X_TILED,
> > > LOCAL_I915_FORMAT_MOD_Y_TILED,
> > > - };
> > > -
> > > - if (mode == TEST_CONTEXT || mode ==
> > > TEST_PAGE_FLIP_AND_CONTEXT) {
> > > - drm_intel_context *ctx =
> > > drm_intel_gem_context_create(data->bufmgr);
> > > - igt_require(ctx);
> > > - drm_intel_gem_context_destroy(ctx);
> > > - }
> > > -
> > > - reset_display(data);
> > > -
> > > - for (i = 0; i < ARRAY_SIZE(tiling_methods); i++) {
> > > - uint64_t tiling = tiling_methods[i];
> > > -
> > > - if (intel_gen(data->devid) < 9 &&
> > > - tiling == LOCAL_I915_FORMAT_MOD_Y_TILED) {
> > > - igt_info("%s y-tiled: SKIPPED\n",
> > > igt_subtest_name());
> > > - continue;
> > > - }
> > > -
> > > - for_each_pipe_with_valid_output(display,
> > > - data->pipe, data-
> > > >output) {
> > > - const char *tiling_name =
> > > - tiling ==
> > > LOCAL_I915_FORMAT_MOD_Y_TILED ?
> > > - "y" : "x";
> > > -
> > > - prepare_crtc(data);
> > > -
> > > - igt_info("Beginning %s on pipe %s,
> > > connector "
> > > - "%s, %s-tiled\n",
> > > - igt_subtest_name(),
> > > - kmstest_pipe_name(data->pipe),
> > > - igt_output_name(data->output),
> > > - tiling_name);
> > > -
> > > - if (!prepare_test(data, mode, tiling)) {
> > > - igt_info("%s on pipe %s, connector
> > > "
> > > - "%s, %s-tiled:
> > > SKIPPED\n",
> > > - igt_subtest_name(),
> > > - kmstest_pipe_name(data-
> > > >pipe),
> > > - igt_output_name(data-
> > > >output),
> > > - tiling_name);
> > > - continue;
> > > - }
> > > -
> > > - valid_tests++;
> > > -
> > > - test_crc(data, mode);
> > > -
> > > - igt_info("%s on pipe %s, connector %s,"
> > > - "%s-tiled: PASSED\n",
> > > - igt_subtest_name(),
> > > - kmstest_pipe_name(data->pipe),
> > > - igt_output_name(data->output),
> > > - tiling_name);
> > > -
> > > - finish_crtc(data, mode);
> > > - }
> > > - }
> > > -
> > > - igt_require_f(valid_tests, "no valid crtc/connector
> > > combinations found\n");
> > > -}
> > > -
> > > -igt_main
> > > -{
> > > - data_t data = {};
> > > - enum test_mode mode;
> > > -
> > > - igt_skip_on_simulation();
> > > -
> > > - igt_fixture {
> > > - char buf[128];
> > > -
> > > - data.drm_fd =
> > > drm_open_driver_master(DRIVER_INTEL);
> > > - kmstest_set_vt_graphics_mode();
> > > -
> > > - data.devid = intel_get_drm_devid(data.drm_fd);
> > > -
> > > - igt_require_pipe_crc(data.drm_fd);
> > > -
> > > - igt_debugfs_read(data.drm_fd, "i915_fbc_status",
> > > buf);
> > > - igt_require_f(!strstr(buf, "unsupported on this
> > > chipset"),
> > > - "FBC not supported\n");
> > > -
> > > - if (intel_gen(data.devid) >= 6)
> > > - igt_set_module_param_int("enable_fbc", 1);
> > > -
> > > - data.bufmgr =
> > > drm_intel_bufmgr_gem_init(data.drm_fd, 4096);
> > > - igt_assert(data.bufmgr);
> > > - drm_intel_bufmgr_gem_enable_reuse(data.bufmgr);
> > > -
> > > - igt_display_init(&data.display, data.drm_fd);
> > > - }
> > > -
> > > - for (mode = TEST_PAGE_FLIP; mode <=
> > > TEST_PAGE_FLIP_AND_CONTEXT; mode++) {
> > > - igt_subtest_f("%s", test_mode_str(mode)) {
> > > - run_test(&data, mode);
> > > - }
> > > - }
> > > -
> > > - igt_fixture {
> > > - drm_intel_bufmgr_destroy(data.bufmgr);
> > > - igt_display_fini(&data.display);
> > > - }
> > > -}
> > > diff --git a/tests/meson.build b/tests/meson.build
> > > index 835adc007e95..c3d5372f78ac 100644
> > > --- a/tests/meson.build
> > > +++ b/tests/meson.build
> > > @@ -162,7 +162,6 @@ test_progs = [
> > > 'kms_cursor_crc',
> > > 'kms_cursor_legacy',
> > > 'kms_draw_crc',
> > > - 'kms_fbc_crc',
> > > 'kms_fbcon_fbt',
> > > 'kms_fence_pin_leak',
> > > 'kms_flip',
> > > --
> > > 2.14.1
> > >
> > > _______________________________________________
> > > Intel-gfx mailing list
> > > Intel-gfx@lists.freedesktop.org
> > > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> >
> >
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-10-18 8:30 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-17 15:16 [PATCH i-g-t] tests: remove kms_fbc_crc Daniel Vetter
2017-10-17 15:59 ` Ville Syrjälä
2017-10-17 19:10 ` Paulo Zanoni
2017-10-18 8:30 ` Daniel Vetter
2017-10-17 17:08 ` ✓ Fi.CI.BAT: success for " Patchwork
2017-10-18 5:18 ` ✓ Fi.CI.IGT: " Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox