Skip to contentSkip to conversation

tests/kms_cursor_crc: Open DRM device with DRIVER_ANY

PATCH Superseded Haneen Mohammed 3 participants 4 messages Aug 12, 2018 – Aug 14, 2018

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests/kms_cursor_crc: Open DRM device with DRIVER_ANY

So that this test can be run in drivers other than i915. Remove devid and only check it if the driver is i915.

---
 tests/kms_cursor_crc.c | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)
tests/kms_cursor_crc.c +21 -10
index a164839e..870d7fec 100644
@@ -59,7 +59,6 @@ typedef struct {
 	int curw, curh; /* cursor size */
 	int cursor_max_w, cursor_max_h;
 	igt_pipe_crc_t *pipe_crc;
-	uint32_t devid;
 	unsigned flags;
 } data_t;
 
@@ -108,6 +107,13 @@ static void cursor_disable(data_t *data)
 
 static bool chv_cursor_broken(data_t *data, int x)
 {
+	uint32_t devid;
+
+	if (!is_i915_device(data->drm_fd))
+		return false;
+
+	devid = intel_get_drm_devid(data->drm_fd);
+
 	/*
 	 * CHV gets a FIFO underrun on pipe C when cursor x coordinate
 	 * is negative and the cursor visible.
@@ -121,7 +127,7 @@ static bool chv_cursor_broken(data_t *data, int x)
 	if (x >= 0)
 		return false;
 
-	return IS_CHERRYVIEW(data->devid) && data->pipe == PIPE_C;
+	return IS_CHERRYVIEW(devid) && data->pipe == PIPE_C;
 }
 
 static bool cursor_visible(data_t *data, int x, int y)
@@ -459,8 +465,15 @@ static void create_cursor_fb(data_t *data, int cur_w, int cur_h)
 	igt_put_cairo_ctx(data->drm_fd, &data->fb, cr);
 }
 
-static bool has_nonsquare_cursors(uint32_t devid)
+static bool has_nonsquare_cursors(data_t *data)
 {
+	uint32_t devid;
+
+	if (!is_i915_device(data->drm_fd))
+		return true;
+
+	devid = intel_get_drm_devid(data->drm_fd);
+
 	/*
 	 * Test non-square cursors a bit on the platforms
 	 * that support such things.
@@ -616,19 +629,19 @@ static void run_test_generic(data_t *data)
 
 		/* Using created cursor FBs to test cursor support */
 		igt_subtest_f("cursor-%dx%d-onscreen", w, h) {
-			igt_require(has_nonsquare_cursors(data->devid));
+			igt_require(has_nonsquare_cursors(data));
 			run_test(data, test_crc_onscreen, w, h);
 		}
 		igt_subtest_f("cursor-%dx%d-offscreen", w, h) {
-			igt_require(has_nonsquare_cursors(data->devid));
+			igt_require(has_nonsquare_cursors(data));
 			run_test(data, test_crc_offscreen, w, h);
 		}
 		igt_subtest_f("cursor-%dx%d-sliding", w, h) {
-			igt_require(has_nonsquare_cursors(data->devid));
+			igt_require(has_nonsquare_cursors(data));
 			run_test(data, test_crc_sliding, w, h);
 		}
 		igt_subtest_f("cursor-%dx%d-random", w, h) {
-			igt_require(has_nonsquare_cursors(data->devid));
+			igt_require(has_nonsquare_cursors(data));
 			run_test(data, test_crc_random, w, h);
 		}
 
@@ -647,9 +660,7 @@ igt_main
 	igt_skip_on_simulation();
 
 	igt_fixture {
-		data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
-
-		data.devid = intel_get_drm_devid(data.drm_fd);
+		data.drm_fd = drm_open_driver_master(DRIVER_ANY);
 
 		ret = drmGetCap(data.drm_fd, DRM_CAP_CURSOR_WIDTH, &cursor_width);
 		igt_assert(ret == 0 || errno == EINVAL);
Signature · 6 lines
2.17.1

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

[igt-dev] ✓ Fi.CI.BAT: success for tests/kms_cursor_crc: Open DRM device with DRIVER_ANY

== Series Details ==

== Series Details ==

Series: tests/kms_cursor_crc: Open DRM device with DRIVER_ANY
URL : https://patchwork.freedesktop.org/series/48153/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4660 -> IGTPW_1707 =

== Summary - SUCCESS ==

No regressions found.

External URL: https://patchwork.freedesktop.org/api/1.0/series/48153/revisions/1/mbox/

== Known issues ==

Here are the changes found in IGTPW_1707 that come from known issues:

=== IGT changes ===

    ==== Issues hit ====

    {igt@amdgpu/amd_basic@userptr}:
      {fi-kbl-8809g}:     PASS -> INCOMPLETE (fdo#107402)

    igt@drv_selftest@live_workarounds:
      fi-cnl-psr:         PASS -> DMESG-FAIL (fdo#107292)

    igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
      {fi-byt-clapper}:   PASS -> FAIL (fdo#107362, fdo#103191) +1

    
    ==== Possible fixes ====

    igt@kms_frontbuffer_tracking@basic:
      {fi-byt-clapper}:   FAIL (fdo#103167) -> PASS

    igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a:
      {fi-byt-clapper}:   FAIL (fdo#107362) -> PASS

    
    ==== Warnings ====

    {igt@kms_psr@primary_page_flip}:
      fi-cnl-psr:         DMESG-FAIL (fdo#107372) -> DMESG-WARN (fdo#107372)

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fdo#107292 https://bugs.freedesktop.org/show_bug.cgi?id=107292
fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
fdo#107372 https://bugs.freedesktop.org/show_bug.cgi?id=107372
fdo#107402 https://bugs.freedesktop.org/show_bug.cgi?id=107402

== Participating hosts (54 -> 47) ==

Missing (7): fi-ilk-m540 fi-hsw-4200u fi-skl-guc fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-icl-u

== Build changes ==

* IGT: IGT_4592 -> IGTPW_1707

CI_DRM_4660: 9cd882754c1017e68ed9d2c8d57dc326530522fe @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_1707: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1707/
IGT_4592: fce9638b2e60afce872b3056c19a729b1b3708be @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools

== Logs ==

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

#2 lore raw
In reply to Haneen Mohammed
Quoted 44 lines · Haneen Mohammed

So that this test can be run in drivers other than i915. Remove devid and only check it if the driver is i915.

---
 tests/kms_cursor_crc.c | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)
tests/kms_cursor_crc.c +8 -2
index a164839e..870d7fec 100644
@@ -59,7 +59,6 @@ typedef struct {
 	int curw, curh; /* cursor size */
 	int cursor_max_w, cursor_max_h;
 	igt_pipe_crc_t *pipe_crc;
-	uint32_t devid;
 	unsigned flags;
 } data_t;
 
@@ -108,6 +107,13 @@ static void cursor_disable(data_t *data)
 
 static bool chv_cursor_broken(data_t *data, int x)
 {
+	uint32_t devid;
+
+	if (!is_i915_device(data->drm_fd))
+		return false;
+
+	devid = intel_get_drm_devid(data->drm_fd);
+
 	/*
 	 * CHV gets a FIFO underrun on pipe C when cursor x coordinate
 	 * is negative and the cursor visible.
@@ -121,7 +127,7 @@ static bool chv_cursor_broken(data_t *data, int x)
 	if (x >= 0)
 		return false;
 
-	return IS_CHERRYVIEW(data->devid) && data->pipe == PIPE_C;
+	return IS_CHERRYVIEW(devid) && data->pipe == PIPE_C;
 }
 
 static bool cursor_visible(data_t *data, int x, int y)

tests/kms_cursor_crc.c static void create_cursor_fb(data_t *data, int cur_w, int cur_h) · line 473

Quoted 10 lines
tests/kms_cursor_crc.c +5 -1
@@ -459,8 +465,15 @@ static void create_cursor_fb(data_t *data, int cur_w, int cur_h)
 	igt_put_cairo_ctx(data->drm_fd, &data->fb, cr);
 }
 
-static bool has_nonsquare_cursors(uint32_t devid)
+static bool has_nonsquare_cursors(data_t *data)
 {
+	uint32_t devid;
+
+	if (!is_i915_device(data->drm_fd))
+		return true;

Shouldn't this be return false; here? I think assuming that all kms drivers support non-square cursors by default is a bit much ... -Daniel

Quoted 44 lines
tests/kms_cursor_crc.c +8 -7
+
+	devid = intel_get_drm_devid(data->drm_fd);
+
 	/*
 	 * Test non-square cursors a bit on the platforms
 	 * that support such things.
@@ -616,19 +629,19 @@ static void run_test_generic(data_t *data)
 
 		/* Using created cursor FBs to test cursor support */
 		igt_subtest_f("cursor-%dx%d-onscreen", w, h) {
-			igt_require(has_nonsquare_cursors(data->devid));
+			igt_require(has_nonsquare_cursors(data));
 			run_test(data, test_crc_onscreen, w, h);
 		}
 		igt_subtest_f("cursor-%dx%d-offscreen", w, h) {
-			igt_require(has_nonsquare_cursors(data->devid));
+			igt_require(has_nonsquare_cursors(data));
 			run_test(data, test_crc_offscreen, w, h);
 		}
 		igt_subtest_f("cursor-%dx%d-sliding", w, h) {
-			igt_require(has_nonsquare_cursors(data->devid));
+			igt_require(has_nonsquare_cursors(data));
 			run_test(data, test_crc_sliding, w, h);
 		}
 		igt_subtest_f("cursor-%dx%d-random", w, h) {
-			igt_require(has_nonsquare_cursors(data->devid));
+			igt_require(has_nonsquare_cursors(data));
 			run_test(data, test_crc_random, w, h);
 		}
 
@@ -647,9 +660,7 @@ igt_main
 	igt_skip_on_simulation();
 
 	igt_fixture {
-		data.drm_fd = drm_open_driver_master(DRIVER_INTEL);
-
-		data.devid = intel_get_drm_devid(data.drm_fd);
+		data.drm_fd = drm_open_driver_master(DRIVER_ANY);
 
 		ret = drmGetCap(data.drm_fd, DRM_CAP_CURSOR_WIDTH, &cursor_width);
 		igt_assert(ret == 0 || errno == EINVAL);
Signature · 1 line
2.17.1
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
#3 lore raw

[igt-dev] ✓ Fi.CI.IGT: success for tests/kms_cursor_crc: Open DRM device with DRIVER_ANY

In reply to Haneen Mohammed
== Series Details ==

== Series Details ==

Series: tests/kms_cursor_crc: Open DRM device with DRIVER_ANY
URL : https://patchwork.freedesktop.org/series/48153/
State : success

== Summary ==

= CI Bug Log - changes from IGT_4592_full -> IGTPW_1707_full =

== Summary - SUCCESS ==

No regressions found.

External URL: https://patchwork.freedesktop.org/api/1.0/series/48153/revisions/1/mbox/

== Known issues ==

Here are the changes found in IGTPW_1707_full that come from known issues:

=== IGT changes ===

    ==== Issues hit ====

    igt@drv_selftest@live_hangcheck:
      shard-kbl:          PASS -> DMESG-FAIL (fdo#106560, fdo#106947)

    igt@gem_userptr_blits@coherency-unsync:
      shard-snb:          PASS -> INCOMPLETE (fdo#105411)

    igt@kms_rotation_crc@sprite-rotation-180:
      shard-snb:          PASS -> FAIL (fdo#103925)

    igt@pm_rpm@system-suspend:
      shard-kbl:          PASS -> INCOMPLETE (fdo#103665, fdo#107556)

    
    ==== Possible fixes ====

    igt@gem_eio@wait-wedge-10ms:
      shard-glk:          FAIL (fdo#105957) -> PASS

    igt@kms_cursor_legacy@all-pipes-torture-move:
      shard-snb:          DMESG-WARN (fdo#107122) -> PASS
      shard-glk:          DMESG-WARN (fdo#107122) -> PASS
      shard-apl:          DMESG-WARN (fdo#107122) -> PASS
      shard-hsw:          DMESG-WARN (fdo#107122) -> PASS

    igt@kms_rotation_crc@primary-rotation-270:
      shard-kbl:          FAIL (fdo#103925) -> PASS

    igt@kms_setmode@basic:
      shard-kbl:          FAIL (fdo#99912) -> PASS

    igt@kms_universal_plane@cursor-fb-leak-pipe-a:
      shard-apl:          FAIL (fdo#107241) -> PASS

fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#103925 https://bugs.freedesktop.org/show_bug.cgi?id=103925
fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411
fdo#105957 https://bugs.freedesktop.org/show_bug.cgi?id=105957
fdo#106560 https://bugs.freedesktop.org/show_bug.cgi?id=106560
fdo#106947 https://bugs.freedesktop.org/show_bug.cgi?id=106947
fdo#107122 https://bugs.freedesktop.org/show_bug.cgi?id=107122
fdo#107241 https://bugs.freedesktop.org/show_bug.cgi?id=107241
fdo#107556 https://bugs.freedesktop.org/show_bug.cgi?id=107556
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912

== Participating hosts (5 -> 5) ==

No changes in participating hosts

== Build changes ==

* IGT: IGT_4592 -> IGTPW_1707
* Linux: CI_DRM_4642 -> CI_DRM_4660

CI_DRM_4642: 0de4e9a02a422ebe523f59c3b462c949673746b6 @ git://anongit.freedesktop.org/gfx-ci/linux
CI_DRM_4660: 9cd882754c1017e68ed9d2c8d57dc326530522fe @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_1707: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1707/
IGT_4592: fce9638b2e60afce872b3056c19a729b1b3708be @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools

== Logs ==

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