All of lore.kernel.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH i-g-t] kms_plane_alpha_blend: Start CRC after enabling display.
@ 2018-10-03  9:13 Maarten Lankhorst
  2018-10-03  9:42 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Maarten Lankhorst @ 2018-10-03  9:13 UTC (permalink / raw)
  To: igt-dev

This will fix the -EIO from trying to start CRC on a disabled pipe.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108147
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
 tests/kms_plane_alpha_blend.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/tests/kms_plane_alpha_blend.c b/tests/kms_plane_alpha_blend.c
index 81c8cb916a63..3fab118ae0e1 100644
--- a/tests/kms_plane_alpha_blend.c
+++ b/tests/kms_plane_alpha_blend.c
@@ -266,8 +266,9 @@ static void basic_alpha(data_t *data, enum pipe pipe, igt_plane_t *plane)
 	igt_display_commit2(display, COMMIT_ATOMIC);
 
 	igt_pipe_crc_get_current(display->drm_fd, data->pipe_crc, &crc);
-	igt_pipe_crc_stop(data->pipe_crc);
 	igt_assert_crc_equal(&ref_crc, &crc);
+
+	igt_pipe_crc_stop(data->pipe_crc);
 }
 
 static void argb_opaque(data_t *data, enum pipe pipe, igt_plane_t *plane)
@@ -390,6 +391,7 @@ static void alpha_7efc(data_t *data, enum pipe pipe, igt_plane_t *plane)
 	if (plane->type != DRM_PLANE_TYPE_PRIMARY)
 		igt_plane_set_fb(igt_pipe_get_plane_type(&display->pipes[pipe], DRM_PLANE_TYPE_PRIMARY), &data->gray_fb);
 
+	igt_display_commit2(display, COMMIT_ATOMIC);
 	igt_pipe_crc_start(data->pipe_crc);
 
 	/* for coverage, plane alpha and fb alpha should be swappable, so swap fb and alpha */
@@ -407,6 +409,8 @@ static void alpha_7efc(data_t *data, enum pipe pipe, igt_plane_t *plane)
 		igt_pipe_crc_get_current(display->drm_fd, data->pipe_crc, &crc);
 		igt_assert_crc_equal(&ref_crc, &crc);
 	}
+
+	igt_pipe_crc_stop(data->pipe_crc);
 }
 
 static void coverage_7efc(data_t *data, enum pipe pipe, igt_plane_t *plane)
@@ -416,6 +420,7 @@ static void coverage_7efc(data_t *data, enum pipe pipe, igt_plane_t *plane)
 	int i;
 
 	igt_plane_set_prop_enum(plane, IGT_PLANE_PIXEL_BLEND_MODE, "Coverage");
+	igt_display_commit2(display, COMMIT_ATOMIC);
 	igt_pipe_crc_start(data->pipe_crc);
 
 	/* for coverage, plane alpha and fb alpha should be swappable, so swap fb and alpha */
@@ -433,6 +438,8 @@ static void coverage_7efc(data_t *data, enum pipe pipe, igt_plane_t *plane)
 		igt_pipe_crc_get_current(display->drm_fd, data->pipe_crc, &crc);
 		igt_assert_crc_equal(&ref_crc, &crc);
 	}
+
+	igt_pipe_crc_stop(data->pipe_crc);
 }
 
 static void coverage_premult_constant(data_t *data, enum pipe pipe, igt_plane_t *plane)
