Skip to contentSkip to conversation

tests: Remove kms_render

PATCH In review Maarten Lankhorst 3 participants 5 messages Feb 1, 2018 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests: Remove kms_render

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.

---
 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
tests/Makefile.sources +0 -1
index e4e06d01d7f9..870c9093550b 100644
@@ -202,7 +202,6 @@ TESTS_progs = \
 	kms_properties \
 	kms_psr_sink_crc \
 	kms_pwrite_crc \
-	kms_render \
 	kms_rmfb \
 	kms_rotation_crc \
 	kms_setmode \
tests/kms_render.c deleted +0 -253

253 lines not on this page · raw message

tests/meson.build +0 -1
index 2322217df99b..521a4c425a68 100644
@@ -180,7 +180,6 @@ test_progs = [
 	'kms_properties',
 	'kms_psr_sink_crc',
 	'kms_pwrite_crc',
-	'kms_render',
 	'kms_rmfb',
 	'kms_rotation_crc',
 	'kms_setmode',
Signature · 6 lines
2.15.1

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
#1 lore raw

[igt-dev] ✓ Fi.CI.BAT: success for tests: Remove kms_render

== Series Details ==

== Series Details ==

Series: tests: Remove kms_render
URL : https://patchwork.freedesktop.org/series/37479/
State : success

== Summary ==

IGT patchset tested on top of latest successful build 689ea8ddcaf769c14b26df8c0fcd8fcc74e06dd2 igt/gem_exec_params: Drop drm master privileges only on drm master fds

with latest DRM-Tip kernel build CI_DRM_3710
3c4e44925b60 drm-tip: 2018y-02m-01d-10h-29m-46s UTC integration manifest

Testlist changes:
-igt@kms_render@direct-render
-igt@kms_render@gpu-blit

Test debugfs_test:

        Subgroup read_all_entries:
                dmesg-fail -> PASS       (fi-elk-e7500) fdo#103989 +9
Test gem_ringfill:
        Subgroup basic-default-hang:
                incomplete -> DMESG-WARN (fi-pnv-d510) fdo#101600
Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-b:
                incomplete -> PASS       (fi-snb-2520m) fdo#103713

fdo#103989 https://bugs.freedesktop.org/show_bug.cgi?id=103989
fdo#101600 https://bugs.freedesktop.org/show_bug.cgi?id=101600
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713

fi-bdw-5557u     total:288  pass:267  dwarn:0   dfail:0   fail:0   skip:21  time:421s
fi-bdw-gvtdvm    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:425s
fi-blb-e6850     total:288  pass:223  dwarn:1   dfail:0   fail:0   skip:64  time:373s
fi-bsw-n3050     total:288  pass:242  dwarn:0   dfail:0   fail:0   skip:46  time:486s
fi-bwr-2160      total:288  pass:183  dwarn:0   dfail:0   fail:0   skip:105 time:283s
fi-bxt-dsi       total:288  pass:258  dwarn:0   dfail:0   fail:0   skip:30  time:484s
fi-bxt-j4205     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:486s
fi-byt-j1900     total:288  pass:253  dwarn:0   dfail:0   fail:0   skip:35  time:472s
fi-byt-n2820     total:288  pass:249  dwarn:0   dfail:0   fail:0   skip:39  time:455s
fi-cfl-s2        total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:566s
fi-elk-e7500     total:288  pass:228  dwarn:1   dfail:0   fail:0   skip:59  time:456s
fi-gdg-551       total:288  pass:179  dwarn:0   dfail:0   fail:1   skip:108 time:276s
fi-glk-1         total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:513s
fi-hsw-4770      total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:390s
fi-hsw-4770r     total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:401s
fi-ilk-650       total:288  pass:228  dwarn:0   dfail:0   fail:0   skip:60  time:413s
fi-ivb-3520m     total:288  pass:259  dwarn:0   dfail:0   fail:0   skip:29  time:460s
fi-ivb-3770      total:288  pass:255  dwarn:0   dfail:0   fail:0   skip:33  time:412s
fi-kbl-7500u     total:288  pass:263  dwarn:1   dfail:0   fail:0   skip:24  time:458s
fi-kbl-7560u     total:288  pass:269  dwarn:0   dfail:0   fail:0   skip:19  time:497s
fi-kbl-7567u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:451s
fi-kbl-r         total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:501s
fi-pnv-d510      total:288  pass:222  dwarn:1   dfail:0   fail:0   skip:65  time:579s
fi-skl-6260u     total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:428s
fi-skl-6600u     total:288  pass:261  dwarn:0   dfail:0   fail:0   skip:27  time:506s
fi-skl-6700hq    total:288  pass:262  dwarn:0   dfail:0   fail:0   skip:26  time:533s
fi-skl-6700k2    total:288  pass:264  dwarn:0   dfail:0   fail:0   skip:24  time:490s
fi-skl-6770hq    total:288  pass:268  dwarn:0   dfail:0   fail:0   skip:20  time:495s
fi-skl-guc       total:288  pass:260  dwarn:0   dfail:0   fail:0   skip:28  time:415s
fi-skl-gvtdvm    total:288  pass:265  dwarn:0   dfail:0   fail:0   skip:23  time:433s
fi-snb-2520m     total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:536s
fi-snb-2600      total:288  pass:248  dwarn:0   dfail:0   fail:0   skip:40  time:405s

Blacklisted hosts:
fi-glk-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:469s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_847/issues.html
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Reviewed-by on v1 1/1
#2 lore raw
In reply to Maarten Lankhorst
Quoted 4 lines · Maarten Lankhorst

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.

Quoted 328 lines

---
 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

tests/Makefile.sources +0 -1
index e4e06d01d7f9..870c9093550b 100644
@@ -202,7 +202,6 @@ TESTS_progs = \
  	kms_properties \
  	kms_psr_sink_crc \
  	kms_pwrite_crc \
-	kms_render \
  	kms_rmfb \
  	kms_rotation_crc \
  	kms_setmode \
tests/kms_render.c deleted +0 -2
deleted file mode 100644
index d2208e38f84e..000000000000
@@ -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 <[email protected]>
- */

tests/kms_render.c deleted +0 -21
-#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)

tests/kms_render.c deleted +0 -6
-{
-	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);

tests/kms_render.c deleted +0 -5
-	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);

