[igt-dev] [PATCH i-g-t] tests/kms_force_connector_basic: Verify planes are restored after load detection

[igt-dev] [PATCH i-g-t] tests/kms_force_connector_basic: Verify planes are restored after load detection

[Maarten Lankhorst]

There's a bug in our load detection in which we don't correctly
restore planes to their previous states. Strictly verify this
is the case by setting a fb on all planes.

Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
 tests/kms_force_connector_basic.c | 63 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/tests/kms_force_connector_basic.c b/tests/kms_force_connector_basic.c
index d11a775a089d..3ea6763ed311 100644
--- a/tests/kms_force_connector_basic.c
+++ b/tests/kms_force_connector_basic.c
@@ -122,6 +122,14 @@ int main(int argc, char **argv)
 	}
 
 	igt_subtest("force-load-detect") {
+		int i, j, w = 64, h = 64;
+		drmModePlaneRes *plane_resources;
+		struct igt_fb xrgb_fb, argb_fb;
+
+		igt_create_fb(drm_fd, w, h, DRM_FORMAT_XRGB8888, 0, &xrgb_fb);
+		igt_create_fb(drm_fd, w, h, DRM_FORMAT_ARGB8888, 0, &argb_fb);
+		igt_assert(drmSetClientCap(drm_fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1) == 0);
+
 		/*
 		 * disable all outputs to make sure we have a
 		 * free crtc available for load detect
@@ -131,6 +139,42 @@ int main(int argc, char **argv)
 
 		igt_set_module_param_int("load_detect_test", 1);
 
+		plane_resources = drmModeGetPlaneResources(drm_fd);
+		igt_assert(plane_resources);
+
+		for (i = 0; i < plane_resources->count_planes; i++) {
+			drmModePlane *drm_plane;
+			bool found = false;
+			uint32_t plane_id = plane_resources->planes[i];
+
+			drm_plane = drmModeGetPlane(drm_fd, plane_id);
+			igt_assert(drm_plane);
+
+			for (j = 0; j < drm_plane->count_formats; j++) {
+				uint32_t format = drm_plane->formats[j];
+				uint32_t crtc = ffs(drm_plane->possible_crtcs) - 1;
+				uint32_t crtc_id = res->crtcs[crtc];
+
+				if (format == DRM_FORMAT_XRGB8888)
+					do_or_die(drmModeSetPlane(drm_fd, plane_id, crtc_id,
+							xrgb_fb.fb_id,
+							0, 0, 0, w, h,
+							0, 0, IGT_FIXED(w, 0), IGT_FIXED(h, 0)));
+				else if (format == DRM_FORMAT_ARGB8888)
+					do_or_die(drmModeSetPlane(drm_fd, plane_id, crtc_id,
+							argb_fb.fb_id,
+							0, 0, 0, w, h,
+							0, 0, IGT_FIXED(w, 0), IGT_FIXED(h, 0)));
+				else
+					continue;
+
+				found = true;
+				break;
+			}
+			drmModeFreePlane(drm_plane);
+			igt_assert(found);
+		}
+
 		/* This can't use drmModeGetConnectorCurrent
 		 * because connector probing is the point of this test.
 		 */
@@ -141,6 +185,25 @@ int main(int argc, char **argv)
 		igt_assert(temp->connection != DRM_MODE_UNKNOWNCONNECTION);
 
 		drmModeFreeConnector(temp);
+
+		/* Look if planes are unmodified. */
+		for (i = 0; i < plane_resources->count_planes; i++) {
+			drmModePlane *drm_plane;
+			bool found = false;
+
+			drm_plane = drmModeGetPlane(drm_fd,
+						    plane_resources->planes[i]);
+			igt_assert(drm_plane);
+
+			igt_assert(drm_plane->crtc_id);
+			igt_assert(drm_plane->fb_id);
+
+			if (drm_plane->fb_id != xrgb_fb.fb_id)
+				igt_assert_eq(drm_plane->fb_id, argb_fb.fb_id);
+
+			drmModeFreePlane(drm_plane);
+			igt_assert(found);
+		}
 	}
 
 	igt_subtest("force-connector-state") {
-- 
2.16.2

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] [PATCH i-g-t] tests/kms_force_connector_basic: Verify planes are restored after load detection, v2.

[Maarten Lankhorst]

There's a bug in our load detection in which we don't correctly
restore planes to their previous states. Strictly verify this
is the case by setting a fb on all planes.