@@ -462,6 +469,8 @@ static void coverage_premult_constant(data_t *data, enum pipe pipe, igt_plane_t
 	igt_display_commit2(display, COMMIT_ATOMIC);
 	igt_pipe_crc_get_current(display->drm_fd, data->pipe_crc, &crc);
 	igt_assert_crc_equal(&ref_crc, &crc);
+
+	igt_pipe_crc_stop(data->pipe_crc);
 }
 
 static void run_test_on_pipe_planes(data_t *data, enum pipe pipe, bool blend,
@@ -554,8 +563,6 @@ igt_main
 	enum pipe pipe;
 
 	igt_fixture {
-		igt_skip_on_simulation();
-
 		data.gfx_fd = drm_open_driver(DRIVER_ANY);
 		igt_require_pipe_crc(data.gfx_fd);
 		igt_display_init(&data.display, data.gfx_fd);
-- 
2.19.0

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

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [igt-dev] ✓ Fi.CI.BAT: success for kms_plane_alpha_blend: Start CRC after enabling display.
  2018-10-03  9:13 [igt-dev] [PATCH i-g-t] kms_plane_alpha_blend: Start CRC after enabling display Maarten Lankhorst
@ 2018-10-03  9:42 ` Patchwork
  2018-10-03 14:20 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
  2018-10-19 14:31 ` [igt-dev] [PATCH i-g-t] " Imre Deak
  2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2018-10-03  9:42 UTC (permalink / raw)
  To: Maarten Lankhorst; +Cc: igt-dev

== Series Details ==

Series: kms_plane_alpha_blend: Start CRC after enabling display.
URL   : https://patchwork.freedesktop.org/series/50486/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4918 -> IGTPW_1898 =

== Summary - WARNING ==

  Minor unknown changes coming with IGTPW_1898 need to be verified
  manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in IGTPW_1898, 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/50486/revisions/1/mbox/

== Possible new issues ==

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

  === IGT changes ===

    ==== Warnings ====

    igt@pm_rpm@module-reload:
      fi-hsw-4770r:       PASS -> SKIP

    
== Known issues ==

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

  === IGT changes ===

    ==== Issues hit ====

    igt@drv_module_reload@basic-reload-inject:
      fi-hsw-4770r:       PASS -> DMESG-WARN (fdo#107924, fdo#107425)

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

    
  fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
  fdo#107425 https://bugs.freedesktop.org/show_bug.cgi?id=107425
  fdo#107924 https://bugs.freedesktop.org/show_bug.cgi?id=107924


== Participating hosts (48 -> 45) ==

  Additional (1): fi-cfl-guc 
  Missing    (4): fi-bsw-cyan fi-byt-squawks fi-icl-u2 fi-hsw-4200u 


== Build changes ==

    * IGT: IGT_4662 -> IGTPW_1898

  CI_DRM_4918: f595aba3a6e2f6972bb158eb8434b58d22d0e5f0 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_1898: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1898/
  IGT_4662: ebf6a1dd1795e2f014ff3c47fe2eb4d5255845bd @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools

== Logs ==

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [igt-dev] ✗ Fi.CI.IGT: failure for kms_plane_alpha_blend: Start CRC after enabling display.
  2018-10-03  9:13 [igt-dev] [PATCH i-g-t] kms_plane_alpha_blend: Start CRC after enabling display Maarten Lankhorst
  2018-10-03  9:42 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
@ 2018-10-03 14:20 ` Patchwork
  2018-10-19 14:31 ` [igt-dev] [PATCH i-g-t] " Imre Deak
  2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2018-10-03 14:20 UTC (permalink / raw)
  To: Maarten Lankhorst; +Cc: igt-dev

== Series Details ==

Series: kms_plane_alpha_blend: Start CRC after enabling display.
URL   : https://patchwork.freedesktop.org/series/50486/
State : failure

== Summary ==

= CI Bug Log - changes from IGT_4662_full -> IGTPW_1898_full =

== Summary - FAILURE ==

  Serious unknown changes coming with IGTPW_1898_full absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in IGTPW_1898_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/50486/revisions/1/mbox/

== Possible new issues ==

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

  === IGT changes ===

    ==== Possible regressions ====

    igt@kms_color@pipe-b-degamma:
      shard-kbl:          PASS -> FAIL
      shard-apl:          PASS -> FAIL

    
== Known issues ==

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

  === IGT changes ===

    ==== Issues hit ====

    igt@gem_exec_big:
      shard-hsw:          PASS -> TIMEOUT (fdo#107937)

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

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

    igt@kms_busy@extended-modeset-hang-newfb-render-a:
      shard-glk:          NOTRUN -> DMESG-WARN (fdo#107956)

    igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-a:
      shard-snb:          NOTRUN -> DMESG-WARN (fdo#107956)

    igt@kms_color@pipe-a-legacy-gamma:
      shard-kbl:          PASS -> FAIL (fdo#108145)
      shard-apl:          PASS -> FAIL (fdo#108145)

    igt@kms_cursor_crc@cursor-256x256-random:
      shard-glk:          PASS -> FAIL (fdo#103232) +5
      shard-apl:          PASS -> FAIL (fdo#103232) +8

    igt@kms_cursor_crc@cursor-64x64-dpms:
      shard-kbl:          PASS -> FAIL (fdo#103232) +1

    igt@kms_cursor_crc@cursor-64x64-suspend:
      shard-apl:          PASS -> FAIL (fdo#103191, fdo#103232)

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

    igt@kms_draw_crc@draw-method-xrgb2101010-mmap-cpu-xtiled:
      shard-glk:          PASS -> FAIL (fdo#103184)

    igt@kms_flip@flip-vs-modeset-vs-hang:
      shard-apl:          PASS -> DMESG-WARN (fdo#105602, fdo#103558) +5

    igt@kms_flip_tiling@flip-to-x-tiled:
      shard-glk:          PASS -> INCOMPLETE (k.org#198133, fdo#103359)

    igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-pwrite:
      shard-apl:          PASS -> FAIL (fdo#103167) +3

    igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt:
      shard-glk:          PASS -> FAIL (fdo#103167) +3

    igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-fullscreen:
      shard-glk:          NOTRUN -> FAIL (fdo#103167)

    igt@kms_frontbuffer_tracking@fbc-2p-rte:
      shard-glk:          NOTRUN -> FAIL (fdo#105682, fdo#103167)

    igt@kms_plane@plane-position-covered-pipe-b-planes:
      shard-glk:          PASS -> FAIL (fdo#103166) +2

    igt@kms_plane@plane-position-covered-pipe-c-planes:
      shard-apl:          PASS -> FAIL (fdo#103166) +3

    igt@kms_plane_multiple@atomic-pipe-c-tiling-yf:
      shard-kbl:          PASS -> FAIL (fdo#103166) +1

    
    ==== Possible fixes ====

    igt@gem_pwrite@big-gtt-fbr:
      shard-snb:          INCOMPLETE (fdo#105411) -> PASS

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

    igt@kms_color@pipe-a-degamma:
      shard-apl:          FAIL (fdo#108145) -> PASS

    igt@kms_cursor_crc@cursor-128x128-suspend:
      shard-glk:          FAIL (fdo#103232) -> PASS +2
      shard-apl:          FAIL (fdo#103191, fdo#103232) -> PASS

    igt@kms_cursor_crc@cursor-128x42-onscreen:
      shard-apl:          FAIL (fdo#103232) -> PASS +1

    igt@kms_cursor_crc@cursor-64x21-onscreen:
      shard-kbl:          FAIL (fdo#103232) -> PASS +1

    igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-blt:
      shard-glk:          FAIL (fdo#103167) -> PASS +2

    igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite:
      shard-apl:          FAIL (fdo#103167) -> PASS +1
      shard-kbl:          FAIL (fdo#103167) -> PASS

    igt@kms_plane@plane-position-covered-pipe-c-planes:
      shard-glk:          FAIL (fdo#103166) -> PASS

    {igt@kms_plane_alpha_blend@pipe-b-constant-alpha-max}:
      shard-glk:          FAIL (fdo#108145) -> PASS +2

    {igt@kms_plane_alpha_blend@pipe-c-coverage-7efc}:
      shard-kbl:          FAIL (fdo#108146) -> PASS +1
      shard-apl:          FAIL (fdo#108146) -> PASS +1
      shard-glk:          FAIL (fdo#108146) -> PASS

    igt@kms_plane_multiple@atomic-pipe-a-tiling-y:
      shard-apl:          FAIL (fdo#103166) -> PASS +1

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

    
    ==== Warnings ====

    igt@kms_cursor_crc@cursor-128x128-suspend:
      shard-kbl:          FAIL (fdo#103191, fdo#103232) -> INCOMPLETE (fdo#103665)

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

  fdo#103166 https://bugs.freedesktop.org/show_bug.cgi?id=103166
  fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
  fdo#103184 https://bugs.freedesktop.org/show_bug.cgi?id=103184
  fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
  fdo#103232 https://bugs.freedesktop.org/show_bug.cgi?id=103232
  fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359
  fdo#103558 https://bugs.freedesktop.org/show_bug.cgi?id=103558
  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#105602 https://bugs.freedesktop.org/show_bug.cgi?id=105602
  fdo#105682 https://bugs.freedesktop.org/show_bug.cgi?id=105682
  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#107807 https://bugs.freedesktop.org/show_bug.cgi?id=107807
  fdo#107937 https://bugs.freedesktop.org/show_bug.cgi?id=107937
  fdo#107956 https://bugs.freedesktop.org/show_bug.cgi?id=107956
  fdo#108145 https://bugs.freedesktop.org/show_bug.cgi?id=108145
  fdo#108146 https://bugs.freedesktop.org/show_bug.cgi?id=108146
  k.org#198133 https://bugzilla.kernel.org/show_bug.cgi?id=198133


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

  Missing    (1): shard-skl 


== Build changes ==

    * IGT: IGT_4662 -> IGTPW_1898
    * Linux: CI_DRM_4915 -> CI_DRM_4918

  CI_DRM_4915: 26e7a7d954a9c28b97af8ca7813f430fd9117232 @ git://anongit.freedesktop.org/gfx-ci/linux
  CI_DRM_4918: f595aba3a6e2f6972bb158eb8434b58d22d0e5f0 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_1898: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1898/
  IGT_4662: ebf6a1dd1795e2f014ff3c47fe2eb4d5255845bd @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools

== Logs ==

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [igt-dev] [PATCH i-g-t] kms_plane_alpha_blend: Start CRC after enabling display.
  2018-10-03  9:13 [igt-dev] [PATCH i-g-t] kms_plane_alpha_blend: Start CRC after enabling display Maarten Lankhorst
  2018-10-03  9:42 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
  2018-10-03 14:20 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
@ 2018-10-19 14:31 ` Imre Deak
  2018-10-26 13:19   ` Maarten Lankhorst
  2 siblings, 1 reply; 5+ messages in thread
From: Imre Deak @ 2018-10-19 14:31 UTC (permalink / raw)
  To: Maarten Lankhorst; +Cc: igt-dev

On Wed, Oct 03, 2018 at 11:13:41AM +0200, Maarten Lankhorst wrote:
> This will fix the -EIO from trying to start CRC on a disabled pipe.
> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108147
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> ---
>  tests/kms_plane_alpha_blend.c | 13 ++++++++++---
>  1 file changed, 10 insertions(+), 3 deletions(-)
> 
> diff --git a/tests/kms_plane_alpha_blend.c b/tests/kms_plane_alpha_blend.c
> index 81c8cb916a63..3fab118ae0e1 100644
> --- a/tests/kms_plane_alpha_blend.c
> +++ b/tests/kms_plane_alpha_blend.c
> @@ -266,8 +266,9 @@ static void basic_alpha(data_t *data, enum pipe pipe, igt_plane_t *plane)
>  	igt_display_commit2(display, COMMIT_ATOMIC);
>  
>  	igt_pipe_crc_get_current(display->drm_fd, data->pipe_crc, &crc);
> -	igt_pipe_crc_stop(data->pipe_crc);
>  	igt_assert_crc_equal(&ref_crc, &crc);
> +
> +	igt_pipe_crc_stop(data->pipe_crc);

Unrelated to this patch, but noticed that argb_fb_0 is an opaque FB
which wasn't intended? The test happens to pass just because argb_fb_0
is black, so maybe that should be changed too.

>  }
>  
>  static void argb_opaque(data_t *data, enum pipe pipe, igt_plane_t *plane)
> @@ -390,6 +391,7 @@ static void alpha_7efc(data_t *data, enum pipe pipe, igt_plane_t *plane)
>  	if (plane->type != DRM_PLANE_TYPE_PRIMARY)
>  		igt_plane_set_fb(igt_pipe_get_plane_type(&display->pipes[pipe], DRM_PLANE_TYPE_PRIMARY), &data->gray_fb);
>  
> +	igt_display_commit2(display, COMMIT_ATOMIC);
>  	igt_pipe_crc_start(data->pipe_crc);
>  
>  	/* for coverage, plane alpha and fb alpha should be swappable, so swap fb and alpha */
> @@ -407,6 +409,8 @@ static void alpha_7efc(data_t *data, enum pipe pipe, igt_plane_t *plane)
>  		igt_pipe_crc_get_current(display->drm_fd, data->pipe_crc, &crc);
>  		igt_assert_crc_equal(&ref_crc, &crc);
>  	}
> +
> +	igt_pipe_crc_stop(data->pipe_crc);
>  }
>  
>  static void coverage_7efc(data_t *data, enum pipe pipe, igt_plane_t *plane)
> @@ -416,6 +420,7 @@ static void coverage_7efc(data_t *data, enum pipe pipe, igt_plane_t *plane)
>  	int i;
>  
>  	igt_plane_set_prop_enum(plane, IGT_PLANE_PIXEL_BLEND_MODE, "Coverage");
> +	igt_display_commit2(display, COMMIT_ATOMIC);
>  	igt_pipe_crc_start(data->pipe_crc);
>  
>  	/* for coverage, plane alpha and fb alpha should be swappable, so swap fb and alpha */
> @@ -433,6 +438,8 @@ static void coverage_7efc(data_t *data, enum pipe pipe, igt_plane_t *plane)
>  		igt_pipe_crc_get_current(display->drm_fd, data->pipe_crc, &crc);
>  		igt_assert_crc_equal(&ref_crc, &crc);
>  	}
> +
> +	igt_pipe_crc_stop(data->pipe_crc);
>  }
>  
>  static void coverage_premult_constant(data_t *data, enum pipe pipe, igt_plane_t *plane)
> @@ -462,6 +469,8 @@ static void coverage_premult_constant(data_t *data, enum pipe pipe, igt_plane_t
>  	igt_display_commit2(display, COMMIT_ATOMIC);
>  	igt_pipe_crc_get_current(display->drm_fd, data->pipe_crc, &crc);
>  	igt_assert_crc_equal(&ref_crc, &crc);
> +
> +	igt_pipe_crc_stop(data->pipe_crc);
>  }
>  
>  static void run_test_on_pipe_planes(data_t *data, enum pipe pipe, bool blend,
> @@ -554,8 +563,6 @@ igt_main
>  	enum pipe pipe;
>  
>  	igt_fixture {
> -		igt_skip_on_simulation();
> -

Should've been a separate change.

Looks ok:
Reviewed-by: Imre Deak <imre.deak@intel.com>

>  		data.gfx_fd = drm_open_driver(DRIVER_ANY);
>  		igt_require_pipe_crc(data.gfx_fd);
>  		igt_display_init(&data.display, data.gfx_fd);
> -- 
> 2.19.0
> 
> _______________________________________________
> igt-dev mailing list
> igt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [igt-dev] [PATCH i-g-t] kms_plane_alpha_blend: Start CRC after enabling display.
  2018-10-19 14:31 ` [igt-dev] [PATCH i-g-t] " Imre Deak
@ 2018-10-26 13:19   ` Maarten Lankhorst
  0 siblings, 0 replies; 5+ messages in thread
From: Maarten Lankhorst @ 2018-10-26 13:19 UTC (permalink / raw)
  To: imre.deak; +Cc: igt-dev

Op 19-10-18 om 16:31 schreef Imre Deak:
> On Wed, Oct 03, 2018 at 11:13:41AM +0200, Maarten Lankhorst wrote:
>> This will fix the -EIO from trying to start CRC on a disabled pipe.
>>
>> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108147
>> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
>> ---
>>  tests/kms_plane_alpha_blend.c | 13 ++++++++++---
>>  1 file changed, 10 insertions(+), 3 deletions(-)
>>
>> diff --git a/tests/kms_plane_alpha_blend.c b/tests/kms_plane_alpha_blend.c
>> index 81c8cb916a63..3fab118ae0e1 100644
>> --- a/tests/kms_plane_alpha_blend.c
>> +++ b/tests/kms_plane_alpha_blend.c
>> @@ -266,8 +266,9 @@ static void basic_alpha(data_t *data, enum pipe pipe, igt_plane_t *plane)
>>  	igt_display_commit2(display, COMMIT_ATOMIC);
>>  
>>  	igt_pipe_crc_get_current(display->drm_fd, data->pipe_crc, &crc);
>> -	igt_pipe_crc_stop(data->pipe_crc);
>>  	igt_assert_crc_equal(&ref_crc, &crc);
>> +
>> +	igt_pipe_crc_stop(data->pipe_crc);
> Unrelated to this patch, but noticed that argb_fb_0 is an opaque FB
> which wasn't intended? The test happens to pass just because argb_fb_0
> is black, so maybe that should be changed too.
>
>>  }
>>  
>>  static void argb_opaque(data_t *data, enum pipe pipe, igt_plane_t *plane)
>> @@ -390,6 +391,7 @@ static void alpha_7efc(data_t *data, enum pipe pipe, igt_plane_t *plane)
>>  	if (plane->type != DRM_PLANE_TYPE_PRIMARY)
>>  		igt_plane_set_fb(igt_pipe_get_plane_type(&display->pipes[pipe], DRM_PLANE_TYPE_PRIMARY), &data->gray_fb);
>>  
>> +	igt_display_commit2(display, COMMIT_ATOMIC);
>>  	igt_pipe_crc_start(data->pipe_crc);
>>  
>>  	/* for coverage, plane alpha and fb alpha should be swappable, so swap fb and alpha */
>> @@ -407,6 +409,8 @@ static void alpha_7efc(data_t *data, enum pipe pipe, igt_plane_t *plane)
>>  		igt_pipe_crc_get_current(display->drm_fd, data->pipe_crc, &crc);
>>  		igt_assert_crc_equal(&ref_crc, &crc);
>>  	}
>> +
>> +	igt_pipe_crc_stop(data->pipe_crc);
>>  }
>>  
>>  static void coverage_7efc(data_t *data, enum pipe pipe, igt_plane_t *plane)
>> @@ -416,6 +420,7 @@ static void coverage_7efc(data_t *data, enum pipe pipe, igt_plane_t *plane)
>>  	int i;
>>  
>>  	igt_plane_set_prop_enum(plane, IGT_PLANE_PIXEL_BLEND_MODE, "Coverage");
>> +	igt_display_commit2(display, COMMIT_ATOMIC);
>>  	igt_pipe_crc_start(data->pipe_crc);
>>  
>>  	/* for coverage, plane alpha and fb alpha should be swappable, so swap fb and alpha */
>> @@ -433,6 +438,8 @@ static void coverage_7efc(data_t *data, enum pipe pipe, igt_plane_t *plane)
>>  		igt_pipe_crc_get_current(display->drm_fd, data->pipe_crc, &crc);
>>  		igt_assert_crc_equal(&ref_crc, &crc);
>>  	}
>> +
>> +	igt_pipe_crc_stop(data->pipe_crc);
>>  }
>>  
>>  static void coverage_premult_constant(data_t *data, enum pipe pipe, igt_plane_t *plane)
>> @@ -462,6 +469,8 @@ static void coverage_premult_constant(data_t *data, enum pipe pipe, igt_plane_t
>>  	igt_display_commit2(display, COMMIT_ATOMIC);
>>  	igt_pipe_crc_get_current(display->drm_fd, data->pipe_crc, &crc);
>>  	igt_assert_crc_equal(&ref_crc, &crc);
>> +
>> +	igt_pipe_crc_stop(data->pipe_crc);
>>  }
>>  
>>  static void run_test_on_pipe_planes(data_t *data, enum pipe pipe, bool blend,
>> @@ -554,8 +563,6 @@ igt_main
>>  	enum pipe pipe;
>>  
>>  	igt_fixture {
>> -		igt_skip_on_simulation();
>> -
> Should've been a separate change.
>
> Looks ok:
> Reviewed-by: Imre Deak <imre.deak@intel.com>
Thanks, pushed. :)
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2018-10-26 13:19 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-03  9:13 [igt-dev] [PATCH i-g-t] kms_plane_alpha_blend: Start CRC after enabling display Maarten Lankhorst
2018-10-03  9:42 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2018-10-03 14:20 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2018-10-19 14:31 ` [igt-dev] [PATCH i-g-t] " Imre Deak
2018-10-26 13:19   ` Maarten Lankhorst

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.