tests/kms_render.c deleted +0 -1
-	igt_cairo_printf_line(cr, align_hcenter, 10, "%s",

mode_format_str);

tests/kms_render.c deleted +0 -1
-	igt_cairo_printf_line(cr, align_hcenter, 10, "%s",

cconf_str);

tests/kms_render.c deleted +0 -27
-
-	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",

tests/kms_render.c deleted +0 -31
-					 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));

tests/kms_render.c deleted +0 -2
-	igt_assert_lt(0, ret);
-	ret = asprintf(&cconf_str, "pipe %s, encoder %s, connector

%s",

tests/kms_render.c deleted +0 -2
-		       kmstest_pipe_name(cconf->pipe),
-		       kmstest_encoder_type_str(cconf->encoder-
Quoted 1 line

encoder_type),

tests/kms_render.c deleted +0 -1
-		       kmstest_connector_type_str(cconf->connector-
Quoted 1 line

connector_type));

tests/kms_render.c deleted +0 -14
-	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])

)

tests/kms_render.c deleted +0 -3
-		goto err2;
-
-	if (drmModeSetCrtc(drm_fd, cconf->crtc->crtc_id,

fb[0].fb_id,

tests/kms_render.c deleted +0 -1
-				 0, 0, &cconf->connector-
Quoted 1 line

connector_id, 1,

tests/kms_render.c deleted +0 -3
-				 mode))
-		goto err2;
-	do_or_die(drmModePageFlip(drm_fd, cconf->crtc->crtc_id,

fb[0].fb_id,

tests/kms_render.c deleted +0 -5
-				  0, NULL));
-	sleep(2);
-
-	if (flags & TEST_DIRECT_RENDER) {
-		paint_fb(&fb[0], test_name, mode_format_str,

cconf_str);

tests/kms_render.c deleted +0 -2
-	} else if (flags & TEST_GPU_BLIT) {
-		paint_fb(&fb[1], test_name, mode_format_str,

cconf_str);

tests/kms_render.c deleted +0 -39
-		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");

tests/kms_render.c deleted +0 -26
-			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,

tests/kms_render.c deleted +0 -1
-							   1 << j,

&cconf))

tests/kms_render.c deleted +0 -40
-				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);
-}
tests/meson.build +0 -1
index 2322217df99b..521a4c425a68 100644
@@ -180,7 +180,6 @@ test_progs = [
  	'kms_properties',
  	'kms_psr_sink_crc',
  	'kms_pwrite_crc',
-	'kms_render',
  	'kms_rmfb',
  	'kms_rotation_crc',
  	'kms_setmode',
Signature · 6 lines
Mika Kahola - Intel OTC

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
#3 lore raw

Op 01-02-18 om 13:38 schreef Mika Kahola:

Quoted 6 lines · Maarten Lankhorst
Quoted 4 lines

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.

Thanks, pushed!

Quoted 320 lines
Quoted 320 lines

---
 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

tests/Makefile.sources +0 -1
index e4e06d01d7f9..870c9093550b 100644
@@ -202,7 +202,6 @@ TESTS_progs = \
  	kms_properties \
  	kms_psr_sink_crc \
  	kms_pwrite_crc \
-	kms_render \
  	kms_rmfb \
  	kms_rotation_crc \
  	kms_setmode \
tests/kms_render.c deleted +0 -2
deleted file mode 100644
index d2208e38f84e..000000000000
@@ -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 <[email protected]>
- */

tests/kms_render.c deleted +0 -21
-#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)

tests/kms_render.c deleted +0 -6
-{
-	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);

tests/kms_render.c deleted +0 -5
-	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);