Changes since v1:
- Remove igt_assert(found) in verification, would always fail.

Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
 tests/kms_force_connector_basic.c | 61 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/tests/kms_force_connector_basic.c b/tests/kms_force_connector_basic.c
index d11a775a089d..26e5d01fc2cf 100644
--- a/tests/kms_force_connector_basic.c
+++ b/tests/kms_force_connector_basic.c
@@ -122,6 +122,14 @@ int main(int argc, char **argv)
 	}
 
 	igt_subtest("force-load-detect") {
+		int i, j, w = 64, h = 64;
+		drmModePlaneRes *plane_resources;
+		struct igt_fb xrgb_fb, argb_fb;
+
+		igt_create_fb(drm_fd, w, h, DRM_FORMAT_XRGB8888, 0, &xrgb_fb);
+		igt_create_fb(drm_fd, w, h, DRM_FORMAT_ARGB8888, 0, &argb_fb);
+		igt_assert(drmSetClientCap(drm_fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1) == 0);
+
 		/*
 		 * disable all outputs to make sure we have a
 		 * free crtc available for load detect
@@ -131,6 +139,42 @@ int main(int argc, char **argv)
 
 		igt_set_module_param_int("load_detect_test", 1);
 
+		plane_resources = drmModeGetPlaneResources(drm_fd);
+		igt_assert(plane_resources);
+
+		for (i = 0; i < plane_resources->count_planes; i++) {
+			drmModePlane *drm_plane;
+			bool found = false;
+			uint32_t plane_id = plane_resources->planes[i];
+
+			drm_plane = drmModeGetPlane(drm_fd, plane_id);
+			igt_assert(drm_plane);
+
+			for (j = 0; j < drm_plane->count_formats; j++) {
+				uint32_t format = drm_plane->formats[j];
+				uint32_t crtc = ffs(drm_plane->possible_crtcs) - 1;
+				uint32_t crtc_id = res->crtcs[crtc];
+
+				if (format == DRM_FORMAT_XRGB8888)
+					do_or_die(drmModeSetPlane(drm_fd, plane_id, crtc_id,
+							xrgb_fb.fb_id,
+							0, 0, 0, w, h,
+							0, 0, IGT_FIXED(w, 0), IGT_FIXED(h, 0)));
+				else if (format == DRM_FORMAT_ARGB8888)
+					do_or_die(drmModeSetPlane(drm_fd, plane_id, crtc_id,
+							argb_fb.fb_id,
+							0, 0, 0, w, h,
+							0, 0, IGT_FIXED(w, 0), IGT_FIXED(h, 0)));
+				else
+					continue;
+
+				found = true;
+				break;
+			}
+			drmModeFreePlane(drm_plane);
+			igt_assert(found);
+		}
+
 		/* This can't use drmModeGetConnectorCurrent
 		 * because connector probing is the point of this test.
 		 */
@@ -141,6 +185,23 @@ int main(int argc, char **argv)
 		igt_assert(temp->connection != DRM_MODE_UNKNOWNCONNECTION);
 
 		drmModeFreeConnector(temp);
+
+		/* Look if planes are unmodified. */
+		for (i = 0; i < plane_resources->count_planes; i++) {
+			drmModePlane *drm_plane;
+
+			drm_plane = drmModeGetPlane(drm_fd,
+						    plane_resources->planes[i]);
+			igt_assert(drm_plane);
+
+			igt_assert(drm_plane->crtc_id);
+			igt_assert(drm_plane->fb_id);
+
+			if (drm_plane->fb_id != xrgb_fb.fb_id)
+				igt_assert_eq(drm_plane->fb_id, argb_fb.fb_id);
+
+			drmModeFreePlane(drm_plane);
+		}
 	}
 
 	igt_subtest("force-connector-state") {
-- 
2.16.2

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] ✗ Fi.CI.BAT: failure for tests/kms_force_connector_basic: Verify planes are restored after load detection (rev2)

[Patchwork]

== Series Details ==

Series: tests/kms_force_connector_basic: Verify planes are restored after load detection (rev2)
URL   : https://patchwork.freedesktop.org/series/40209/
State : failure

== Summary ==

IGT patchset tested on top of latest successful build
b09e979a67817a9b068f841bda81940b9d208850 tools/aubdump: For gen10+ support addresses up to 4GB

with latest DRM-Tip kernel build CI_DRM_3951
260af42eeff0 drm-tip: 2018y-03m-19d-17h-15m-08s UTC integration manifest

No testlist changes.

---- Possible new issues:

Test kms_force_connector_basic:
        Subgroup force-load-detect:
                pass       -> FAIL       (fi-bwr-2160)
                pass       -> FAIL       (fi-byt-j1900)
                pass       -> FAIL       (fi-ivb-3520m)
                pass       -> FAIL       (fi-snb-2520m)
                pass       -> FAIL       (fi-snb-2600)

---- Known issues:

Test kms_force_connector_basic:
        Subgroup force-load-detect:
                pass       -> FAIL       (fi-elk-e7500) fdo#103989

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

fi-bdw-5557u     total:285  pass:264  dwarn:0   dfail:0   fail:0   skip:21  time:432s
fi-bdw-gvtdvm    total:285  pass:261  dwarn:0   dfail:0   fail:0   skip:24  time:438s
fi-blb-e6850     total:285  pass:220  dwarn:1   dfail:0   fail:0   skip:64  time:382s
fi-bsw-n3050     total:285  pass:239  dwarn:0   dfail:0   fail:0   skip:46  time:542s
fi-bwr-2160      total:285  pass:179  dwarn:0   dfail:0   fail:1   skip:105 time:299s
fi-bxt-j4205     total:285  pass:256  dwarn:0   dfail:0   fail:0   skip:29  time:514s
fi-byt-j1900     total:285  pass:249  dwarn:0   dfail:0   fail:1   skip:35  time:518s
fi-byt-n2820     total:285  pass:246  dwarn:0   dfail:0   fail:0   skip:39  time:503s
fi-cfl-8700k     total:285  pass:257  dwarn:0   dfail:0   fail:0   skip:28  time:409s
fi-cfl-s2        total:285  pass:259  dwarn:0   dfail:0   fail:0   skip:26  time:572s
fi-cfl-u         total:285  pass:259  dwarn:0   dfail:0   fail:0   skip:26  time:512s
fi-cnl-drrs      total:285  pass:254  dwarn:3   dfail:0   fail:0   skip:28  time:537s
fi-elk-e7500     total:285  pass:224  dwarn:1   dfail:0   fail:1   skip:59  time:432s
fi-gdg-551       total:285  pass:176  dwarn:0   dfail:0   fail:1   skip:108 time:317s
fi-glk-1         total:285  pass:257  dwarn:0   dfail:0   fail:0   skip:28  time:542s
fi-hsw-4770      total:285  pass:258  dwarn:0   dfail:0   fail:0   skip:27  time:404s
fi-ilk-650       total:285  pass:225  dwarn:0   dfail:0   fail:0   skip:60  time:421s
fi-ivb-3520m     total:285  pass:255  dwarn:0   dfail:0   fail:1   skip:29  time:472s
fi-ivb-3770      total:285  pass:252  dwarn:0   dfail:0   fail:0   skip:33  time:429s
fi-kbl-7500u     total:285  pass:260  dwarn:1   dfail:0   fail:0   skip:24  time:476s
fi-kbl-7567u     total:285  pass:265  dwarn:0   dfail:0   fail:0   skip:20  time:471s
fi-kbl-r         total:285  pass:258  dwarn:0   dfail:0   fail:0   skip:27  time:517s
fi-pnv-d510      total:285  pass:219  dwarn:1   dfail:0   fail:0   skip:65  time:654s
fi-skl-6260u     total:285  pass:265  dwarn:0   dfail:0   fail:0   skip:20  time:444s
fi-skl-6600u     total:285  pass:258  dwarn:0   dfail:0   fail:0   skip:27  time:532s
fi-skl-6700hq    total:285  pass:259  dwarn:0   dfail:0   fail:0   skip:26  time:541s
fi-skl-6700k2    total:285  pass:261  dwarn:0   dfail:0   fail:0   skip:24  time:495s
fi-skl-6770hq    total:285  pass:265  dwarn:0   dfail:0   fail:0   skip:20  time:502s
fi-skl-guc       total:285  pass:257  dwarn:0   dfail:0   fail:0   skip:28  time:433s
fi-skl-gvtdvm    total:285  pass:262  dwarn:0   dfail:0   fail:0   skip:23  time:444s
fi-snb-2520m     total:285  pass:244  dwarn:0   dfail:0   fail:1   skip:40  time:600s
fi-snb-2600      total:285  pass:244  dwarn:0   dfail:0   fail:1   skip:40  time:399s

== Logs ==

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

Re: [igt-dev] [PATCH i-g-t] tests/kms_force_connector_basic: Verify planes are restored after load detection, v2.

[Ville Syrjälä]

On Mon, Mar 19, 2018 at 06:02:45PM +0100, Maarten Lankhorst wrote:
> There's a bug in our load detection in which we don't correctly
> restore planes to their previous states. Strictly verify this
> is the case by setting a fb on all planes.
> 
> Changes since v1:
> - Remove igt_assert(found) in verification, would always fail.
> 
> Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> ---
>  tests/kms_force_connector_basic.c | 61 +++++++++++++++++++++++++++++++++++++++
>  1 file changed, 61 insertions(+)
> 
> diff --git a/tests/kms_force_connector_basic.c b/tests/kms_force_connector_basic.c
> index d11a775a089d..26e5d01fc2cf 100644
> --- a/tests/kms_force_connector_basic.c
> +++ b/tests/kms_force_connector_basic.c
> @@ -122,6 +122,14 @@ int main(int argc, char **argv)
>  	}
>  
>  	igt_subtest("force-load-detect") {
> +		int i, j, w = 64, h = 64;
> +		drmModePlaneRes *plane_resources;
> +		struct igt_fb xrgb_fb, argb_fb;
> +
> +		igt_create_fb(drm_fd, w, h, DRM_FORMAT_XRGB8888, 0, &xrgb_fb);
> +		igt_create_fb(drm_fd, w, h, DRM_FORMAT_ARGB8888, 0, &argb_fb);
> +		igt_assert(drmSetClientCap(drm_fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1) == 0);
> +
>  		/*
>  		 * disable all outputs to make sure we have a
>  		 * free crtc available for load detect
> @@ -131,6 +139,42 @@ int main(int argc, char **argv)
>  
>  		igt_set_module_param_int("load_detect_test", 1);
>  
> +		plane_resources = drmModeGetPlaneResources(drm_fd);
> +		igt_assert(plane_resources);
> +
> +		for (i = 0; i < plane_resources->count_planes; i++) {
> +			drmModePlane *drm_plane;
> +			bool found = false;
> +			uint32_t plane_id = plane_resources->planes[i];
> +
> +			drm_plane = drmModeGetPlane(drm_fd, plane_id);
> +			igt_assert(drm_plane);
> +
> +			for (j = 0; j < drm_plane->count_formats; j++) {
> +				uint32_t format = drm_plane->formats[j];
> +				uint32_t crtc = ffs(drm_plane->possible_crtcs) - 1;
> +				uint32_t crtc_id = res->crtcs[crtc];
> +
> +				if (format == DRM_FORMAT_XRGB8888)
> +					do_or_die(drmModeSetPlane(drm_fd, plane_id, crtc_id,
> +							xrgb_fb.fb_id,
> +							0, 0, 0, w, h,
> +							0, 0, IGT_FIXED(w, 0), IGT_FIXED(h, 0)));
> +				else if (format == DRM_FORMAT_ARGB8888)
> +					do_or_die(drmModeSetPlane(drm_fd, plane_id, crtc_id,
> +							argb_fb.fb_id,
> +							0, 0, 0, w, h,
> +							0, 0, IGT_FIXED(w, 0), IGT_FIXED(h, 0)));
> +				else
> +					continue;
> +
> +				found = true;
> +				break;
> +			}
> +			drmModeFreePlane(drm_plane);
> +			igt_assert(found);
> +		}
> +
>  		/* This can't use drmModeGetConnectorCurrent
>  		 * because connector probing is the point of this test.
>  		 */
> @@ -141,6 +185,23 @@ int main(int argc, char **argv)
>  		igt_assert(temp->connection != DRM_MODE_UNKNOWNCONNECTION);
>  
>  		drmModeFreeConnector(temp);
> +
> +		/* Look if planes are unmodified. */
> +		for (i = 0; i < plane_resources->count_planes; i++) {
> +			drmModePlane *drm_plane;
> +
> +			drm_plane = drmModeGetPlane(drm_fd,
> +						    plane_resources->planes[i]);
> +			igt_assert(drm_plane);
> +
> +			igt_assert(drm_plane->crtc_id);
> +			igt_assert(drm_plane->fb_id);
> +
> +			if (drm_plane->fb_id != xrgb_fb.fb_id)
> +				igt_assert_eq(drm_plane->fb_id, argb_fb.fb_id);

Maybe just 'igt_assert(fb_id == a || fb_id == b)'?

Either way this is
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Now we just need to get the leak fixes to the kernel.

> +
> +			drmModeFreePlane(drm_plane);
> +		}
>  	}
>  
>  	igt_subtest("force-connector-state") {
> -- 
> 2.16.2

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] ✓ Fi.CI.BAT: success for tests/kms_force_connector_basic: Verify planes are restored after load detection (rev2)

[Patchwork]

== Series Details ==

Series: tests/kms_force_connector_basic: Verify planes are restored after load detection (rev2)
URL   : https://patchwork.freedesktop.org/series/40209/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4539 -> IGTPW_1644 =

== Summary - SUCCESS ==

  No regressions found.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/40209/revisions/2/mbox/

== Known issues ==

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

  === IGT changes ===

    ==== Issues hit ====

    igt@gem_tiled_blits@basic:
      fi-glk-j4005:       PASS -> DMESG-WARN (fdo#105719)

    igt@gem_workarounds@basic-read:
      {fi-icl-u}:         NOTRUN -> FAIL (fdo#107338)

    igt@kms_flip@basic-flip-vs-wf_vblank:
      {fi-icl-u}:         NOTRUN -> DMESG-WARN (fdo#107335) +42
      {fi-bsw-kefka}:     PASS -> FAIL (fdo#100368)

    {igt@kms_psr@primary_page_flip}:
      {fi-icl-u}:         NOTRUN -> DMESG-FAIL (fdo#107335) +3

    
    ==== Possible fixes ====

    igt@debugfs_test@read_all_entries:
      fi-snb-2520m:       INCOMPLETE (fdo#103713) -> PASS

    igt@kms_pipe_crc_basic@read-crc-pipe-b:
      fi-glk-j4005:       DMESG-WARN (fdo#106097) -> PASS

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

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

  fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
  fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
  fdo#105719 https://bugs.freedesktop.org/show_bug.cgi?id=105719
  fdo#106097 https://bugs.freedesktop.org/show_bug.cgi?id=106097
  fdo#107335 https://bugs.freedesktop.org/show_bug.cgi?id=107335
  fdo#107338 https://bugs.freedesktop.org/show_bug.cgi?id=107338
  fdo#107372 https://bugs.freedesktop.org/show_bug.cgi?id=107372


== Participating hosts (51 -> 46) ==

  Additional (1): fi-icl-u 
  Missing    (6): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper 


== Build changes ==

    * IGT: IGT_4573 -> IGTPW_1644

  CI_DRM_4539: 764eb9fdd5683545c98da3e1c144824519306876 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_1644: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1644/
  IGT_4573: 2884f91dd6d7682ea738ef6f0943cc591643dda2 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools

== Logs ==

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

[igt-dev] ✓ Fi.CI.IGT: success for tests/kms_force_connector_basic: Verify planes are restored after load detection (rev2)

[Patchwork]

== Series Details ==

Series: tests/kms_force_connector_basic: Verify planes are restored after load detection (rev2)
URL   : https://patchwork.freedesktop.org/series/40209/
State : success

== Summary ==

= CI Bug Log - changes from IGT_4573_full -> IGTPW_1644_full =

== Summary - WARNING ==

  Minor unknown changes coming with IGTPW_1644_full need to be verified
  manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in IGTPW_1644_full, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

  External URL: https://patchwork.freedesktop.org/api/1.0/series/40209/revisions/2/mbox/

== Possible new issues ==

  Here are the unknown changes that may have been introduced in IGTPW_1644_full:

  === IGT changes ===

    ==== Warnings ====

    igt@gem_mocs_settings@mocs-rc6-vebox:
      shard-kbl:          SKIP -> PASS +1

    igt@perf_pmu@rc6:
      shard-kbl:          PASS -> SKIP

    
== Known issues ==

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

  === IGT changes ===

    ==== Issues hit ====

    igt@drv_suspend@forcewake:
      shard-kbl:          PASS -> INCOMPLETE (fdo#103665) +1

    igt@drv_suspend@shrink:
      shard-snb:          PASS -> INCOMPLETE (fdo#105411, fdo#106886)

    igt@gem_ppgtt@blt-vs-render-ctxn:
      shard-kbl:          PASS -> INCOMPLETE (fdo#103665, fdo#106023)

    igt@kms_available_modes_crc@available_mode_test_crc:
      shard-snb:          PASS -> FAIL (fdo#106641)

    igt@kms_cursor_legacy@2x-long-nonblocking-modeset-vs-cursor-atomic:
      shard-glk:          NOTRUN -> FAIL (fdo#106509, fdo#105454)

    igt@kms_cursor_legacy@pipe-c-torture-bo:
      shard-apl:          PASS -> DMESG-WARN (fdo#107122)
      shard-glk:          PASS -> DMESG-WARN (fdo#107122)
      shard-hsw:          PASS -> DMESG-WARN (fdo#107122)

    igt@kms_draw_crc@draw-method-rgb565-pwrite-ytiled:
      shard-glk:          PASS -> FAIL (fdo#103184)

    igt@kms_flip@2x-plain-flip-ts-check-interruptible:
      shard-glk:          PASS -> FAIL (fdo#100368)

    igt@kms_plane_multiple@atomic-pipe-a-tiling-x:
      shard-snb:          PASS -> FAIL (fdo#103166)

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

    igt@kms_sysfs_edid_timing:
      shard-glk:          NOTRUN -> WARN (fdo#100047)

    igt@pm_rpm@system-suspend:
      shard-glk:          NOTRUN -> FAIL (fdo#103375)

    
    ==== Possible fixes ====

    igt@gem_eio@in-flight-contexts-10ms:
      shard-snb:          FAIL -> PASS

    igt@gem_ppgtt@blt-vs-render-ctx0:
      shard-kbl:          INCOMPLETE (fdo#103665, fdo#106023) -> PASS

    igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
      shard-glk:          FAIL (fdo#102887) -> PASS

    igt@kms_flip@2x-plain-flip-fb-recreate:
      shard-glk:          FAIL (fdo#100368) -> PASS

    igt@perf@blocking:
      shard-hsw:          FAIL (fdo#102252) -> PASS +1

    igt@perf@gen8-unprivileged-single-ctx-counters:
      shard-kbl:          INCOMPLETE (fdo#103665) -> PASS

    
  fdo#100047 https://bugs.freedesktop.org/show_bug.cgi?id=100047
  fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
  fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
  fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
  fdo#103166 https://bugs.freedesktop.org/show_bug.cgi?id=103166
  fdo#103184 https://bugs.freedesktop.org/show_bug.cgi?id=103184
  fdo#103375 https://bugs.freedesktop.org/show_bug.cgi?id=103375
  fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
  fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411
  fdo#105454 https://bugs.freedesktop.org/show_bug.cgi?id=105454
  fdo#106023 https://bugs.freedesktop.org/show_bug.cgi?id=106023
  fdo#106509 https://bugs.freedesktop.org/show_bug.cgi?id=106509
  fdo#106641 https://bugs.freedesktop.org/show_bug.cgi?id=106641
  fdo#106886 https://bugs.freedesktop.org/show_bug.cgi?id=106886
  fdo#107122 https://bugs.freedesktop.org/show_bug.cgi?id=107122
  fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912


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

  No changes in participating hosts


== Build changes ==

    * IGT: IGT_4573 -> IGTPW_1644
    * Linux: CI_DRM_4534 -> CI_DRM_4539

  CI_DRM_4534: a59bbda34ede6f5685fdc86b58f143bada751617 @ git://anongit.freedesktop.org/gfx-ci/linux
  CI_DRM_4539: 764eb9fdd5683545c98da3e1c144824519306876 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_1644: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1644/
  IGT_4573: 2884f91dd6d7682ea738ef6f0943cc591643dda2 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools

== Logs ==

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

Re: [igt-dev] [PATCH i-g-t] tests/kms_force_connector_basic: Verify planes are restored after load detection, v2.

[Maarten Lankhorst]

Op 21-03-18 om 15:22 schreef Ville Syrjälä:
> On Mon, Mar 19, 2018 at 06:02:45PM +0100, Maarten Lankhorst wrote:
>> There's a bug in our load detection in which we don't correctly
>> restore planes to their previous states. Strictly verify this
>> is the case by setting a fb on all planes.
>>
>> Changes since v1:
>> - Remove igt_assert(found) in verification, would always fail.
>>
>> Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
>> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
>> ---
>>  tests/kms_force_connector_basic.c | 61 +++++++++++++++++++++++++++++++++++++++
>>  1 file changed, 61 insertions(+)
>>
>> diff --git a/tests/kms_force_connector_basic.c b/tests/kms_force_connector_basic.c
>> index d11a775a089d..26e5d01fc2cf 100644
>> --- a/tests/kms_force_connector_basic.c
>> +++ b/tests/kms_force_connector_basic.c
>> @@ -122,6 +122,14 @@ int main(int argc, char **argv)
>>  	}
>>  
>>  	igt_subtest("force-load-detect") {
>> +		int i, j, w = 64, h = 64;
>> +		drmModePlaneRes *plane_resources;
>> +		struct igt_fb xrgb_fb, argb_fb;
>> +
>> +		igt_create_fb(drm_fd, w, h, DRM_FORMAT_XRGB8888, 0, &xrgb_fb);
>> +		igt_create_fb(drm_fd, w, h, DRM_FORMAT_ARGB8888, 0, &argb_fb);
>> +		igt_assert(drmSetClientCap(drm_fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1) == 0);
>> +
>>  		/*
>>  		 * disable all outputs to make sure we have a
>>  		 * free crtc available for load detect
>> @@ -131,6 +139,42 @@ int main(int argc, char **argv)
>>  
>>  		igt_set_module_param_int("load_detect_test", 1);
>>  
>> +		plane_resources = drmModeGetPlaneResources(drm_fd);
>> +		igt_assert(plane_resources);
>> +
>> +		for (i = 0; i < plane_resources->count_planes; i++) {
>> +			drmModePlane *drm_plane;
>> +			bool found = false;
>> +			uint32_t plane_id = plane_resources->planes[i];
>> +
>> +			drm_plane = drmModeGetPlane(drm_fd, plane_id);
>> +			igt_assert(drm_plane);
>> +
>> +			for (j = 0; j < drm_plane->count_formats; j++) {
>> +				uint32_t format = drm_plane->formats[j];
>> +				uint32_t crtc = ffs(drm_plane->possible_crtcs) - 1;
>> +				uint32_t crtc_id = res->crtcs[crtc];
>> +
>> +				if (format == DRM_FORMAT_XRGB8888)
>> +					do_or_die(drmModeSetPlane(drm_fd, plane_id, crtc_id,
>> +							xrgb_fb.fb_id,
>> +							0, 0, 0, w, h,
>> +							0, 0, IGT_FIXED(w, 0), IGT_FIXED(h, 0)));
>> +				else if (format == DRM_FORMAT_ARGB8888)
>> +					do_or_die(drmModeSetPlane(drm_fd, plane_id, crtc_id,
>> +							argb_fb.fb_id,
>> +							0, 0, 0, w, h,
>> +							0, 0, IGT_FIXED(w, 0), IGT_FIXED(h, 0)));
>> +				else
>> +					continue;
>> +
>> +				found = true;
>> +				break;
>> +			}
>> +			drmModeFreePlane(drm_plane);
>> +			igt_assert(found);
>> +		}
>> +
>>  		/* This can't use drmModeGetConnectorCurrent
>>  		 * because connector probing is the point of this test.
>>  		 */
>> @@ -141,6 +185,23 @@ int main(int argc, char **argv)
>>  		igt_assert(temp->connection != DRM_MODE_UNKNOWNCONNECTION);
>>  
>>  		drmModeFreeConnector(temp);
>> +
>> +		/* Look if planes are unmodified. */
>> +		for (i = 0; i < plane_resources->count_planes; i++) {
>> +			drmModePlane *drm_plane;
>> +
>> +			drm_plane = drmModeGetPlane(drm_fd,
>> +						    plane_resources->planes[i]);
>> +			igt_assert(drm_plane);
>> +
>> +			igt_assert(drm_plane->crtc_id);
>> +			igt_assert(drm_plane->fb_id);
>> +
>> +			if (drm_plane->fb_id != xrgb_fb.fb_id)
>> +				igt_assert_eq(drm_plane->fb_id, argb_fb.fb_id);
> Maybe just 'igt_assert(fb_id == a || fb_id == b)'?
>
> Either way this is
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Now we just need to get the leak fixes to the kernel.
>
>> +
>> +			drmModeFreePlane(drm_plane);
>> +		}
>>  	}
>>  
>>  	igt_subtest("force-connector-state") {
>> -- 
>> 2.16.2

Finally pushed, thanks. :)

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev