All of lore.kernel.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH] tests/kms_color: Change in commit style from legacy to atomic
@ 2019-03-29  6:50 Swati Sharma
  2019-03-29  7:47 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Swati Sharma @ 2019-03-29  6:50 UTC (permalink / raw)
  To: igt-dev; +Cc: jani.nikula

Existing kms_color i-g-t, commit style by default is legacy for
all the ctm/gamma/degamma subtests.

In this patch, legacy commit is changed to atomic (since i915
no longer supports legacy commit)

v1: As per Daniel's comments switching over to atomic.
v2: As per Maarten's comments did COMMIT_ATOMIC, and added
    igt_require(display.is_atomic)
v3: Fixed stupid mistake, now test cases are not getting skipped

Need Feedback?
Still there are few functions like pipe_set_property_blob_id,
pipe_set_property_blob, invalid_lut_sizes where provision of
both legacy and atomic is there. Should I change them too to
atomic only like I did for other func?

Also, this patch is floating since ages, it will be nice if
I can have a closure(=>rb) on this and move forward :)

Signed-off-by: Swati Sharma <swati2.sharma@intel.com>
---
 tests/kms_color.c | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/tests/kms_color.c b/tests/kms_color.c
index decf3c2..92f5c12 100644
--- a/tests/kms_color.c
+++ b/tests/kms_color.c
@@ -63,7 +63,6 @@ typedef struct {
 	uint64_t gamma_lut_size;
 } data_t;
 
-
 static void paint_gradient_rectangles(data_t *data,
 				      drmModeModeInfo *mode,
 				      color_t *colors,
@@ -311,12 +310,12 @@ static void test_pipe_degamma(data_t *data,
 		disable_ctm(primary->pipe);
 		disable_degamma(primary->pipe);
 		set_gamma(data, primary->pipe, gamma_linear);
-		igt_display_commit(&data->display);
+		igt_display_commit2(&data->display, COMMIT_ATOMIC);
 
 		/* Draw solid colors with no degamma transformation. */
 		paint_rectangles(data, mode, red_green_blue, &fb);
 		igt_plane_set_fb(primary, &fb);
-		igt_display_commit(&data->display);
+		igt_display_commit2(&data->display, COMMIT_ATOMIC);
 		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
 		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullcolors);
 
@@ -326,7 +325,7 @@ static void test_pipe_degamma(data_t *data,
 		paint_gradient_rectangles(data, mode, red_green_blue, &fb);
 		igt_plane_set_fb(primary, &fb);
 		set_degamma(data, primary->pipe, degamma_full);
-		igt_display_commit(&data->display);
+		igt_display_commit2(&data->display, COMMIT_ATOMIC);
 		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
 		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullgamma);
 
@@ -391,12 +390,12 @@ static void test_pipe_gamma(data_t *data,
 		disable_ctm(primary->pipe);
 		disable_degamma(primary->pipe);
 		set_gamma(data, primary->pipe, gamma_full);
-		igt_display_commit(&data->display);
+		igt_display_commit2(&data->display, COMMIT_ATOMIC);
 
 		/* Draw solid colors with no gamma transformation. */
 		paint_rectangles(data, mode, red_green_blue, &fb);
 		igt_plane_set_fb(primary, &fb);
-		igt_display_commit(&data->display);
+		igt_display_commit2(&data->display, COMMIT_ATOMIC);
 		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
 		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullcolors);
 
@@ -405,7 +404,7 @@ static void test_pipe_gamma(data_t *data,
 		 */
 		paint_gradient_rectangles(data, mode, red_green_blue, &fb);
 		igt_plane_set_fb(primary, &fb);
-		igt_display_commit(&data->display);
+		igt_display_commit2(&data->display, COMMIT_ATOMIC);
 		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
 		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullgamma);
 
@@ -477,12 +476,12 @@ static void test_pipe_legacy_gamma(data_t *data,
 		disable_degamma(primary->pipe);
 		disable_gamma(primary->pipe);
 		disable_ctm(primary->pipe);
-		igt_display_commit(&data->display);
+		igt_display_commit2(&data->display, COMMIT_ATOMIC);
 
 		/* Draw solid colors with no gamma transformation. */
 		paint_rectangles(data, mode, red_green_blue, &fb);
 		igt_plane_set_fb(primary, &fb);
-		igt_display_commit(&data->display);
+		igt_display_commit2(&data->display, COMMIT_ATOMIC);
 		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
 		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullcolors);
 
@@ -497,7 +496,7 @@ static void test_pipe_legacy_gamma(data_t *data,
 			red_lut[i] = green_lut[i] = blue_lut[i] = 0xffff;
 		igt_assert_eq(drmModeCrtcSetGamma(data->drm_fd, primary->pipe->crtc_id,
 						  legacy_lut_size, red_lut, green_lut, blue_lut), 0);
-		igt_display_commit(&data->display);
+		igt_display_commit2(&data->display, COMMIT_ATOMIC);
 		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
 		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullgamma);
 
@@ -512,7 +511,7 @@ static void test_pipe_legacy_gamma(data_t *data,
 
 		igt_assert_eq(drmModeCrtcSetGamma(data->drm_fd, primary->pipe->crtc_id,
 						  legacy_lut_size, red_lut, green_lut, blue_lut), 0);
-		igt_display_commit(&data->display);
+		igt_display_commit2(&data->display, COMMIT_ATOMIC);
 
 		igt_plane_set_fb(primary, NULL);
 		igt_output_set_pipe(output, PIPE_NONE);
@@ -566,7 +565,7 @@ static void test_pipe_legacy_gamma_reset(data_t *data,
 		disable_degamma(primary->pipe);
 		disable_ctm(primary->pipe);
 		disable_gamma(primary->pipe);
-		igt_display_commit(&data->display);
+		igt_display_commit2(&data->display, COMMIT_ATOMIC);
 
 		/* Set a degama & gamma LUT and a CTM using the
 		 * properties and verify the content of the
@@ -574,7 +573,7 @@ static void test_pipe_legacy_gamma_reset(data_t *data,
 		set_degamma(data, primary->pipe, degamma_linear);
 		set_ctm(primary->pipe, ctm_identity);
 		set_gamma(data, primary->pipe, gamma_zero);
-		igt_display_commit(&data->display);
+		igt_display_commit2(&data->display, COMMIT_ATOMIC);
 
 		blob = get_blob(data, primary->pipe, IGT_CRTC_DEGAMMA_LUT);
 		igt_assert(blob &&
@@ -617,7 +616,7 @@ static void test_pipe_legacy_gamma_reset(data_t *data,
 						  legacy_lut_size,
 						  red_lut, green_lut, blue_lut),
 			      0);
-		igt_display_commit(&data->display);
+		igt_display_commit2(&data->display, COMMIT_ATOMIC);
 
 		igt_assert(get_blob(data, primary->pipe,
 				    IGT_CRTC_DEGAMMA_LUT) == NULL);
@@ -699,12 +698,12 @@ static bool test_pipe_ctm(data_t *data,
 		set_degamma(data, primary->pipe, degamma_linear);
 		set_gamma(data, primary->pipe, gamma_linear);
 		disable_ctm(primary->pipe);
-		igt_display_commit(&data->display);
+		igt_display_commit2(&data->display, COMMIT_ATOMIC);
 
 		paint_rectangles(data, mode, after, &fb);
 		igt_plane_set_fb(primary, &fb);
 		set_ctm(primary->pipe, ctm_identity);
-		igt_display_commit(&data->display);
+		igt_display_commit2(&data->display, COMMIT_ATOMIC);
 		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
 		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_software);
 
@@ -712,7 +711,7 @@ static bool test_pipe_ctm(data_t *data,
 		paint_rectangles(data, mode, before, &fb);
 		igt_plane_set_fb(primary, &fb);
 		set_ctm(primary->pipe, ctm_matrix);
-		igt_display_commit(&data->display);
+		igt_display_commit2(&data->display, COMMIT_ATOMIC);
 		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
 		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_hardware);
 
@@ -807,7 +806,7 @@ static void test_pipe_limited_range_ctm(data_t *data,
 		igt_output_set_prop_value(output, IGT_CONNECTOR_BROADCAST_RGB, BROADCAST_RGB_FULL);
 		paint_rectangles(data, mode, red_green_blue_limited, &fb);
 		igt_plane_set_fb(primary, &fb);
-		igt_display_commit(&data->display);
+		igt_display_commit2(&data->display, COMMIT_ATOMIC);
 		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
 		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_full);
 
@@ -815,7 +814,7 @@ static void test_pipe_limited_range_ctm(data_t *data,
 		igt_output_set_prop_value(output, IGT_CONNECTOR_BROADCAST_RGB, BROADCAST_RGB_16_235);
 		paint_rectangles(data, mode, red_green_blue_full, &fb);
 		igt_plane_set_fb(primary, &fb);
-		igt_display_commit(&data->display);
+		igt_display_commit2(&data->display, COMMIT_ATOMIC);
 		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
 		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_limited);
 
@@ -1043,7 +1042,7 @@ run_tests_for_pipe(data_t *data, enum pipe p)
 		disable_degamma(primary->pipe);
 		disable_gamma(primary->pipe);
 		disable_ctm(primary->pipe);
-		igt_display_commit(&data->display);
+		igt_display_commit2(&data->display, COMMIT_ATOMIC);
 
 		igt_pipe_crc_free(data->pipe_crc);
 		data->pipe_crc = NULL;
@@ -1085,7 +1084,7 @@ invalid_lut_sizes(data_t *data)
 	struct _drm_color_lut *degamma_lut = malloc(data->degamma_lut_size * sizeof(struct _drm_color_lut) * 2);
 	struct _drm_color_lut *gamma_lut = malloc(data->gamma_lut_size * sizeof(struct _drm_color_lut) * 2);
 
-	igt_display_commit2(display, display->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
+	igt_display_commit2(display, COMMIT_ATOMIC);
 
 	if (igt_pipe_obj_has_prop(pipe, IGT_CRTC_DEGAMMA_LUT)) {
 		igt_assert_eq(pipe_set_property_blob(pipe, IGT_CRTC_DEGAMMA_LUT,
@@ -1173,6 +1172,7 @@ igt_main
 		kmstest_set_vt_graphics_mode();
 
 		igt_display_require(&data.display, data.drm_fd);
+		igt_require(data.display.is_atomic);
 	}
 
 	for_each_pipe_static(pipe)
-- 
1.9.1

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

^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for tests/kms_color: Change in commit style from legacy to atomic
  2019-03-29  6:50 [igt-dev] [PATCH] tests/kms_color: Change in commit style from legacy to atomic Swati Sharma
@ 2019-03-29  7:47 ` Patchwork
  2019-03-29  9:54 ` [igt-dev] [PATCH] " Daniel Vetter
  2019-03-29 12:05 ` [igt-dev] ✓ Fi.CI.IGT: success for " Patchwork
  2 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2019-03-29  7:47 UTC (permalink / raw)
  To: Swati Sharma; +Cc: igt-dev

== Series Details ==

Series: tests/kms_color: Change in commit style from legacy to atomic
URL   : https://patchwork.freedesktop.org/series/58711/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_5835 -> IGTPW_2734
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

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

Known issues
------------

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

### IGT changes ###

#### Issues hit ####

  * igt@gem_exec_suspend@basic-s3:
    - fi-blb-e6850:       PASS -> INCOMPLETE [fdo#107718]

  * igt@i915_selftest@live_execlists:
    - fi-apl-guc:         PASS -> INCOMPLETE [fdo#103927] / [fdo#109720]

  * igt@kms_chamelium@vga-edid-read:
    - fi-skl-6600u:       NOTRUN -> SKIP [fdo#109271] +31

  * igt@kms_frontbuffer_tracking@basic:
    - fi-icl-u2:          PASS -> FAIL [fdo#103167]

  * igt@kms_pipe_crc_basic@read-crc-pipe-b:
    - fi-byt-clapper:     PASS -> FAIL [fdo#107362]

  * igt@runner@aborted:
    - fi-apl-guc:         NOTRUN -> FAIL [fdo#108622] / [fdo#109720]

  
#### Possible fixes ####

  * igt@gem_exec_suspend@basic-s4-devices:
    - fi-skl-6600u:       INCOMPLETE [fdo#104108] / [fdo#107773] -> PASS

  * igt@i915_selftest@live_uncore:
    - fi-ivb-3770:        DMESG-FAIL [fdo#110210] -> PASS

  * igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a-frame-sequence:
    - fi-byt-clapper:     FAIL [fdo#103191] / [fdo#107362] -> PASS

  
  [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
  [fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
  [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
  [fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
  [fdo#107362]: https://bugs.freedesktop.org/show_bug.cgi?id=107362
  [fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
  [fdo#107773]: https://bugs.freedesktop.org/show_bug.cgi?id=107773
  [fdo#108622]: https://bugs.freedesktop.org/show_bug.cgi?id=108622
  [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
  [fdo#109720]: https://bugs.freedesktop.org/show_bug.cgi?id=109720
  [fdo#110210]: https://bugs.freedesktop.org/show_bug.cgi?id=110210


Participating hosts (43 -> 39)
------------------------------

  Missing    (4): fi-kbl-soraka fi-ilk-m540 fi-bsw-cyan fi-bdw-samus 


Build changes
-------------

    * IGT: IGT_4911 -> IGTPW_2734

  CI_DRM_5835: a87cb5da301d892d69d44b106a007caea8386935 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_2734: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2734/
  IGT_4911: d9fe699ea45406e279b78d1afdb4d57a205a3c99 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools

== Logs ==

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

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [igt-dev] [PATCH] tests/kms_color: Change in commit style from legacy to atomic
  2019-03-29  6:50 [igt-dev] [PATCH] tests/kms_color: Change in commit style from legacy to atomic Swati Sharma
  2019-03-29  7:47 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
@ 2019-03-29  9:54 ` Daniel Vetter
  2019-03-29 10:02   ` Sharma, Swati2
  2019-03-29 10:34   ` Ville Syrjälä
  2019-03-29 12:05 ` [igt-dev] ✓ Fi.CI.IGT: success for " Patchwork
  2 siblings, 2 replies; 7+ messages in thread
From: Daniel Vetter @ 2019-03-29  9:54 UTC (permalink / raw)
  To: Swati Sharma; +Cc: jani.nikula, igt-dev

On Fri, Mar 29, 2019 at 12:20:14PM +0530, Swati Sharma wrote:
> Existing kms_color i-g-t, commit style by default is legacy for
> all the ctm/gamma/degamma subtests.
> 
> In this patch, legacy commit is changed to atomic (since i915
> no longer supports legacy commit)
> 
> v1: As per Daniel's comments switching over to atomic.
> v2: As per Maarten's comments did COMMIT_ATOMIC, and added
>     igt_require(display.is_atomic)
> v3: Fixed stupid mistake, now test cases are not getting skipped
> 
> Need Feedback?
> Still there are few functions like pipe_set_property_blob_id,
> pipe_set_property_blob, invalid_lut_sizes where provision of
> both legacy and atomic is there. Should I change them too to
> atomic only like I did for other func?
> 
> Also, this patch is floating since ages, it will be nice if
> I can have a closure(=>rb) on this and move forward :)
> 
> Signed-off-by: Swati Sharma <swati2.sharma@intel.com>

Typed this on jira already months ago, replicating here: The idea is to
add an atomic test (with crc checks every frame and all that) to make sure
lut updates are atomic on screen. Switching to atomic commit style for
everything else just means we can't run this on older drivers anymore (not
that there are many of those left), which seems a bit pointless.
-Daniel

> ---
>  tests/kms_color.c | 42 +++++++++++++++++++++---------------------
>  1 file changed, 21 insertions(+), 21 deletions(-)
> 
> diff --git a/tests/kms_color.c b/tests/kms_color.c
> index decf3c2..92f5c12 100644
> --- a/tests/kms_color.c
> +++ b/tests/kms_color.c
> @@ -63,7 +63,6 @@ typedef struct {
>  	uint64_t gamma_lut_size;
>  } data_t;
>  
> -
>  static void paint_gradient_rectangles(data_t *data,
>  				      drmModeModeInfo *mode,
>  				      color_t *colors,
> @@ -311,12 +310,12 @@ static void test_pipe_degamma(data_t *data,
>  		disable_ctm(primary->pipe);
>  		disable_degamma(primary->pipe);
>  		set_gamma(data, primary->pipe, gamma_linear);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  
>  		/* Draw solid colors with no degamma transformation. */
>  		paint_rectangles(data, mode, red_green_blue, &fb);
>  		igt_plane_set_fb(primary, &fb);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
>  		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullcolors);
>  
> @@ -326,7 +325,7 @@ static void test_pipe_degamma(data_t *data,
>  		paint_gradient_rectangles(data, mode, red_green_blue, &fb);
>  		igt_plane_set_fb(primary, &fb);
>  		set_degamma(data, primary->pipe, degamma_full);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
>  		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullgamma);
>  
> @@ -391,12 +390,12 @@ static void test_pipe_gamma(data_t *data,
>  		disable_ctm(primary->pipe);
>  		disable_degamma(primary->pipe);
>  		set_gamma(data, primary->pipe, gamma_full);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  
>  		/* Draw solid colors with no gamma transformation. */
>  		paint_rectangles(data, mode, red_green_blue, &fb);
>  		igt_plane_set_fb(primary, &fb);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
>  		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullcolors);
>  
> @@ -405,7 +404,7 @@ static void test_pipe_gamma(data_t *data,
>  		 */
>  		paint_gradient_rectangles(data, mode, red_green_blue, &fb);
>  		igt_plane_set_fb(primary, &fb);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
>  		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullgamma);
>  
> @@ -477,12 +476,12 @@ static void test_pipe_legacy_gamma(data_t *data,
>  		disable_degamma(primary->pipe);
>  		disable_gamma(primary->pipe);
>  		disable_ctm(primary->pipe);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  
>  		/* Draw solid colors with no gamma transformation. */
>  		paint_rectangles(data, mode, red_green_blue, &fb);
>  		igt_plane_set_fb(primary, &fb);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
>  		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullcolors);
>  
> @@ -497,7 +496,7 @@ static void test_pipe_legacy_gamma(data_t *data,
>  			red_lut[i] = green_lut[i] = blue_lut[i] = 0xffff;
>  		igt_assert_eq(drmModeCrtcSetGamma(data->drm_fd, primary->pipe->crtc_id,
>  						  legacy_lut_size, red_lut, green_lut, blue_lut), 0);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
>  		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullgamma);
>  
> @@ -512,7 +511,7 @@ static void test_pipe_legacy_gamma(data_t *data,
>  
>  		igt_assert_eq(drmModeCrtcSetGamma(data->drm_fd, primary->pipe->crtc_id,
>  						  legacy_lut_size, red_lut, green_lut, blue_lut), 0);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  
>  		igt_plane_set_fb(primary, NULL);
>  		igt_output_set_pipe(output, PIPE_NONE);
> @@ -566,7 +565,7 @@ static void test_pipe_legacy_gamma_reset(data_t *data,
>  		disable_degamma(primary->pipe);
>  		disable_ctm(primary->pipe);
>  		disable_gamma(primary->pipe);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  
>  		/* Set a degama & gamma LUT and a CTM using the
>  		 * properties and verify the content of the
> @@ -574,7 +573,7 @@ static void test_pipe_legacy_gamma_reset(data_t *data,
>  		set_degamma(data, primary->pipe, degamma_linear);
>  		set_ctm(primary->pipe, ctm_identity);
>  		set_gamma(data, primary->pipe, gamma_zero);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  
>  		blob = get_blob(data, primary->pipe, IGT_CRTC_DEGAMMA_LUT);
>  		igt_assert(blob &&
> @@ -617,7 +616,7 @@ static void test_pipe_legacy_gamma_reset(data_t *data,
>  						  legacy_lut_size,
>  						  red_lut, green_lut, blue_lut),
>  			      0);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  
>  		igt_assert(get_blob(data, primary->pipe,
>  				    IGT_CRTC_DEGAMMA_LUT) == NULL);
> @@ -699,12 +698,12 @@ static bool test_pipe_ctm(data_t *data,
>  		set_degamma(data, primary->pipe, degamma_linear);
>  		set_gamma(data, primary->pipe, gamma_linear);
>  		disable_ctm(primary->pipe);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  
>  		paint_rectangles(data, mode, after, &fb);
>  		igt_plane_set_fb(primary, &fb);
>  		set_ctm(primary->pipe, ctm_identity);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
>  		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_software);
>  
> @@ -712,7 +711,7 @@ static bool test_pipe_ctm(data_t *data,
>  		paint_rectangles(data, mode, before, &fb);
>  		igt_plane_set_fb(primary, &fb);
>  		set_ctm(primary->pipe, ctm_matrix);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
>  		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_hardware);
>  
> @@ -807,7 +806,7 @@ static void test_pipe_limited_range_ctm(data_t *data,
>  		igt_output_set_prop_value(output, IGT_CONNECTOR_BROADCAST_RGB, BROADCAST_RGB_FULL);
>  		paint_rectangles(data, mode, red_green_blue_limited, &fb);
>  		igt_plane_set_fb(primary, &fb);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
>  		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_full);
>  
> @@ -815,7 +814,7 @@ static void test_pipe_limited_range_ctm(data_t *data,
>  		igt_output_set_prop_value(output, IGT_CONNECTOR_BROADCAST_RGB, BROADCAST_RGB_16_235);
>  		paint_rectangles(data, mode, red_green_blue_full, &fb);
>  		igt_plane_set_fb(primary, &fb);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
>  		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_limited);
>  
> @@ -1043,7 +1042,7 @@ run_tests_for_pipe(data_t *data, enum pipe p)
>  		disable_degamma(primary->pipe);
>  		disable_gamma(primary->pipe);
>  		disable_ctm(primary->pipe);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  
>  		igt_pipe_crc_free(data->pipe_crc);
>  		data->pipe_crc = NULL;
> @@ -1085,7 +1084,7 @@ invalid_lut_sizes(data_t *data)
>  	struct _drm_color_lut *degamma_lut = malloc(data->degamma_lut_size * sizeof(struct _drm_color_lut) * 2);
>  	struct _drm_color_lut *gamma_lut = malloc(data->gamma_lut_size * sizeof(struct _drm_color_lut) * 2);
>  
> -	igt_display_commit2(display, display->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
> +	igt_display_commit2(display, COMMIT_ATOMIC);
>  
>  	if (igt_pipe_obj_has_prop(pipe, IGT_CRTC_DEGAMMA_LUT)) {
>  		igt_assert_eq(pipe_set_property_blob(pipe, IGT_CRTC_DEGAMMA_LUT,
> @@ -1173,6 +1172,7 @@ igt_main
>  		kmstest_set_vt_graphics_mode();
>  
>  		igt_display_require(&data.display, data.drm_fd);
> +		igt_require(data.display.is_atomic);
>  	}
>  
>  	for_each_pipe_static(pipe)
> -- 
> 1.9.1
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [igt-dev] [PATCH] tests/kms_color: Change in commit style from legacy to atomic
  2019-03-29  9:54 ` [igt-dev] [PATCH] " Daniel Vetter
@ 2019-03-29 10:02   ` Sharma, Swati2
  2019-03-29 10:34   ` Ville Syrjälä
  1 sibling, 0 replies; 7+ messages in thread
From: Sharma, Swati2 @ 2019-03-29 10:02 UTC (permalink / raw)
  To: Daniel Vetter; +Cc: Nikula, Jani, igt-dev

Sorry I was of the perception that this is required too since we are having only legacy commit in this IGT.

Thanks and Regards,
Swati

-----Original Message-----
From: Daniel Vetter <daniel.vetter@ffwll.ch> On Behalf Of Daniel Vetter
Sent: Friday, March 29, 2019 3:25 PM
To: Sharma, Swati2 <swati2.sharma@intel.com>
Cc: igt-dev@lists.freedesktop.org; maarten.lankhorst@linux.intel.com; daniel.vetter@ffwll.ch; Nautiyal, Ankit K <ankit.k.nautiyal@intel.com>; Shankar, Uma <uma.shankar@intel.com>; ville.syrjala@linux.intel.com; Nikula, Jani <jani.nikula@intel.com>
Subject: Re: [PATCH] tests/kms_color: Change in commit style from legacy to atomic

On Fri, Mar 29, 2019 at 12:20:14PM +0530, Swati Sharma wrote:
> Existing kms_color i-g-t, commit style by default is legacy for all 
> the ctm/gamma/degamma subtests.
> 
> In this patch, legacy commit is changed to atomic (since i915 no 
> longer supports legacy commit)
> 
> v1: As per Daniel's comments switching over to atomic.
> v2: As per Maarten's comments did COMMIT_ATOMIC, and added
>     igt_require(display.is_atomic)
> v3: Fixed stupid mistake, now test cases are not getting skipped
> 
> Need Feedback?
> Still there are few functions like pipe_set_property_blob_id, 
> pipe_set_property_blob, invalid_lut_sizes where provision of both 
> legacy and atomic is there. Should I change them too to atomic only 
> like I did for other func?
> 
> Also, this patch is floating since ages, it will be nice if I can have 
> a closure(=>rb) on this and move forward :)
> 
> Signed-off-by: Swati Sharma <swati2.sharma@intel.com>

Typed this on jira already months ago, replicating here: The idea is to add an atomic test (with crc checks every frame and all that) to make sure lut updates are atomic on screen. Switching to atomic commit style for everything else just means we can't run this on older drivers anymore (not that there are many of those left), which seems a bit pointless.
-Daniel

> ---
>  tests/kms_color.c | 42 +++++++++++++++++++++---------------------
>  1 file changed, 21 insertions(+), 21 deletions(-)
> 
> diff --git a/tests/kms_color.c b/tests/kms_color.c index 
> decf3c2..92f5c12 100644
> --- a/tests/kms_color.c
> +++ b/tests/kms_color.c
> @@ -63,7 +63,6 @@ typedef struct {
>  	uint64_t gamma_lut_size;
>  } data_t;
>  
> -
>  static void paint_gradient_rectangles(data_t *data,
>  				      drmModeModeInfo *mode,
>  				      color_t *colors,
> @@ -311,12 +310,12 @@ static void test_pipe_degamma(data_t *data,
>  		disable_ctm(primary->pipe);
>  		disable_degamma(primary->pipe);
>  		set_gamma(data, primary->pipe, gamma_linear);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  
>  		/* Draw solid colors with no degamma transformation. */
>  		paint_rectangles(data, mode, red_green_blue, &fb);
>  		igt_plane_set_fb(primary, &fb);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
>  		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullcolors);
>  
> @@ -326,7 +325,7 @@ static void test_pipe_degamma(data_t *data,
>  		paint_gradient_rectangles(data, mode, red_green_blue, &fb);
>  		igt_plane_set_fb(primary, &fb);
>  		set_degamma(data, primary->pipe, degamma_full);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
>  		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullgamma);
>  
> @@ -391,12 +390,12 @@ static void test_pipe_gamma(data_t *data,
>  		disable_ctm(primary->pipe);
>  		disable_degamma(primary->pipe);
>  		set_gamma(data, primary->pipe, gamma_full);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  
>  		/* Draw solid colors with no gamma transformation. */
>  		paint_rectangles(data, mode, red_green_blue, &fb);
>  		igt_plane_set_fb(primary, &fb);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
>  		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullcolors);
>  
> @@ -405,7 +404,7 @@ static void test_pipe_gamma(data_t *data,
>  		 */
>  		paint_gradient_rectangles(data, mode, red_green_blue, &fb);
>  		igt_plane_set_fb(primary, &fb);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
>  		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullgamma);
>  
> @@ -477,12 +476,12 @@ static void test_pipe_legacy_gamma(data_t *data,
>  		disable_degamma(primary->pipe);
>  		disable_gamma(primary->pipe);
>  		disable_ctm(primary->pipe);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  
>  		/* Draw solid colors with no gamma transformation. */
>  		paint_rectangles(data, mode, red_green_blue, &fb);
>  		igt_plane_set_fb(primary, &fb);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
>  		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullcolors);
>  
> @@ -497,7 +496,7 @@ static void test_pipe_legacy_gamma(data_t *data,
>  			red_lut[i] = green_lut[i] = blue_lut[i] = 0xffff;
>  		igt_assert_eq(drmModeCrtcSetGamma(data->drm_fd, primary->pipe->crtc_id,
>  						  legacy_lut_size, red_lut, green_lut, blue_lut), 0);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
>  		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullgamma);
>  
> @@ -512,7 +511,7 @@ static void test_pipe_legacy_gamma(data_t *data,
>  
>  		igt_assert_eq(drmModeCrtcSetGamma(data->drm_fd, primary->pipe->crtc_id,
>  						  legacy_lut_size, red_lut, green_lut, blue_lut), 0);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  
>  		igt_plane_set_fb(primary, NULL);
>  		igt_output_set_pipe(output, PIPE_NONE); @@ -566,7 +565,7 @@ static 
> void test_pipe_legacy_gamma_reset(data_t *data,
>  		disable_degamma(primary->pipe);
>  		disable_ctm(primary->pipe);
>  		disable_gamma(primary->pipe);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  
>  		/* Set a degama & gamma LUT and a CTM using the
>  		 * properties and verify the content of the @@ -574,7 +573,7 @@ 
> static void test_pipe_legacy_gamma_reset(data_t *data,
>  		set_degamma(data, primary->pipe, degamma_linear);
>  		set_ctm(primary->pipe, ctm_identity);
>  		set_gamma(data, primary->pipe, gamma_zero);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  
>  		blob = get_blob(data, primary->pipe, IGT_CRTC_DEGAMMA_LUT);
>  		igt_assert(blob &&
> @@ -617,7 +616,7 @@ static void test_pipe_legacy_gamma_reset(data_t *data,
>  						  legacy_lut_size,
>  						  red_lut, green_lut, blue_lut),
>  			      0);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  
>  		igt_assert(get_blob(data, primary->pipe,
>  				    IGT_CRTC_DEGAMMA_LUT) == NULL); @@ -699,12 +698,12 @@ static 
> bool test_pipe_ctm(data_t *data,
>  		set_degamma(data, primary->pipe, degamma_linear);
>  		set_gamma(data, primary->pipe, gamma_linear);
>  		disable_ctm(primary->pipe);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  
>  		paint_rectangles(data, mode, after, &fb);
>  		igt_plane_set_fb(primary, &fb);
>  		set_ctm(primary->pipe, ctm_identity);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
>  		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_software);
>  
> @@ -712,7 +711,7 @@ static bool test_pipe_ctm(data_t *data,
>  		paint_rectangles(data, mode, before, &fb);
>  		igt_plane_set_fb(primary, &fb);
>  		set_ctm(primary->pipe, ctm_matrix);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
>  		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_hardware);
>  
> @@ -807,7 +806,7 @@ static void test_pipe_limited_range_ctm(data_t *data,
>  		igt_output_set_prop_value(output, IGT_CONNECTOR_BROADCAST_RGB, BROADCAST_RGB_FULL);
>  		paint_rectangles(data, mode, red_green_blue_limited, &fb);
>  		igt_plane_set_fb(primary, &fb);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
>  		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_full);
>  
> @@ -815,7 +814,7 @@ static void test_pipe_limited_range_ctm(data_t *data,
>  		igt_output_set_prop_value(output, IGT_CONNECTOR_BROADCAST_RGB, BROADCAST_RGB_16_235);
>  		paint_rectangles(data, mode, red_green_blue_full, &fb);
>  		igt_plane_set_fb(primary, &fb);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
>  		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_limited);
>  
> @@ -1043,7 +1042,7 @@ run_tests_for_pipe(data_t *data, enum pipe p)
>  		disable_degamma(primary->pipe);
>  		disable_gamma(primary->pipe);
>  		disable_ctm(primary->pipe);
> -		igt_display_commit(&data->display);
> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>  
>  		igt_pipe_crc_free(data->pipe_crc);
>  		data->pipe_crc = NULL;
> @@ -1085,7 +1084,7 @@ invalid_lut_sizes(data_t *data)
>  	struct _drm_color_lut *degamma_lut = malloc(data->degamma_lut_size * sizeof(struct _drm_color_lut) * 2);
>  	struct _drm_color_lut *gamma_lut = malloc(data->gamma_lut_size * 
> sizeof(struct _drm_color_lut) * 2);
>  
> -	igt_display_commit2(display, display->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
> +	igt_display_commit2(display, COMMIT_ATOMIC);
>  
>  	if (igt_pipe_obj_has_prop(pipe, IGT_CRTC_DEGAMMA_LUT)) {
>  		igt_assert_eq(pipe_set_property_blob(pipe, IGT_CRTC_DEGAMMA_LUT, @@ 
> -1173,6 +1172,7 @@ igt_main
>  		kmstest_set_vt_graphics_mode();
>  
>  		igt_display_require(&data.display, data.drm_fd);
> +		igt_require(data.display.is_atomic);
>  	}
>  
>  	for_each_pipe_static(pipe)
> --
> 1.9.1
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [igt-dev] [PATCH] tests/kms_color: Change in commit style from legacy to atomic
  2019-03-29  9:54 ` [igt-dev] [PATCH] " Daniel Vetter
  2019-03-29 10:02   ` Sharma, Swati2
@ 2019-03-29 10:34   ` Ville Syrjälä
  2019-04-01  9:19     ` Sharma, Swati2
  1 sibling, 1 reply; 7+ messages in thread
From: Ville Syrjälä @ 2019-03-29 10:34 UTC (permalink / raw)
  To: Daniel Vetter; +Cc: jani.nikula, igt-dev

On Fri, Mar 29, 2019 at 10:54:53AM +0100, Daniel Vetter wrote:
> On Fri, Mar 29, 2019 at 12:20:14PM +0530, Swati Sharma wrote:
> > Existing kms_color i-g-t, commit style by default is legacy for
> > all the ctm/gamma/degamma subtests.
> > 
> > In this patch, legacy commit is changed to atomic (since i915
> > no longer supports legacy commit)
> > 
> > v1: As per Daniel's comments switching over to atomic.
> > v2: As per Maarten's comments did COMMIT_ATOMIC, and added
> >     igt_require(display.is_atomic)
> > v3: Fixed stupid mistake, now test cases are not getting skipped
> > 
> > Need Feedback?
> > Still there are few functions like pipe_set_property_blob_id,
> > pipe_set_property_blob, invalid_lut_sizes where provision of
> > both legacy and atomic is there. Should I change them too to
> > atomic only like I did for other func?
> > 
> > Also, this patch is floating since ages, it will be nice if
> > I can have a closure(=>rb) on this and move forward :)
> > 
> > Signed-off-by: Swati Sharma <swati2.sharma@intel.com>
> 
> Typed this on jira already months ago, replicating here: The idea is to
> add an atomic test (with crc checks every frame and all that) to make sure
> lut updates are atomic on screen.

I have a test for that. It needs my vblank workers (still a bit wip) to
actually work (well, mostly work).

> Switching to atomic commit style for
> everything else just means we can't run this on older drivers anymore (not
> that there are many of those left), which seems a bit pointless.
> -Daniel
> 
> > ---
> >  tests/kms_color.c | 42 +++++++++++++++++++++---------------------
> >  1 file changed, 21 insertions(+), 21 deletions(-)
> > 
> > diff --git a/tests/kms_color.c b/tests/kms_color.c
> > index decf3c2..92f5c12 100644
> > --- a/tests/kms_color.c
> > +++ b/tests/kms_color.c
> > @@ -63,7 +63,6 @@ typedef struct {
> >  	uint64_t gamma_lut_size;
> >  } data_t;
> >  
> > -
> >  static void paint_gradient_rectangles(data_t *data,
> >  				      drmModeModeInfo *mode,
> >  				      color_t *colors,
> > @@ -311,12 +310,12 @@ static void test_pipe_degamma(data_t *data,
> >  		disable_ctm(primary->pipe);
> >  		disable_degamma(primary->pipe);
> >  		set_gamma(data, primary->pipe, gamma_linear);
> > -		igt_display_commit(&data->display);
> > +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
> >  
> >  		/* Draw solid colors with no degamma transformation. */
> >  		paint_rectangles(data, mode, red_green_blue, &fb);
> >  		igt_plane_set_fb(primary, &fb);
> > -		igt_display_commit(&data->display);
> > +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
> >  		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
> >  		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullcolors);
> >  
> > @@ -326,7 +325,7 @@ static void test_pipe_degamma(data_t *data,
> >  		paint_gradient_rectangles(data, mode, red_green_blue, &fb);
> >  		igt_plane_set_fb(primary, &fb);
> >  		set_degamma(data, primary->pipe, degamma_full);
> > -		igt_display_commit(&data->display);
> > +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
> >  		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
> >  		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullgamma);
> >  
> > @@ -391,12 +390,12 @@ static void test_pipe_gamma(data_t *data,
> >  		disable_ctm(primary->pipe);
> >  		disable_degamma(primary->pipe);
> >  		set_gamma(data, primary->pipe, gamma_full);
> > -		igt_display_commit(&data->display);
> > +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
> >  
> >  		/* Draw solid colors with no gamma transformation. */
> >  		paint_rectangles(data, mode, red_green_blue, &fb);
> >  		igt_plane_set_fb(primary, &fb);
> > -		igt_display_commit(&data->display);
> > +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
> >  		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
> >  		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullcolors);
> >  
> > @@ -405,7 +404,7 @@ static void test_pipe_gamma(data_t *data,
> >  		 */
> >  		paint_gradient_rectangles(data, mode, red_green_blue, &fb);
> >  		igt_plane_set_fb(primary, &fb);
> > -		igt_display_commit(&data->display);
> > +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
> >  		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
> >  		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullgamma);
> >  
> > @@ -477,12 +476,12 @@ static void test_pipe_legacy_gamma(data_t *data,
> >  		disable_degamma(primary->pipe);
> >  		disable_gamma(primary->pipe);
> >  		disable_ctm(primary->pipe);
> > -		igt_display_commit(&data->display);
> > +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
> >  
> >  		/* Draw solid colors with no gamma transformation. */
> >  		paint_rectangles(data, mode, red_green_blue, &fb);
> >  		igt_plane_set_fb(primary, &fb);
> > -		igt_display_commit(&data->display);
> > +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
> >  		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
> >  		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullcolors);
> >  
> > @@ -497,7 +496,7 @@ static void test_pipe_legacy_gamma(data_t *data,
> >  			red_lut[i] = green_lut[i] = blue_lut[i] = 0xffff;
> >  		igt_assert_eq(drmModeCrtcSetGamma(data->drm_fd, primary->pipe->crtc_id,
> >  						  legacy_lut_size, red_lut, green_lut, blue_lut), 0);
> > -		igt_display_commit(&data->display);
> > +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
> >  		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
> >  		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullgamma);
> >  
> > @@ -512,7 +511,7 @@ static void test_pipe_legacy_gamma(data_t *data,
> >  
> >  		igt_assert_eq(drmModeCrtcSetGamma(data->drm_fd, primary->pipe->crtc_id,
> >  						  legacy_lut_size, red_lut, green_lut, blue_lut), 0);
> > -		igt_display_commit(&data->display);
> > +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
> >  
> >  		igt_plane_set_fb(primary, NULL);
> >  		igt_output_set_pipe(output, PIPE_NONE);
> > @@ -566,7 +565,7 @@ static void test_pipe_legacy_gamma_reset(data_t *data,
> >  		disable_degamma(primary->pipe);
> >  		disable_ctm(primary->pipe);
> >  		disable_gamma(primary->pipe);
> > -		igt_display_commit(&data->display);
> > +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
> >  
> >  		/* Set a degama & gamma LUT and a CTM using the
> >  		 * properties and verify the content of the
> > @@ -574,7 +573,7 @@ static void test_pipe_legacy_gamma_reset(data_t *data,
> >  		set_degamma(data, primary->pipe, degamma_linear);
> >  		set_ctm(primary->pipe, ctm_identity);
> >  		set_gamma(data, primary->pipe, gamma_zero);
> > -		igt_display_commit(&data->display);
> > +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
> >  
> >  		blob = get_blob(data, primary->pipe, IGT_CRTC_DEGAMMA_LUT);
> >  		igt_assert(blob &&
> > @@ -617,7 +616,7 @@ static void test_pipe_legacy_gamma_reset(data_t *data,
> >  						  legacy_lut_size,
> >  						  red_lut, green_lut, blue_lut),
> >  			      0);
> > -		igt_display_commit(&data->display);
> > +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
> >  
> >  		igt_assert(get_blob(data, primary->pipe,
> >  				    IGT_CRTC_DEGAMMA_LUT) == NULL);
> > @@ -699,12 +698,12 @@ static bool test_pipe_ctm(data_t *data,
> >  		set_degamma(data, primary->pipe, degamma_linear);
> >  		set_gamma(data, primary->pipe, gamma_linear);
> >  		disable_ctm(primary->pipe);
> > -		igt_display_commit(&data->display);
> > +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
> >  
> >  		paint_rectangles(data, mode, after, &fb);
> >  		igt_plane_set_fb(primary, &fb);
> >  		set_ctm(primary->pipe, ctm_identity);
> > -		igt_display_commit(&data->display);
> > +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
> >  		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
> >  		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_software);
> >  
> > @@ -712,7 +711,7 @@ static bool test_pipe_ctm(data_t *data,
> >  		paint_rectangles(data, mode, before, &fb);
> >  		igt_plane_set_fb(primary, &fb);
> >  		set_ctm(primary->pipe, ctm_matrix);
> > -		igt_display_commit(&data->display);
> > +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
> >  		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
> >  		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_hardware);
> >  
> > @@ -807,7 +806,7 @@ static void test_pipe_limited_range_ctm(data_t *data,
> >  		igt_output_set_prop_value(output, IGT_CONNECTOR_BROADCAST_RGB, BROADCAST_RGB_FULL);
> >  		paint_rectangles(data, mode, red_green_blue_limited, &fb);
> >  		igt_plane_set_fb(primary, &fb);
> > -		igt_display_commit(&data->display);
> > +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
> >  		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
> >  		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_full);
> >  
> > @@ -815,7 +814,7 @@ static void test_pipe_limited_range_ctm(data_t *data,
> >  		igt_output_set_prop_value(output, IGT_CONNECTOR_BROADCAST_RGB, BROADCAST_RGB_16_235);
> >  		paint_rectangles(data, mode, red_green_blue_full, &fb);
> >  		igt_plane_set_fb(primary, &fb);
> > -		igt_display_commit(&data->display);
> > +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
> >  		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
> >  		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_limited);
> >  
> > @@ -1043,7 +1042,7 @@ run_tests_for_pipe(data_t *data, enum pipe p)
> >  		disable_degamma(primary->pipe);
> >  		disable_gamma(primary->pipe);
> >  		disable_ctm(primary->pipe);
> > -		igt_display_commit(&data->display);
> > +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
> >  
> >  		igt_pipe_crc_free(data->pipe_crc);
> >  		data->pipe_crc = NULL;
> > @@ -1085,7 +1084,7 @@ invalid_lut_sizes(data_t *data)
> >  	struct _drm_color_lut *degamma_lut = malloc(data->degamma_lut_size * sizeof(struct _drm_color_lut) * 2);
> >  	struct _drm_color_lut *gamma_lut = malloc(data->gamma_lut_size * sizeof(struct _drm_color_lut) * 2);
> >  
> > -	igt_display_commit2(display, display->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
> > +	igt_display_commit2(display, COMMIT_ATOMIC);
> >  
> >  	if (igt_pipe_obj_has_prop(pipe, IGT_CRTC_DEGAMMA_LUT)) {
> >  		igt_assert_eq(pipe_set_property_blob(pipe, IGT_CRTC_DEGAMMA_LUT,
> > @@ -1173,6 +1172,7 @@ igt_main
> >  		kmstest_set_vt_graphics_mode();
> >  
> >  		igt_display_require(&data.display, data.drm_fd);
> > +		igt_require(data.display.is_atomic);
> >  	}
> >  
> >  	for_each_pipe_static(pipe)
> > -- 
> > 1.9.1
> > 
> 
> -- 
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch

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

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [igt-dev] ✓ Fi.CI.IGT: success for tests/kms_color: Change in commit style from legacy to atomic
  2019-03-29  6:50 [igt-dev] [PATCH] tests/kms_color: Change in commit style from legacy to atomic Swati Sharma
  2019-03-29  7:47 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
  2019-03-29  9:54 ` [igt-dev] [PATCH] " Daniel Vetter
@ 2019-03-29 12:05 ` Patchwork
  2 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2019-03-29 12:05 UTC (permalink / raw)
  To: Sharma, Swati2; +Cc: igt-dev

== Series Details ==

Series: tests/kms_color: Change in commit style from legacy to atomic
URL   : https://patchwork.freedesktop.org/series/58711/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_5835_full -> IGTPW_2734_full
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

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

Known issues
------------

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

### IGT changes ###

#### Issues hit ####

  * igt@gem_busy@busy-bsd1:
    - shard-apl:          NOTRUN -> SKIP [fdo#109271] +25

  * igt@gem_exec_store@cachelines-bsd1:
    - shard-snb:          NOTRUN -> SKIP [fdo#109271] +42

  * igt@kms_atomic_transition@1x-modeset-transitions-nonblocking-fencing:
    - shard-apl:          PASS -> FAIL [fdo#109660]
    - shard-kbl:          PASS -> FAIL [fdo#109660]

  * igt@kms_atomic_transition@6x-modeset-transitions-fencing:
    - shard-glk:          NOTRUN -> SKIP [fdo#109271] / [fdo#109278]

  * igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-a:
    - shard-hsw:          PASS -> DMESG-WARN [fdo#110222] +1

  * igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-b:
    - shard-snb:          PASS -> DMESG-WARN [fdo#110222]

  * igt@kms_cursor_crc@cursor-256x256-suspend:
    - shard-apl:          PASS -> DMESG-WARN [fdo#108566]

  * igt@kms_draw_crc@draw-method-xrgb8888-mmap-wc-xtiled:
    - shard-snb:          PASS -> SKIP [fdo#109271]

  * igt@kms_fbcon_fbt@fbc:
    - shard-glk:          NOTRUN -> SKIP [fdo#109271] +17

  * igt@kms_pipe_crc_basic@nonblocking-crc-pipe-e:
    - shard-apl:          NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +1

  * igt@kms_pipe_crc_basic@suspend-read-crc-pipe-f:
    - shard-snb:          NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +2

  * igt@kms_plane_scaling@pipe-c-plane-scaling:
    - shard-hsw:          NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +3

  * igt@kms_psr@sprite_render:
    - shard-hsw:          NOTRUN -> SKIP [fdo#109271] +27

  * igt@kms_rotation_crc@multiplane-rotation-cropping-bottom:
    - shard-kbl:          PASS -> DMESG-FAIL [fdo#105763]

  * igt@kms_vblank@pipe-b-ts-continuation-dpms-suspend:
    - shard-kbl:          PASS -> FAIL [fdo#104894]
    - shard-apl:          PASS -> FAIL [fdo#104894]

  * igt@perf_pmu@rc6:
    - shard-kbl:          PASS -> SKIP [fdo#109271]

  
#### Possible fixes ####

  * igt@drm_import_export@prime:
    - shard-glk:          INCOMPLETE [fdo#103359] / [k.org#198133] -> PASS

  * igt@i915_pm_rc6_residency@rc6-accuracy:
    - shard-snb:          SKIP [fdo#109271] -> PASS

  * igt@kms_busy@extended-modeset-hang-newfb-render-b:
    - shard-hsw:          DMESG-WARN [fdo#110222] -> PASS +1

  * igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-a:
    - shard-snb:          DMESG-WARN [fdo#110222] -> PASS

  * igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-c:
    - shard-kbl:          DMESG-WARN [fdo#110222] -> PASS

  * igt@kms_cursor_crc@cursor-128x128-dpms:
    - shard-kbl:          FAIL [fdo#103232] -> PASS
    - shard-apl:          FAIL [fdo#103232] -> PASS

  * igt@kms_cursor_legacy@cursor-vs-flip-toggle:
    - shard-hsw:          INCOMPLETE [fdo#103540] -> PASS

  * igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
    - shard-glk:          FAIL [fdo#105363] -> PASS

  * igt@kms_flip@2x-plain-flip-fb-recreate-interruptible:
    - shard-glk:          FAIL [fdo#100368] -> PASS

  * igt@kms_flip@flip-vs-expired-vblank:
    - shard-kbl:          FAIL [fdo#102887] / [fdo#105363] -> PASS
    - shard-apl:          FAIL [fdo#102887] / [fdo#105363] -> PASS

  * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-cpu:
    - shard-apl:          FAIL [fdo#103167] -> PASS
    - shard-kbl:          FAIL [fdo#103167] -> PASS

  * igt@kms_frontbuffer_tracking@fbc-2p-primscrn-shrfb-plflip-blt:
    - shard-glk:          FAIL [fdo#103167] -> PASS

  * igt@kms_plane_scaling@pipe-b-scaler-with-rotation:
    - shard-glk:          SKIP [fdo#109271] / [fdo#109278] -> PASS

  * igt@kms_setmode@basic:
    - shard-apl:          FAIL [fdo#99912] -> PASS
    - shard-kbl:          FAIL [fdo#99912] -> PASS

  * igt@kms_vblank@pipe-a-ts-continuation-modeset:
    - shard-apl:          FAIL [fdo#104894] -> PASS
    - shard-kbl:          FAIL [fdo#104894] -> 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#102887]: https://bugs.freedesktop.org/show_bug.cgi?id=102887
  [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
  [fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
  [fdo#103359]: https://bugs.freedesktop.org/show_bug.cgi?id=103359
  [fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
  [fdo#104894]: https://bugs.freedesktop.org/show_bug.cgi?id=104894
  [fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
  [fdo#105763]: https://bugs.freedesktop.org/show_bug.cgi?id=105763
  [fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
  [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
  [fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
  [fdo#109660]: https://bugs.freedesktop.org/show_bug.cgi?id=109660
  [fdo#110222]: https://bugs.freedesktop.org/show_bug.cgi?id=110222
  [fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
  [k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133


Participating hosts (10 -> 5)
------------------------------

  Missing    (5): shard-skl pig-hsw-4770r pig-glk-j5005 shard-iclb pig-skl-6260u 


Build changes
-------------

    * IGT: IGT_4911 -> IGTPW_2734
    * Piglit: piglit_4509 -> None

  CI_DRM_5835: a87cb5da301d892d69d44b106a007caea8386935 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_2734: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2734/
  IGT_4911: d9fe699ea45406e279b78d1afdb4d57a205a3c99 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

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

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [igt-dev] [PATCH] tests/kms_color: Change in commit style from legacy to atomic
  2019-03-29 10:34   ` Ville Syrjälä
@ 2019-04-01  9:19     ` Sharma, Swati2
  0 siblings, 0 replies; 7+ messages in thread
From: Sharma, Swati2 @ 2019-04-01  9:19 UTC (permalink / raw)
  To: Daniel Vetter; +Cc: jani.nikula, igt-dev


[-- Attachment #1.1: Type: text/plain, Size: 11430 bytes --]

On 29-Mar-19 4:04 PM, Ville Syrjälä wrote:
> On Fri, Mar 29, 2019 at 10:54:53AM +0100, Daniel Vetter wrote:
>> On Fri, Mar 29, 2019 at 12:20:14PM +0530, Swati Sharma wrote:
>>> Existing kms_color i-g-t, commit style by default is legacy for
>>> all the ctm/gamma/degamma subtests.
>>>
>>> In this patch, legacy commit is changed to atomic (since i915
>>> no longer supports legacy commit)
>>>
>>> v1: As per Daniel's comments switching over to atomic.
>>> v2: As per Maarten's comments did COMMIT_ATOMIC, and added
>>>      igt_require(display.is_atomic)
>>> v3: Fixed stupid mistake, now test cases are not getting skipped
>>>
>>> Need Feedback?
>>> Still there are few functions like pipe_set_property_blob_id,
>>> pipe_set_property_blob, invalid_lut_sizes where provision of
>>> both legacy and atomic is there. Should I change them too to
>>> atomic only like I did for other func?
>>>
>>> Also, this patch is floating since ages, it will be nice if
>>> I can have a closure(=>rb) on this and move forward :)
>>>
>>> Signed-off-by: Swati Sharma <swati2.sharma@intel.com>
>> Typed this on jira already months ago, replicating here: The idea is to
>> add an atomic test (with crc checks every frame and all that) to make sure
>> lut updates are atomic on screen.
> I have a test for that. It needs my vblank workers (still a bit wip) to
> actually work (well, mostly work).
>
>> Switching to atomic commit style for
>> everything else just means we can't run this on older drivers anymore (not
>> that there are many of those left), which seems a bit pointless.
>> -Daniel

Hi Daniel,
I think there is some misunderstanding from my end. When I first sent this patch as
an RFChttps://patchwork.freedesktop.org/patch/254752/  there I had given provision
for both legacy and atomic.
That time feedback which I received was:
Imo just switch over to atomic. There's no upstream driver supporting
color management props that doesn't support atomic.
-Daniel
That's y I switched to atomic completely.

I still feel provision for both legacy and atomic should be given. Though this change is
not adding atomic test(now which is already Ville is doing) but like other IGTs
it should allow commit through both the paths.
Please do let me know what you think. Thanks in advance.

>>
>>> ---
>>>   tests/kms_color.c | 42 +++++++++++++++++++++---------------------
>>>   1 file changed, 21 insertions(+), 21 deletions(-)
>>>
>>> diff --git a/tests/kms_color.c b/tests/kms_color.c
>>> index decf3c2..92f5c12 100644
>>> --- a/tests/kms_color.c
>>> +++ b/tests/kms_color.c
>>> @@ -63,7 +63,6 @@ typedef struct {
>>>   	uint64_t gamma_lut_size;
>>>   } data_t;
>>>   
>>> -
>>>   static void paint_gradient_rectangles(data_t *data,
>>>   				      drmModeModeInfo *mode,
>>>   				      color_t *colors,
>>> @@ -311,12 +310,12 @@ static void test_pipe_degamma(data_t *data,
>>>   		disable_ctm(primary->pipe);
>>>   		disable_degamma(primary->pipe);
>>>   		set_gamma(data, primary->pipe, gamma_linear);
>>> -		igt_display_commit(&data->display);
>>> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>>>   
>>>   		/* Draw solid colors with no degamma transformation. */
>>>   		paint_rectangles(data, mode, red_green_blue, &fb);
>>>   		igt_plane_set_fb(primary, &fb);
>>> -		igt_display_commit(&data->display);
>>> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>>>   		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
>>>   		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullcolors);
>>>   
>>> @@ -326,7 +325,7 @@ static void test_pipe_degamma(data_t *data,
>>>   		paint_gradient_rectangles(data, mode, red_green_blue, &fb);
>>>   		igt_plane_set_fb(primary, &fb);
>>>   		set_degamma(data, primary->pipe, degamma_full);
>>> -		igt_display_commit(&data->display);
>>> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>>>   		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
>>>   		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullgamma);
>>>   
>>> @@ -391,12 +390,12 @@ static void test_pipe_gamma(data_t *data,
>>>   		disable_ctm(primary->pipe);
>>>   		disable_degamma(primary->pipe);
>>>   		set_gamma(data, primary->pipe, gamma_full);
>>> -		igt_display_commit(&data->display);
>>> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>>>   
>>>   		/* Draw solid colors with no gamma transformation. */
>>>   		paint_rectangles(data, mode, red_green_blue, &fb);
>>>   		igt_plane_set_fb(primary, &fb);
>>> -		igt_display_commit(&data->display);
>>> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>>>   		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
>>>   		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullcolors);
>>>   
>>> @@ -405,7 +404,7 @@ static void test_pipe_gamma(data_t *data,
>>>   		 */
>>>   		paint_gradient_rectangles(data, mode, red_green_blue, &fb);
>>>   		igt_plane_set_fb(primary, &fb);
>>> -		igt_display_commit(&data->display);
>>> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>>>   		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
>>>   		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullgamma);
>>>   
>>> @@ -477,12 +476,12 @@ static void test_pipe_legacy_gamma(data_t *data,
>>>   		disable_degamma(primary->pipe);
>>>   		disable_gamma(primary->pipe);
>>>   		disable_ctm(primary->pipe);
>>> -		igt_display_commit(&data->display);
>>> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>>>   
>>>   		/* Draw solid colors with no gamma transformation. */
>>>   		paint_rectangles(data, mode, red_green_blue, &fb);
>>>   		igt_plane_set_fb(primary, &fb);
>>> -		igt_display_commit(&data->display);
>>> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>>>   		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
>>>   		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullcolors);
>>>   
>>> @@ -497,7 +496,7 @@ static void test_pipe_legacy_gamma(data_t *data,
>>>   			red_lut[i] = green_lut[i] = blue_lut[i] = 0xffff;
>>>   		igt_assert_eq(drmModeCrtcSetGamma(data->drm_fd, primary->pipe->crtc_id,
>>>   						  legacy_lut_size, red_lut, green_lut, blue_lut), 0);
>>> -		igt_display_commit(&data->display);
>>> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>>>   		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
>>>   		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_fullgamma);
>>>   
>>> @@ -512,7 +511,7 @@ static void test_pipe_legacy_gamma(data_t *data,
>>>   
>>>   		igt_assert_eq(drmModeCrtcSetGamma(data->drm_fd, primary->pipe->crtc_id,
>>>   						  legacy_lut_size, red_lut, green_lut, blue_lut), 0);
>>> -		igt_display_commit(&data->display);
>>> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>>>   
>>>   		igt_plane_set_fb(primary, NULL);
>>>   		igt_output_set_pipe(output, PIPE_NONE);
>>> @@ -566,7 +565,7 @@ static void test_pipe_legacy_gamma_reset(data_t *data,
>>>   		disable_degamma(primary->pipe);
>>>   		disable_ctm(primary->pipe);
>>>   		disable_gamma(primary->pipe);
>>> -		igt_display_commit(&data->display);
>>> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>>>   
>>>   		/* Set a degama & gamma LUT and a CTM using the
>>>   		 * properties and verify the content of the
>>> @@ -574,7 +573,7 @@ static void test_pipe_legacy_gamma_reset(data_t *data,
>>>   		set_degamma(data, primary->pipe, degamma_linear);
>>>   		set_ctm(primary->pipe, ctm_identity);
>>>   		set_gamma(data, primary->pipe, gamma_zero);
>>> -		igt_display_commit(&data->display);
>>> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>>>   
>>>   		blob = get_blob(data, primary->pipe, IGT_CRTC_DEGAMMA_LUT);
>>>   		igt_assert(blob &&
>>> @@ -617,7 +616,7 @@ static void test_pipe_legacy_gamma_reset(data_t *data,
>>>   						  legacy_lut_size,
>>>   						  red_lut, green_lut, blue_lut),
>>>   			      0);
>>> -		igt_display_commit(&data->display);
>>> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>>>   
>>>   		igt_assert(get_blob(data, primary->pipe,
>>>   				    IGT_CRTC_DEGAMMA_LUT) == NULL);
>>> @@ -699,12 +698,12 @@ static bool test_pipe_ctm(data_t *data,
>>>   		set_degamma(data, primary->pipe, degamma_linear);
>>>   		set_gamma(data, primary->pipe, gamma_linear);
>>>   		disable_ctm(primary->pipe);
>>> -		igt_display_commit(&data->display);
>>> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>>>   
>>>   		paint_rectangles(data, mode, after, &fb);
>>>   		igt_plane_set_fb(primary, &fb);
>>>   		set_ctm(primary->pipe, ctm_identity);
>>> -		igt_display_commit(&data->display);
>>> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>>>   		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
>>>   		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_software);
>>>   
>>> @@ -712,7 +711,7 @@ static bool test_pipe_ctm(data_t *data,
>>>   		paint_rectangles(data, mode, before, &fb);
>>>   		igt_plane_set_fb(primary, &fb);
>>>   		set_ctm(primary->pipe, ctm_matrix);
>>> -		igt_display_commit(&data->display);
>>> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>>>   		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
>>>   		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_hardware);
>>>   
>>> @@ -807,7 +806,7 @@ static void test_pipe_limited_range_ctm(data_t *data,
>>>   		igt_output_set_prop_value(output, IGT_CONNECTOR_BROADCAST_RGB, BROADCAST_RGB_FULL);
>>>   		paint_rectangles(data, mode, red_green_blue_limited, &fb);
>>>   		igt_plane_set_fb(primary, &fb);
>>> -		igt_display_commit(&data->display);
>>> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>>>   		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
>>>   		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_full);
>>>   
>>> @@ -815,7 +814,7 @@ static void test_pipe_limited_range_ctm(data_t *data,
>>>   		igt_output_set_prop_value(output, IGT_CONNECTOR_BROADCAST_RGB, BROADCAST_RGB_16_235);
>>>   		paint_rectangles(data, mode, red_green_blue_full, &fb);
>>>   		igt_plane_set_fb(primary, &fb);
>>> -		igt_display_commit(&data->display);
>>> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>>>   		igt_wait_for_vblank(data->drm_fd, primary->pipe->pipe);
>>>   		igt_pipe_crc_collect_crc(data->pipe_crc, &crc_limited);
>>>   
>>> @@ -1043,7 +1042,7 @@ run_tests_for_pipe(data_t *data, enum pipe p)
>>>   		disable_degamma(primary->pipe);
>>>   		disable_gamma(primary->pipe);
>>>   		disable_ctm(primary->pipe);
>>> -		igt_display_commit(&data->display);
>>> +		igt_display_commit2(&data->display, COMMIT_ATOMIC);
>>>   
>>>   		igt_pipe_crc_free(data->pipe_crc);
>>>   		data->pipe_crc = NULL;
>>> @@ -1085,7 +1084,7 @@ invalid_lut_sizes(data_t *data)
>>>   	struct _drm_color_lut *degamma_lut = malloc(data->degamma_lut_size * sizeof(struct _drm_color_lut) * 2);
>>>   	struct _drm_color_lut *gamma_lut = malloc(data->gamma_lut_size * sizeof(struct _drm_color_lut) * 2);
>>>   
>>> -	igt_display_commit2(display, display->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
>>> +	igt_display_commit2(display, COMMIT_ATOMIC);
>>>   
>>>   	if (igt_pipe_obj_has_prop(pipe, IGT_CRTC_DEGAMMA_LUT)) {
>>>   		igt_assert_eq(pipe_set_property_blob(pipe, IGT_CRTC_DEGAMMA_LUT,
>>> @@ -1173,6 +1172,7 @@ igt_main
>>>   		kmstest_set_vt_graphics_mode();
>>>   
>>>   		igt_display_require(&data.display, data.drm_fd);
>>> +		igt_require(data.display.is_atomic);
>>>   	}
>>>   
>>>   	for_each_pipe_static(pipe)
>>> -- 
>>> 1.9.1
>>>
>> -- 
>> Daniel Vetter
>> Software Engineer, Intel Corporation
>> http://blog.ffwll.ch


-- 
~Swati Sharma


[-- Attachment #1.2: Type: text/html, Size: 12473 bytes --]

[-- Attachment #2: Type: text/plain, Size: 153 bytes --]

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

^ permalink raw reply	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-04-01  9:19 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-29  6:50 [igt-dev] [PATCH] tests/kms_color: Change in commit style from legacy to atomic Swati Sharma
2019-03-29  7:47 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2019-03-29  9:54 ` [igt-dev] [PATCH] " Daniel Vetter
2019-03-29 10:02   ` Sharma, Swati2
2019-03-29 10:34   ` Ville Syrjälä
2019-04-01  9:19     ` Sharma, Swati2
2019-03-29 12:05 ` [igt-dev] ✓ Fi.CI.IGT: success for " Patchwork

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.