tests/kms_render.c deleted +0 -1
-	igt_cairo_printf_line(cr, align_hcenter, 10, "%s",

mode_format_str);

tests/kms_render.c deleted +0 -1
-	igt_cairo_printf_line(cr, align_hcenter, 10, "%s",

cconf_str);

tests/kms_render.c deleted +0 -27
-
-	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",

tests/kms_render.c deleted +0 -31
-					 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));

tests/kms_render.c deleted +0 -2
-	igt_assert_lt(0, ret);
-	ret = asprintf(&cconf_str, "pipe %s, encoder %s, connector

%s",

tests/kms_render.c deleted +0 -2
-		       kmstest_pipe_name(cconf->pipe),
-		       kmstest_encoder_type_str(cconf->encoder-
Quoted 1 line

encoder_type),

tests/kms_render.c deleted +0 -1
-		       kmstest_connector_type_str(cconf->connector-
Quoted 1 line

connector_type));

tests/kms_render.c deleted +0 -14
-	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])

)

tests/kms_render.c deleted +0 -3
-		goto err2;
-
-	if (drmModeSetCrtc(drm_fd, cconf->crtc->crtc_id,

fb[0].fb_id,

tests/kms_render.c deleted +0 -1
-				 0, 0, &cconf->connector-
Quoted 1 line

connector_id, 1,

tests/kms_render.c deleted +0 -3
-				 mode))
-		goto err2;
-	do_or_die(drmModePageFlip(drm_fd, cconf->crtc->crtc_id,

fb[0].fb_id,

tests/kms_render.c deleted +0 -5
-				  0, NULL));
-	sleep(2);
-
-	if (flags & TEST_DIRECT_RENDER) {
-		paint_fb(&fb[0], test_name, mode_format_str,

cconf_str);

tests/kms_render.c deleted +0 -2
-	} else if (flags & TEST_GPU_BLIT) {
-		paint_fb(&fb[1], test_name, mode_format_str,

cconf_str);

tests/kms_render.c deleted +0 -39
-		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");

tests/kms_render.c deleted +0 -26
-			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,

tests/kms_render.c deleted +0 -1
-							   1 << j,

&cconf))

tests/kms_render.c deleted +0 -40
-				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);
-}
tests/meson.build +0 -0
index 2322217df99b..521a4c425a68 100644
Quoted 8 lines

tests/meson.build test_progs = [ · line 185

Quoted 8 lines
tests/meson.build +0 -1
@@ -180,7 +180,6 @@ test_progs = [
  	'kms_properties',
  	'kms_psr_sink_crc',
  	'kms_pwrite_crc',
-	'kms_render',
  	'kms_rmfb',
  	'kms_rotation_crc',
  	'kms_setmode',

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

#4 lore raw

[igt-dev] ✓ Fi.CI.IGT: success for tests: Remove kms_render

In reply to Maarten Lankhorst
== Series Details ==

== Series Details ==

Series: tests: Remove kms_render
URL : https://patchwork.freedesktop.org/series/37479/
State : success

== Summary ==

Test kms_vblank:

        Subgroup pipe-a-accuracy-idle:
                fail       -> PASS       (shard-apl) fdo#102583
Test gem_eio:
        Subgroup in-flight-contexts:
                fail       -> PASS       (shard-hsw) fdo#104676 +1
Test perf:
        Subgroup oa-exponents:
                fail       -> PASS       (shard-apl) fdo#102254

fdo#102583 https://bugs.freedesktop.org/show_bug.cgi?id=102583
fdo#104676 https://bugs.freedesktop.org/show_bug.cgi?id=104676
fdo#102254 https://bugs.freedesktop.org/show_bug.cgi?id=102254

shard-apl        total:2836 pass:1749 dwarn:1   dfail:0   fail:22  skip:1064 time:12479s
shard-hsw        total:2836 pass:1733 dwarn:1   dfail:0   fail:11  skip:1090 time:11675s
shard-snb        total:2836 pass:1328 dwarn:1   dfail:0   fail:10  skip:1497 time:6452s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_847/shards.html
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev