Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [igt-dev] [i-g-t V2 1/3] tests/kms: Cleanup to use linear modifier
@ 2023-03-13 15:14 Bhanuprakash Modem
  2023-03-13 15:14 ` [igt-dev] [i-g-t V2 2/3] tests/i915/kms_ccs: " Bhanuprakash Modem
                   ` (4 more replies)
  0 siblings, 5 replies; 7+ messages in thread
From: Bhanuprakash Modem @ 2023-03-13 15:14 UTC (permalink / raw)
  To: igt-dev, ville.syrjala

While creating the framebuffer use the default modifier as
DRM_FORMAT_MOD_LINEAR instead of using deprecated modifiers,
magic numbers, no_tiling modifier etc..

V2: - New patch for cairo fix (Ville)
    - Update commit message
V3: - New patch for kms_ccs (Ville)

Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
---
 tests/i915/kms_cdclk.c            |  4 ++--
 tests/i915/kms_pipe_b_c_ivb.c     |  2 +-
 tests/i915/kms_psr_stress_test.c  |  2 +-
 tests/kms_addfb_basic.c           | 22 +++++++++----------
 tests/kms_atomic.c                | 24 ++++++++++-----------
 tests/kms_atomic_transition.c     |  4 ++--
 tests/kms_bw.c                    |  2 +-
 tests/kms_cursor_legacy.c         | 36 ++++++++++++++++++++-----------
 tests/kms_display_modes.c         |  7 +++---
 tests/kms_force_connector_basic.c |  4 ++--
 tests/kms_getfb.c                 |  8 +++----
 tests/kms_hdr.c                   |  9 +++++---
 tests/kms_plane_cursor.c          | 12 +++++------
 tests/kms_plane_scaling.c         | 20 ++++++++---------
 tests/kms_prime.c                 |  2 +-
 tests/kms_scaling_modes.c         |  4 ++--
 tests/kms_universal_plane.c       |  4 ++--
 17 files changed, 90 insertions(+), 76 deletions(-)

diff --git a/tests/i915/kms_cdclk.c b/tests/i915/kms_cdclk.c
index 991a7c507..f3046c95a 100644
--- a/tests/i915/kms_cdclk.c
+++ b/tests/i915/kms_cdclk.c
@@ -158,7 +158,7 @@ static void test_plane_scaling(data_t *data, enum pipe pipe, igt_output_t *outpu
 		igt_create_color_pattern_fb(display->drm_fd,
 					    mode->hdisplay, mode->vdisplay,
 					    DRM_FORMAT_XRGB8888,
-					    I915_TILING_NONE,
+					    DRM_FORMAT_MOD_LINEAR,
 					    0.0, 0.0, 0.0, &fb);
 		igt_plane_set_fb(primary, &fb);

@@ -212,7 +212,7 @@ static void test_mode_transition(data_t *data, enum pipe pipe, igt_output_t *out
 	igt_create_color_pattern_fb(display->drm_fd,
 				    mode->hdisplay, mode->vdisplay,
 				    DRM_FORMAT_XRGB8888,
-				    I915_TILING_NONE,
+				    DRM_FORMAT_MOD_LINEAR,
 				    0.0, 0.0, 0.0, &fb);

 	/* switch to lower resolution */
diff --git a/tests/i915/kms_pipe_b_c_ivb.c b/tests/i915/kms_pipe_b_c_ivb.c
index 05ac87702..af11e3262 100644
--- a/tests/i915/kms_pipe_b_c_ivb.c
+++ b/tests/i915/kms_pipe_b_c_ivb.c
@@ -92,7 +92,7 @@ set_mode_on_pipe(data_t *data, enum pipe pipe, igt_output_t *output)

 	fb_id = igt_create_color_fb(data->drm_fd,
 				    mode->hdisplay, mode->vdisplay,
-				    DRM_FORMAT_XRGB8888, I915_TILING_NONE,
+				    DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR,
 				    1.0, 1.0, 1.0, &fb);
 	igt_assert_lte(0, fb_id);

diff --git a/tests/i915/kms_psr_stress_test.c b/tests/i915/kms_psr_stress_test.c
index daac41d44..9b7ddda84 100644
--- a/tests/i915/kms_psr_stress_test.c
+++ b/tests/i915/kms_psr_stress_test.c
@@ -374,4 +374,4 @@ igt_main
 		close(data.debugfs_fd);
 		close(data.drm_fd);
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/kms_addfb_basic.c b/tests/kms_addfb_basic.c
index c58783d54..b4526eee6 100644
--- a/tests/kms_addfb_basic.c
+++ b/tests/kms_addfb_basic.c
@@ -68,10 +68,10 @@ static void invalid_tests(int fd)

 	igt_fixture {
 		gem_bo = igt_create_bo_with_dimensions(fd, 1024, 1024,
-			DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
+			DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, NULL, NULL, NULL);
 		igt_assert(gem_bo);
 		gem_bo_small = igt_create_bo_with_dimensions(fd, 1024, 1023,
-			DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
+			DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, NULL, NULL, NULL);
 		igt_assert(gem_bo_small);

 		f.handles[0] = gem_bo;
@@ -276,7 +276,7 @@ static void pitch_tests(int fd)

 	igt_fixture {
 		gem_bo = igt_create_bo_with_dimensions(fd, 1024, 1024,
-			DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
+			DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, NULL, NULL, NULL);
 		igt_assert(gem_bo);
 	}

@@ -417,10 +417,10 @@ static void size_tests(int fd)
 		igt_display_require(&display, fd);

 		gem_bo = igt_create_bo_with_dimensions(fd, 1024, 1024,
-			DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
+			DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, NULL, NULL, NULL);
 		igt_assert(gem_bo);
 		gem_bo_small = igt_create_bo_with_dimensions(fd, 1024, 1023,
-			DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
+			DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, NULL, NULL, NULL);
 		igt_assert(gem_bo_small);
 	}

@@ -513,7 +513,7 @@ static void addfb25_tests(int fd)

 	igt_fixture {
 		gem_bo = igt_create_bo_with_dimensions(fd, 1024, 1024,
-			DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
+			DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, NULL, NULL, NULL);
 		igt_assert(gem_bo);

 		memset(&f, 0, sizeof(f));
@@ -597,10 +597,10 @@ static void addfb25_ytile(int fd)
 		igt_display_require(&display, fd);

 		gem_bo = igt_create_bo_with_dimensions(fd, 1024, 1024,
-			DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
+			DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, NULL, NULL, NULL);
 		igt_assert(gem_bo);
 		gem_bo_small = igt_create_bo_with_dimensions(fd, 1024, 1023,
-			DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
+			DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, NULL, NULL, NULL);
 		igt_assert(gem_bo_small);

 		memset(&f, 0, sizeof(f));
@@ -670,7 +670,7 @@ static void addfb25_4tile(int fd)
 		igt_display_require(&display, fd);

 		gem_bo = igt_create_bo_with_dimensions(fd, 1024, 1024,
-				DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
+				DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, NULL, NULL, NULL);
 		igt_assert(gem_bo);

 		memset(&f, 0, sizeof(f));
@@ -719,7 +719,7 @@ static void prop_tests(int fd)

 	igt_fixture {
 		gem_bo = igt_create_bo_with_dimensions(fd, 1024, 1024,
-			DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
+			DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, NULL, NULL, NULL);
 		igt_assert(gem_bo);

 		f.handles[0] = gem_bo;
@@ -780,7 +780,7 @@ static void master_tests(int fd)

 	igt_fixture {
 		gem_bo = igt_create_bo_with_dimensions(fd, 1024, 1024,
-			DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
+			DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, NULL, NULL, NULL);
 		igt_assert(gem_bo);

 		f.handles[0] = gem_bo;
diff --git a/tests/kms_atomic.c b/tests/kms_atomic.c
index 2a3fb74be..e7d1cbd75 100644
--- a/tests/kms_atomic.c
+++ b/tests/kms_atomic.c
@@ -305,12 +305,12 @@ plane_primary_overlay_mutable_zpos(igt_pipe_t *pipe, igt_output_t *output,
 	uint32_t h_overlay = mode->vdisplay / 2;

 	igt_create_color_pattern_fb(pipe->display->drm_fd,
-				    w, h, format_primary, I915_TILING_NONE,
+				    w, h, format_primary, DRM_FORMAT_MOD_LINEAR,
 				    0.2, 0.2, 0.2, &fb_primary);

 	igt_create_color_pattern_fb(pipe->display->drm_fd,
 				    w_overlay, h_overlay,
-				    format_overlay, I915_TILING_NONE,
+				    format_overlay, DRM_FORMAT_MOD_LINEAR,
 				    0.2, 0.2, 0.2, &fb_overlay);

 	/* Draw a hole in the overlay */
@@ -404,7 +404,7 @@ plane_immutable_zpos(igt_display_t *display, igt_pipe_t *pipe,
 	igt_create_color_fb(display->drm_fd,
 			    w_lower, h_lower,
 			    DRM_FORMAT_XRGB8888,
-			    I915_TILING_NONE,
+			    DRM_FORMAT_MOD_LINEAR,
 			    0.0, 0.0, 0.0, &fb_ref);

 	/* create reference image */
@@ -444,14 +444,14 @@ plane_immutable_zpos(igt_display_t *display, igt_pipe_t *pipe,
 	fb_id_lower = igt_create_color_fb(display->drm_fd,
 					  w_lower, h_lower,
 					  DRM_FORMAT_XRGB8888,
-					  I915_TILING_NONE,
+					  DRM_FORMAT_MOD_LINEAR,
 					  0.0, 0.0, 1.0, &fb_lower);
 	igt_assert(fb_id_lower);

 	fb_id_upper = igt_create_color_fb(display->drm_fd,
 					  w_upper, h_upper,
 					  DRM_FORMAT_XRGB8888,
-					  I915_TILING_NONE,
+					  DRM_FORMAT_MOD_LINEAR,
 					  1.0, 1.0, 0.0, &fb_upper);
 	igt_assert(fb_id_upper);

@@ -516,7 +516,7 @@ static void plane_overlay(igt_pipe_t *pipe, igt_output_t *output, igt_plane_t *p
 	igt_require(format != 0);

 	igt_create_pattern_fb(pipe->display->drm_fd, w, h,
-			      format, I915_TILING_NONE, &fb);
+			      format, DRM_FORMAT_MOD_LINEAR, &fb);

 	igt_plane_set_fb(plane, &fb);
 	igt_plane_set_position(plane, w/2, h/2);
@@ -551,7 +551,7 @@ static void plane_primary(igt_pipe_t *pipe, igt_plane_t *plane, struct igt_fb *f

 	igt_create_color_pattern_fb(pipe->display->drm_fd,
 				    fb->width, fb->height,
-				    fb->drm_format, I915_TILING_NONE,
+				    fb->drm_format, DRM_FORMAT_MOD_LINEAR,
 				    0.2, 0.2, 0.2, &fb2);

 	/* Flip the primary plane using the atomic API, and double-check
@@ -600,7 +600,7 @@ static void test_only(igt_pipe_t *pipe_obj,

 	igt_create_pattern_fb(pipe_obj->display->drm_fd,
 			     mode->hdisplay, mode->vdisplay,
-			     format, I915_TILING_NONE, &fb);
+			     format, DRM_FORMAT_MOD_LINEAR, &fb);
 	igt_plane_set_fb(primary, &fb);
 	igt_output_set_pipe(output, pipe_obj->pipe);

@@ -737,7 +737,7 @@ static void plane_invalid_params(igt_pipe_t *pipe,
 	/* Create a framebuffer too small for the plane configuration. */
 	igt_create_pattern_fb(pipe->display->drm_fd,
 			      fb->width - 1, fb->height - 1,
-			      fb->drm_format, I915_TILING_NONE, &fb2);
+			      fb->drm_format, DRM_FORMAT_MOD_LINEAR, &fb2);

 	igt_plane_set_prop_value(plane, IGT_PLANE_FB_ID, fb2.fb_id);
 	plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, ENOSPC);
@@ -1072,7 +1072,7 @@ static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt

 	/* Color fb with white rect at center */
 	igt_create_color_fb(pipe->display->drm_fd, fb->width, fb->height,
-			    fb->drm_format, I915_TILING_NONE, 0.2, 0.2, 0.2,
+			    fb->drm_format, DRM_FORMAT_MOD_LINEAR, 0.2, 0.2, 0.2,
 			    &fb_1);
 	cr_1 = igt_get_cairo_ctx(pipe->display->drm_fd, &fb_1);
 	igt_paint_color(cr_1, fb->width/4, fb->height/4, fb->width/2,
@@ -1111,7 +1111,7 @@ static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt
 	 * issue plane update with damage and verify the state.
 	 */
 	igt_create_color_fb(pipe->display->drm_fd, fb->width, fb->height,
-			    fb->drm_format, I915_TILING_NONE, 0.2, 0.2, 0.2,
+			    fb->drm_format, DRM_FORMAT_MOD_LINEAR, 0.2, 0.2, 0.2,
 			    &fb_2);

 	damage[0].x1 = fb->width/2;
@@ -1141,7 +1141,7 @@ static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt
 	/* Reszie fb_1 to be bigger than plane */
 	igt_remove_fb(pipe->display->drm_fd, &fb_1);
 	igt_create_color_fb(pipe->display->drm_fd, fb->width * 2, fb->height,
-			    fb->drm_format, I915_TILING_NONE, 0.2, 0.2, 0.2,
+			    fb->drm_format, DRM_FORMAT_MOD_LINEAR, 0.2, 0.2, 0.2,
 			    &fb_1);

 	damage[0].x1 = fb->width;
diff --git a/tests/kms_atomic_transition.c b/tests/kms_atomic_transition.c
index 64e7e7091..d32be0952 100644
--- a/tests/kms_atomic_transition.c
+++ b/tests/kms_atomic_transition.c
@@ -824,9 +824,9 @@ retry:
 	}

 	igt_create_pattern_fb(data->drm_fd, width, height,
-				   DRM_FORMAT_XRGB8888, 0, &data->fbs[0]);
+				   DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, &data->fbs[0]);
 	igt_create_color_pattern_fb(data->drm_fd, width, height,
-				    DRM_FORMAT_XRGB8888, 0, .5, .5, .5, &data->fbs[1]);
+				    DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, .5, .5, .5, &data->fbs[1]);

 	for_each_pipe(&data->display, i) {
 		igt_pipe_t *pipe = &data->display.pipes[i];
diff --git a/tests/kms_bw.c b/tests/kms_bw.c
index b1dfadd69..b66473e60 100644
--- a/tests/kms_bw.c
+++ b/tests/kms_bw.c
@@ -169,7 +169,7 @@ static void run_test_linear_tiling(data_t *data, int pipe, const drmModeModeInfo

 		igt_create_color_fb(display->drm_fd, mode->hdisplay,
 				    mode->vdisplay, DRM_FORMAT_XRGB8888,
-				    DRM_FORMAT_MOD_NONE, 1.f, 0.f, 0.f,
+				    DRM_FORMAT_MOD_LINEAR, 1.f, 0.f, 0.f,
 				    &buffer[i]);

 		igt_output_set_pipe(output, i);
diff --git a/tests/kms_cursor_legacy.c b/tests/kms_cursor_legacy.c
index feea1ac83..a8862bdfb 100644
--- a/tests/kms_cursor_legacy.c
+++ b/tests/kms_cursor_legacy.c
@@ -193,7 +193,7 @@ static igt_output_t *set_fb_on_crtc(igt_display_t *display, enum pipe pipe, stru

 		igt_create_pattern_fb(display->drm_fd,
 			      mode->hdisplay, mode->vdisplay,
-			      DRM_FORMAT_XRGB8888, I915_TILING_NONE, fb_info);
+			      DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, fb_info);

 		primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
 		igt_plane_set_fb(primary, fb_info);
@@ -386,7 +386,7 @@ static void prepare_flip_test(igt_display_t *display,

 		igt_skip_on(width <= 64 && height <= 64);
 		igt_create_color_fb(display->drm_fd, width, height,
-				    DRM_FORMAT_ARGB8888, 0, 1., 0., .7, cursor_fb2);
+				    DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_LINEAR, 1., 0., .7, cursor_fb2);

 		arg[0].flags = arg[1].flags = DRM_MODE_CURSOR_BO;
 		arg[1].handle = cursor_fb2->gem_handle;
@@ -412,7 +412,7 @@ static void prepare_flip_test(igt_display_t *display,
 		            display->pipes[flip_pipe].planes[1].type != DRM_PLANE_TYPE_CURSOR);

 		igt_create_color_pattern_fb(display->drm_fd, prim_fb->width, prim_fb->height,
-					    DRM_FORMAT_ARGB8888, 0, .1, .1, .1, argb_fb);
+					    DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_LINEAR, .1, .1, .1, argb_fb);
 	}
 }

@@ -458,9 +458,11 @@ static void flip(igt_display_t *display,
 		}
 	}

-	igt_create_color_fb(display->drm_fd, fb_info.width, fb_info.height, DRM_FORMAT_ARGB8888, 0, .5, .5, .5, &cursor_fb);
+	igt_create_color_fb(display->drm_fd, fb_info.width, fb_info.height,
+			    DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_LINEAR, .5, .5, .5, &cursor_fb);

-	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888, 0, 1., 1., 1., &cursor_fb);
+	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888,
+			    DRM_FORMAT_MOD_LINEAR, 1., 1., 1., &cursor_fb);
 	cursor = set_cursor_on_pipe(display, cursor_pipe, &cursor_fb);
 	populate_cursor_args(display, cursor_pipe, arg, &cursor_fb);

@@ -564,7 +566,8 @@ static void basic_flip_cursor(igt_display_t *display,

 	igt_require((output = set_fb_on_crtc(display, pipe, &fb_info)));

-	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888, 0, 1., 1., 1., &cursor_fb);
+	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888,
+			    DRM_FORMAT_MOD_LINEAR, 1., 1., 1., &cursor_fb);
 	cursor = set_cursor_on_pipe(display, pipe, &cursor_fb);
 	populate_cursor_args(display, pipe, arg, &cursor_fb);

@@ -728,7 +731,8 @@ static void flip_vs_cursor(igt_display_t *display, enum flip_test mode, int nloo

 	igt_require((output = set_fb_on_crtc(display, pipe, &fb_info)));

-	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888, 0, 1., 1., 1., &cursor_fb);
+	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888,
+			    DRM_FORMAT_MOD_LINEAR, 1., 1., 1., &cursor_fb);
 	cursor = set_cursor_on_pipe(display, pipe, &cursor_fb);
 	populate_cursor_args(display, pipe, arg, &cursor_fb);

@@ -852,7 +856,8 @@ static void nonblocking_modeset_vs_cursor(igt_display_t *display, int loops)
 	igt_require(display->is_atomic);
 	igt_require((output = set_fb_on_crtc(display, pipe, &fb_info)));
 	primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
-	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888, 0, 1., 1., 1., &cursor_fb);
+	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888,
+			    DRM_FORMAT_MOD_LINEAR, 1., 1., 1., &cursor_fb);
 	cursor = set_cursor_on_pipe(display, pipe, &cursor_fb);
 	populate_cursor_args(display, pipe, arg, &cursor_fb);
 	arg[0].flags |= DRM_MODE_CURSOR_BO;
@@ -972,7 +977,8 @@ static void two_screens_flip_vs_cursor(igt_display_t *display, int nloops, bool
 		igt_require((output2 = set_fb_on_crtc(display, pipe2, &fb2_info)));
 	}

-	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888, 0, 1., 1., 1., &cursor_fb);
+	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888,
+			    DRM_FORMAT_MOD_LINEAR, 1., 1., 1., &cursor_fb);
 	cursor = set_cursor_on_pipe(display, pipe, &cursor_fb);
 	populate_cursor_args(display, pipe, arg1, &cursor_fb);

@@ -1137,7 +1143,8 @@ static void cursor_vs_flip(igt_display_t *display, enum flip_test mode, int nloo
 	igt_require((output = set_fb_on_crtc(display, pipe, &fb_info)));
 	vrefresh = igt_output_get_mode(output)->vrefresh;

-	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888, 0, 1., 1., 1., &cursor_fb);
+	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888,
+			    DRM_FORMAT_MOD_LINEAR, 1., 1., 1., &cursor_fb);
 	cursor = set_cursor_on_pipe(display, pipe, &cursor_fb);
 	populate_cursor_args(display, pipe, arg, &cursor_fb);

@@ -1249,7 +1256,8 @@ static void two_screens_cursor_vs_flip(igt_display_t *display, int nloops, bool
 		igt_require((outputs[1] = set_fb_on_crtc(display, pipe[1], &fb_info[1])));
 	}

-	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888, 0, 1., 1., 1., &cursor_fb);
+	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888,
+			    DRM_FORMAT_MOD_LINEAR, 1., 1., 1., &cursor_fb);

 	cursors[0] = set_cursor_on_pipe(display, pipe[0], &cursor_fb);
 	populate_cursor_args(display, pipe[0], arg[0], &cursor_fb);
@@ -1357,7 +1365,8 @@ static void flip_vs_cursor_crc(igt_display_t *display, bool atomic)

 	igt_require((output = set_fb_on_crtc(display, pipe, &fb_info)));

-	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888, 0, 1., 1., 1., &cursor_fb);
+	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888,
+			    DRM_FORMAT_MOD_LINEAR, 1., 1., 1., &cursor_fb);
 	populate_cursor_args(display, pipe, arg, &cursor_fb);

 	igt_display_commit2(display, display->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
@@ -1430,7 +1439,8 @@ static void flip_vs_cursor_busy_crc(igt_display_t *display, bool atomic)
 	igt_create_color_pattern_fb(display->drm_fd, fb_info[0].width, fb_info[0].height,
 				    DRM_FORMAT_XRGB8888, I915_FORMAT_MOD_X_TILED, .1, .1, .1, &fb_info[1]);

-	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888, 0, 1., 1., 1., &cursor_fb);
+	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888,
+			    DRM_FORMAT_MOD_LINEAR, 1., 1., 1., &cursor_fb);
 	populate_cursor_args(display, pipe, arg, &cursor_fb);

 	igt_display_commit2(display, display->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
diff --git a/tests/kms_display_modes.c b/tests/kms_display_modes.c
index e4191811e..c2e98c3c6 100644
--- a/tests/kms_display_modes.c
+++ b/tests/kms_display_modes.c
@@ -64,9 +64,9 @@ static void run_extendedmode_basic(data_t *data, int pipe1, int pipe2)
 	pipe_crc[1] = igt_pipe_crc_new(data->drm_fd, pipe2, IGT_PIPE_CRC_SOURCE_AUTO);

 	igt_create_color_fb(data->drm_fd, mode[0]->hdisplay, mode[0]->vdisplay,
-			     DRM_FORMAT_XRGB8888, 0, 1, 0, 0, &fbs[0]);
+			    DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 1, 0, 0, &fbs[0]);
 	igt_create_color_fb(data->drm_fd, mode[1]->hdisplay, mode[1]->vdisplay,
-			     DRM_FORMAT_XRGB8888, 0, 0, 0, 1, &fbs[1]);
+			    DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, 0, 1, &fbs[1]);

 	plane[0] = igt_pipe_get_plane_type(&display->pipes[pipe1], DRM_PLANE_TYPE_PRIMARY);
 	plane[1] = igt_pipe_get_plane_type(&display->pipes[pipe2], DRM_PLANE_TYPE_PRIMARY);
@@ -88,7 +88,8 @@ static void run_extendedmode_basic(data_t *data, int pipe1, int pipe2)
 	width = mode[0]->hdisplay + mode[1]->hdisplay;
 	height = max(mode[0]->vdisplay, mode[1]->vdisplay);

-	igt_create_fb(data->drm_fd, width, height, DRM_FORMAT_XRGB8888, 0, &fb);
+	igt_create_fb(data->drm_fd, width, height,
+		      DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, &fb);
 	cr = igt_get_cairo_ctx(data->drm_fd, &fb);
 	igt_paint_color(cr, 0, 0, mode[0]->hdisplay, mode[0]->vdisplay, 1, 0, 0);
 	igt_paint_color(cr, mode[0]->hdisplay, 0, mode[1]->hdisplay, mode[1]->vdisplay, 0, 0, 1);
diff --git a/tests/kms_force_connector_basic.c b/tests/kms_force_connector_basic.c
index cde47e925..4ff1efe3b 100644
--- a/tests/kms_force_connector_basic.c
+++ b/tests/kms_force_connector_basic.c
@@ -68,8 +68,8 @@ static void force_load_detect(int drm_fd, drmModeConnectorPtr connector, drmMode
 	/* No load detect on HDMI. */
 	igt_require(connector->connector_type == DRM_MODE_CONNECTOR_VGA);

-	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_create_fb(drm_fd, w, h, DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, &xrgb_fb);
+	igt_create_fb(drm_fd, w, h, DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_LINEAR, &argb_fb);
 	igt_assert(drmSetClientCap(drm_fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1) == 0);

 	/*
diff --git a/tests/kms_getfb.c b/tests/kms_getfb.c
index 2e4552a0c..813417e77 100644
--- a/tests/kms_getfb.c
+++ b/tests/kms_getfb.c
@@ -174,7 +174,7 @@ static void test_handle_input(int fd)
 		add.pixel_format = DRM_FORMAT_XRGB8888;
 		add.pitches[0] = 1024*4;
 		add.handles[0] = igt_create_bo_with_dimensions(fd, 1024, 1024,
-			DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
+			DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, NULL, NULL, NULL);
 		igt_require(add.handles[0] != 0);
 		do_ioctl(fd, DRM_IOCTL_MODE_ADDFB2, &add);
 	}
@@ -229,7 +229,7 @@ static void test_duplicate_handles(int fd)
 		add.pixel_format = DRM_FORMAT_XRGB8888;
 		add.pitches[0] = 1024*4;
 		add.handles[0] = igt_create_bo_with_dimensions(fd, 1024, 1024,
-			DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
+			DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, NULL, NULL, NULL);
 		igt_assert(add.handles[0]);
 		do_ioctl(fd, DRM_IOCTL_MODE_ADDFB2, &add);
 	}
@@ -296,7 +296,7 @@ static void test_getfb2(int fd)
 		add_basic.pixel_format = DRM_FORMAT_XRGB8888;
 		add_basic.pitches[0] = 1024*4;
 		add_basic.handles[0] = igt_create_bo_with_dimensions(fd, 1024, 1024,
-			DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
+			DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, NULL, NULL, NULL);
 		igt_assert(add_basic.handles[0]);
 		do_ioctl(fd, DRM_IOCTL_MODE_ADDFB2, &add_basic);

@@ -403,7 +403,7 @@ static void test_handle_protection(void) {
 		non_master_add.pixel_format = DRM_FORMAT_XRGB8888;
 		non_master_add.pitches[0] = 1024*4;
 		non_master_add.handles[0] = igt_create_bo_with_dimensions(non_master_fd, 1024, 1024,
-			DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
+			DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, NULL, NULL, NULL);
 		igt_require(non_master_add.handles[0] != 0);
 		do_ioctl(non_master_fd, DRM_IOCTL_MODE_ADDFB2, &non_master_add);
 	}
diff --git a/tests/kms_hdr.c b/tests/kms_hdr.c
index 36669ce81..23f12c14a 100644
--- a/tests/kms_hdr.c
+++ b/tests/kms_hdr.c
@@ -148,7 +148,8 @@ static void test_bpc_switch_on_output(data_t *data, enum pipe pipe,
 	int afb_id, ret;

 	/* 10-bit formats are slow, so limit the size. */
-	afb_id = igt_create_fb(data->fd, 512, 512, DRM_FORMAT_XRGB2101010, 0, &afb);
+	afb_id = igt_create_fb(data->fd, 512, 512,
+			       DRM_FORMAT_XRGB2101010, DRM_FORMAT_MOD_LINEAR, &afb);
 	igt_assert(afb_id);

 	draw_hdr_pattern(&afb);
@@ -396,7 +397,8 @@ static void test_static_toggle(data_t *data, enum pipe pipe,
 	int afb_id;

 	/* 10-bit formats are slow, so limit the size. */
-	afb_id = igt_create_fb(data->fd, 512, 512, DRM_FORMAT_XRGB2101010, 0, &afb);
+	afb_id = igt_create_fb(data->fd, 512, 512,
+			       DRM_FORMAT_XRGB2101010, DRM_FORMAT_MOD_LINEAR, &afb);
 	igt_assert(afb_id);

 	draw_hdr_pattern(&afb);
@@ -478,7 +480,8 @@ static void test_static_swap(data_t *data, enum pipe pipe, igt_output_t *output)
 	struct hdr_output_metadata hdr;

 	/* 10-bit formats are slow, so limit the size. */
-	afb_id = igt_create_fb(data->fd, 512, 512, DRM_FORMAT_XRGB2101010, 0, &afb);
+	afb_id = igt_create_fb(data->fd, 512, 512,
+			       DRM_FORMAT_XRGB2101010, DRM_FORMAT_MOD_LINEAR, &afb);
 	igt_assert(afb_id);

 	draw_hdr_pattern(&afb);
diff --git a/tests/kms_plane_cursor.c b/tests/kms_plane_cursor.c
index 9b27586c1..7a677ebbe 100644
--- a/tests/kms_plane_cursor.c
+++ b/tests/kms_plane_cursor.c
@@ -236,19 +236,19 @@ static void test_cursor(data_t *data, int size, unsigned int flags)

 	test_cleanup(data);

-	igt_create_color_fb(data->drm_fd, sw, sh, DRM_FORMAT_XRGB8888, 0,
-			    1.0, 1.0, 1.0, &data->pfb);
+	igt_create_color_fb(data->drm_fd, sw, sh, DRM_FORMAT_XRGB8888,
+			    DRM_FORMAT_MOD_LINEAR, 1.0, 1.0, 1.0, &data->pfb);

 	if (flags & TEST_OVERLAY) {
 		int width = (flags & TEST_VIEWPORT) ? data->or.w + pad : data->or.w;
 		int height = (flags & TEST_VIEWPORT) ? data->or.h + pad : data->or.h;

-		igt_create_color_fb(data->drm_fd, width, height,
-				    DRM_FORMAT_XRGB8888, 0, 0.5, 0.5, 0.5, &data->ofb);
+		igt_create_color_fb(data->drm_fd, width, height, DRM_FORMAT_XRGB8888,
+				    DRM_FORMAT_MOD_LINEAR, 0.5, 0.5, 0.5, &data->ofb);
 	}

-	igt_create_color_fb(data->drm_fd, size, size, DRM_FORMAT_ARGB8888, 0,
-			    1.0, 0.0, 1.0, &data->cfb);
+	igt_create_color_fb(data->drm_fd, size, size, DRM_FORMAT_ARGB8888,
+			    DRM_FORMAT_MOD_LINEAR, 1.0, 0.0, 1.0, &data->cfb);

 	igt_plane_set_fb(data->primary, &data->pfb);
 	igt_output_set_pipe(data->output, data->pipe_id);
diff --git a/tests/kms_plane_scaling.c b/tests/kms_plane_scaling.c
index c6c6f3ec6..9e45af947 100644
--- a/tests/kms_plane_scaling.c
+++ b/tests/kms_plane_scaling.c
@@ -702,7 +702,7 @@ static void setup_fb(int fd, int width, int height,
 {
 	igt_create_color_pattern_fb(fd, width, height,
 				    DRM_FORMAT_XRGB8888,
-				    I915_TILING_NONE,
+				    DRM_FORMAT_MOD_LINEAR,
 				    r, g, b, fb);
 }

@@ -787,17 +787,17 @@ test_invalid_num_scalers(data_t *d, enum pipe pipe, igt_output_t *output)
 	igt_create_color_pattern_fb(display->drm_fd,
                                     width, height,
                                     DRM_FORMAT_XRGB8888,
-                                    I915_TILING_NONE,
+                                    DRM_FORMAT_MOD_LINEAR,
                                     1.0, 0.0, 0.0, &d->fb[0]);
 	igt_create_color_pattern_fb(display->drm_fd,
                                     width, height,
                                     DRM_FORMAT_XRGB8888,
-                                    I915_TILING_NONE,
+                                    DRM_FORMAT_MOD_LINEAR,
                                     0.0, 1.0, 0.0, &d->fb[1]);
 	igt_create_color_pattern_fb(display->drm_fd,
                                     width, height,
                                     DRM_FORMAT_XRGB8888,
-                                    I915_TILING_NONE,
+                                    DRM_FORMAT_MOD_LINEAR,
                                     0.0, 0.0, 1.0, &d->fb[2]);

 	igt_plane_set_fb(plane[0], &d->fb[0]);
@@ -854,16 +854,16 @@ static void test_scaler_with_multi_pipe_plane(data_t *d)

 	igt_create_pattern_fb(d->drm_fd, 600, 600,
 			      DRM_FORMAT_XRGB8888,
-			      I915_TILING_NONE, &d->fb[0]);
+			      DRM_FORMAT_MOD_LINEAR, &d->fb[0]);
 	igt_create_pattern_fb(d->drm_fd, 500, 500,
 			      DRM_FORMAT_XRGB8888,
-			      I915_TILING_NONE, &d->fb[1]);
+			      DRM_FORMAT_MOD_LINEAR, &d->fb[1]);
 	igt_create_pattern_fb(d->drm_fd, 700, 700,
 			      DRM_FORMAT_XRGB8888,
-			      I915_TILING_NONE, &d->fb[2]);
+			      DRM_FORMAT_MOD_LINEAR, &d->fb[2]);
 	igt_create_pattern_fb(d->drm_fd, 400, 400,
 			      DRM_FORMAT_XRGB8888,
-			      I915_TILING_NONE, &d->fb[3]);
+			      DRM_FORMAT_MOD_LINEAR, &d->fb[3]);

 	igt_plane_set_fb(plane[0], &d->fb[0]);
 	igt_plane_set_fb(plane[1], &d->fb[1]);
@@ -935,7 +935,7 @@ static void invalid_parameter_tests(data_t *d)

 		igt_create_fb(d->drm_fd, 256, 256,
 			      DRM_FORMAT_XRGB8888,
-			      DRM_FORMAT_MOD_NONE,
+			      DRM_FORMAT_MOD_LINEAR,
 			      &fb);
 	}

@@ -1045,7 +1045,7 @@ static void i915_max_source_size_test(data_t *d)

 		igt_create_fb(d->drm_fd, 5120, 4320,
 			      DRM_FORMAT_XRGB8888,
-			      DRM_FORMAT_MOD_NONE,
+			      DRM_FORMAT_MOD_LINEAR,
 			      &fb);
 	}

diff --git a/tests/kms_prime.c b/tests/kms_prime.c
index ad199915b..d2a6503e5 100644
--- a/tests/kms_prime.c
+++ b/tests/kms_prime.c
@@ -119,7 +119,7 @@ static void prepare_scratch(int exporter_fd, struct dumb_bo *scratch,
 					      scratch->size, PROT_WRITE);
 	} else {
 		igt_calc_fb_size(exporter_fd, mode->hdisplay, mode->vdisplay, DRM_FORMAT_XRGB8888,
-				 DRM_FORMAT_MOD_NONE, &scratch->size, &scratch->pitch);
+				 DRM_FORMAT_MOD_LINEAR, &scratch->size, &scratch->pitch);
 		if (gem_has_lmem(exporter_fd))
 			scratch->handle = gem_create_in_memory_regions(exporter_fd, scratch->size,
 								       REGION_LMEM(0), REGION_SMEM);
diff --git a/tests/kms_scaling_modes.c b/tests/kms_scaling_modes.c
index 039e4a8d9..b17d00230 100644
--- a/tests/kms_scaling_modes.c
+++ b/tests/kms_scaling_modes.c
@@ -49,11 +49,11 @@ static void test_scaling_mode_on_output(igt_display_t *display, const enum pipe
 	sprite = igt_output_get_plane_type(output, DRM_PLANE_TYPE_OVERLAY);

 	igt_create_color_fb(display->drm_fd, mode.hdisplay, mode.vdisplay,
-			    DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE,
+			    DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR,
 			    0.f, 0.f, 1.f, &blue);

 	igt_create_color_fb(display->drm_fd, 640, 480,
-			    DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE,
+			    DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR,
 			    1.f, 0.f, 0.f, &red);

 	igt_plane_set_fb(primary, &blue);
diff --git a/tests/kms_universal_plane.c b/tests/kms_universal_plane.c
index dd8fa1937..d38886f39 100644
--- a/tests/kms_universal_plane.c
+++ b/tests/kms_universal_plane.c
@@ -613,7 +613,7 @@ cursor_leak_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
 	/* Black background FB */
 	igt_create_color_fb(data->drm_fd, mode->hdisplay, mode->vdisplay,
 			    DRM_FORMAT_XRGB8888,
-			    false,
+			    DRM_FORMAT_MOD_LINEAR,
 			    0.0, 0.0, 0.0,
 			    &background_fb);

@@ -624,7 +624,7 @@ cursor_leak_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
 		b = rand() % 0xFF;
 		igt_create_color_fb(data->drm_fd, 64, 64,
 				    DRM_FORMAT_ARGB8888,
-				    false,
+				    DRM_FORMAT_MOD_LINEAR,
 				    (double)r / 0xFF,
 				    (double)g / 0xFF,
 				    (double)b / 0xFF,
--
2.39.1

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

* [igt-dev] [i-g-t V2 2/3] tests/i915/kms_ccs: Cleanup to use linear modifier
  2023-03-13 15:14 [igt-dev] [i-g-t V2 1/3] tests/kms: Cleanup to use linear modifier Bhanuprakash Modem
@ 2023-03-13 15:14 ` Bhanuprakash Modem
  2023-03-15 10:25   ` Ville Syrjälä
  2023-03-13 15:14 ` [igt-dev] [i-g-t V2 3/3] tests/kms: Add missing igt_put_cairo_ctx() Bhanuprakash Modem
                   ` (3 subsequent siblings)
  4 siblings, 1 reply; 7+ messages in thread
From: Bhanuprakash Modem @ 2023-03-13 15:14 UTC (permalink / raw)
  To: igt-dev, ville.syrjala

Use either compressed or linear modifier to test. Due to the
lack of available bandwidth, we cannot fit two CCS planes into
the available FIFO configurations.

Cc: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
---
 tests/i915/kms_ccs.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/i915/kms_ccs.c b/tests/i915/kms_ccs.c
index 9be3fa252..18d48fb80 100644
--- a/tests/i915/kms_ccs.c
+++ b/tests/i915/kms_ccs.c
@@ -393,10 +393,8 @@ static void generate_fb(data_t *data, struct igt_fb *fb,
 	 */
 	if (fb_flags & FB_COMPRESSED)
 		modifier = data->ccs_modifier;
-	else if (!(fb_flags & FB_HAS_PLANE))
-		modifier = DRM_FORMAT_MOD_LINEAR;
 	else
-		modifier = 0;
+		modifier = DRM_FORMAT_MOD_LINEAR;
 
 	create_fb_prepare_add(data->drm_fd, width, height,
 			      data->format, modifier,
-- 
2.39.1

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

* [igt-dev] [i-g-t V2 3/3] tests/kms: Add missing igt_put_cairo_ctx()
  2023-03-13 15:14 [igt-dev] [i-g-t V2 1/3] tests/kms: Cleanup to use linear modifier Bhanuprakash Modem
  2023-03-13 15:14 ` [igt-dev] [i-g-t V2 2/3] tests/i915/kms_ccs: " Bhanuprakash Modem
@ 2023-03-13 15:14 ` Bhanuprakash Modem
  2023-03-13 16:49 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,V2,1/3] tests/kms: Cleanup to use linear modifier Patchwork
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 7+ messages in thread
From: Bhanuprakash Modem @ 2023-03-13 15:14 UTC (permalink / raw)
  To: igt-dev, ville.syrjala

Remeber to call igt_put_cairo_ctx() after rendering to make
sure the results actually end up in the framebuffer (in case
the rendering happens to a temporary buffer and there needs
to be a copy back at the end).

Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
---
 tests/kms_async_flips.c | 4 ++++
 tests/kms_lease.c       | 2 +-
 tests/kms_writeback.c   | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/kms_async_flips.c b/tests/kms_async_flips.c
index 55be0bd87..34808f401 100644
--- a/tests/kms_async_flips.c
+++ b/tests/kms_async_flips.c
@@ -494,9 +494,11 @@ static void test_crc(data_t *data)
 
 	cr = igt_get_cairo_ctx(data->drm_fd, &data->bufs[frame]);
 	igt_paint_color(cr, 0, 0, data->bufs[frame].width, data->bufs[frame].height, 1.0, 0.0, 0.0);
+	igt_put_cairo_ctx(cr);
 
 	cr = igt_get_cairo_ctx(data->drm_fd, &data->bufs[!frame]);
 	igt_paint_color(cr, 0, 0, data->bufs[!frame].width, data->bufs[!frame].height, 1.0, 0.0, 0.0);
+	igt_put_cairo_ctx(cr);
 
 	ret = drmModeSetCrtc(data->drm_fd, data->crtc_id, data->bufs[frame].fb_id, 0, 0,
 			     &data->output->config.connector->connector_id, 1,
@@ -518,6 +520,7 @@ static void test_crc(data_t *data)
 		/* fill the next fb with the expected color */
 		cr = igt_get_cairo_ctx(data->drm_fd, &data->bufs[frame]);
 		igt_paint_color(cr, 0, 0, 1, data->bufs[frame].height, 1.0, 0.0, 0.0);
+		igt_put_cairo_ctx(cr);
 
 		data->flip_pending = true;
 		ret = drmModePageFlip(data->drm_fd, data->crtc_id, data->bufs[frame].fb_id,
@@ -530,6 +533,7 @@ static void test_crc(data_t *data)
 		frame = !frame;
 		cr = igt_get_cairo_ctx(data->drm_fd, &data->bufs[frame]);
 		igt_paint_color_rand(cr, 0, 0, 1, data->bufs[frame].height);
+		igt_put_cairo_ctx(cr);
 	}
 
 	igt_pipe_crc_stop(data->pipe_crc);
diff --git a/tests/kms_lease.c b/tests/kms_lease.c
index 7eab77078..b9b669420 100644
--- a/tests/kms_lease.c
+++ b/tests/kms_lease.c
@@ -207,7 +207,7 @@ static int paint_fb(int drm_fd, struct igt_fb *fb, const char *test_name,
 	igt_cairo_printf_line(cr, align_hcenter, 10, "%s", connector_str);
 	igt_cairo_printf_line(cr, align_hcenter, 10, "%s", pipe_str);
 
-	cairo_destroy(cr);
+	igt_put_cairo_ctx(cr);
 
 	return 0;
 }
diff --git a/tests/kms_writeback.c b/tests/kms_writeback.c
index 9d1345857..c4808b02c 100644
--- a/tests/kms_writeback.c
+++ b/tests/kms_writeback.c
@@ -414,6 +414,7 @@ static void commit_and_dump_fb(igt_display_t *display, igt_output_t *output, igt
 	snprintf(filepath_out, PATH_MAX, "%s/%s.png", path_name, file_name);
 	status = cairo_surface_write_to_png(fb_surface_out, filepath_out);
 	igt_assert_eq(status, CAIRO_STATUS_SUCCESS);
+	cairo_surface_destroy(fb_surface_out);
 
 	igt_remove_fb(display->drm_fd, &output_fb);
 }
-- 
2.39.1

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

* [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,V2,1/3] tests/kms: Cleanup to use linear modifier
  2023-03-13 15:14 [igt-dev] [i-g-t V2 1/3] tests/kms: Cleanup to use linear modifier Bhanuprakash Modem
  2023-03-13 15:14 ` [igt-dev] [i-g-t V2 2/3] tests/i915/kms_ccs: " Bhanuprakash Modem
  2023-03-13 15:14 ` [igt-dev] [i-g-t V2 3/3] tests/kms: Add missing igt_put_cairo_ctx() Bhanuprakash Modem
@ 2023-03-13 16:49 ` Patchwork
  2023-03-14 19:43 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
  2023-03-15 10:01 ` [igt-dev] [i-g-t V2 1/3] " Juha-Pekka Heikkila
  4 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2023-03-13 16:49 UTC (permalink / raw)
  To: Bhanuprakash Modem; +Cc: igt-dev

[-- Attachment #1: Type: text/plain, Size: 4452 bytes --]

== Series Details ==

Series: series starting with [i-g-t,V2,1/3] tests/kms: Cleanup to use linear modifier
URL   : https://patchwork.freedesktop.org/series/115068/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_12853 -> IGTPW_8596
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/index.html

Participating hosts (39 -> 37)
------------------------------

  Missing    (2): fi-kbl-soraka bat-atsm-1 

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

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

### IGT changes ###

#### Issues hit ####

  * igt@i915_selftest@live@slpc:
    - bat-rpls-2:         NOTRUN -> [DMESG-FAIL][1] ([i915#6367] / [i915#7913] / [i915#7996])
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/bat-rpls-2/igt@i915_selftest@live@slpc.html

  * igt@kms_chamelium_hpd@common-hpd-after-suspend:
    - bat-rpls-2:         NOTRUN -> [SKIP][2] ([i915#7828])
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/bat-rpls-2/igt@kms_chamelium_hpd@common-hpd-after-suspend.html
    - bat-rpls-1:         NOTRUN -> [SKIP][3] ([i915#7828])
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/bat-rpls-1/igt@kms_chamelium_hpd@common-hpd-after-suspend.html

  * igt@kms_pipe_crc_basic@suspend-read-crc:
    - bat-rpls-1:         NOTRUN -> [SKIP][4] ([i915#1845])
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/bat-rpls-1/igt@kms_pipe_crc_basic@suspend-read-crc.html
    - bat-rpls-2:         NOTRUN -> [SKIP][5] ([i915#1845])
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/bat-rpls-2/igt@kms_pipe_crc_basic@suspend-read-crc.html

  
#### Possible fixes ####

  * igt@gem_exec_suspend@basic-s3@smem:
    - bat-rpls-1:         [ABORT][6] ([i915#6687] / [i915#7978]) -> [PASS][7]
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/bat-rpls-1/igt@gem_exec_suspend@basic-s3@smem.html
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/bat-rpls-1/igt@gem_exec_suspend@basic-s3@smem.html

  * igt@i915_selftest@live@dmabuf:
    - fi-bsw-nick:        [DMESG-FAIL][8] ([i915#7562] / [i915#7913]) -> [PASS][9]
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/fi-bsw-nick/igt@i915_selftest@live@dmabuf.html
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/fi-bsw-nick/igt@i915_selftest@live@dmabuf.html

  * igt@i915_selftest@live@hangcheck:
    - fi-skl-guc:         [DMESG-WARN][10] ([i915#8073]) -> [PASS][11]
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/fi-skl-guc/igt@i915_selftest@live@hangcheck.html
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/fi-skl-guc/igt@i915_selftest@live@hangcheck.html

  * igt@i915_selftest@live@requests:
    - bat-rpls-2:         [ABORT][12] ([i915#4983] / [i915#7694] / [i915#7913]) -> [PASS][13]
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/bat-rpls-2/igt@i915_selftest@live@requests.html
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/bat-rpls-2/igt@i915_selftest@live@requests.html

  
  [i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
  [i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
  [i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
  [i915#6687]: https://gitlab.freedesktop.org/drm/intel/issues/6687
  [i915#7562]: https://gitlab.freedesktop.org/drm/intel/issues/7562
  [i915#7694]: https://gitlab.freedesktop.org/drm/intel/issues/7694
  [i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
  [i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
  [i915#7978]: https://gitlab.freedesktop.org/drm/intel/issues/7978
  [i915#7996]: https://gitlab.freedesktop.org/drm/intel/issues/7996
  [i915#8073]: https://gitlab.freedesktop.org/drm/intel/issues/8073


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

  * CI: CI-20190529 -> None
  * IGT: IGT_7192 -> IGTPW_8596

  CI-20190529: 20190529
  CI_DRM_12853: 7cfe22e6f72f5328dded16b38e215ff290e8d7f8 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_8596: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/index.html
  IGT_7192: 18beb515ff127e64302a491ed321125b5116aa23 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git


Testlist changes
----------------

-igt@kms_dirtyfb@dirtyfb-ioctl

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/index.html

[-- Attachment #2: Type: text/html, Size: 5510 bytes --]

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

* [igt-dev] ✓ Fi.CI.IGT: success for series starting with [i-g-t,V2,1/3] tests/kms: Cleanup to use linear modifier
  2023-03-13 15:14 [igt-dev] [i-g-t V2 1/3] tests/kms: Cleanup to use linear modifier Bhanuprakash Modem
                   ` (2 preceding siblings ...)
  2023-03-13 16:49 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,V2,1/3] tests/kms: Cleanup to use linear modifier Patchwork
@ 2023-03-14 19:43 ` Patchwork
  2023-03-15 10:01 ` [igt-dev] [i-g-t V2 1/3] " Juha-Pekka Heikkila
  4 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2023-03-14 19:43 UTC (permalink / raw)
  To: Bhanuprakash Modem; +Cc: igt-dev

[-- Attachment #1: Type: text/plain, Size: 25193 bytes --]

== Series Details ==

Series: series starting with [i-g-t,V2,1/3] tests/kms: Cleanup to use linear modifier
URL   : https://patchwork.freedesktop.org/series/115068/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_12853_full -> IGTPW_8596_full
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/index.html

Participating hosts (8 -> 8)
------------------------------

  No changes in participating hosts

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

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

### IGT changes ###

#### Issues hit ####

  * igt@gem_exec_fair@basic-none-share@rcs0:
    - shard-glk:          [PASS][1] -> [FAIL][2] ([i915#2842])
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-glk5/igt@gem_exec_fair@basic-none-share@rcs0.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-glk8/igt@gem_exec_fair@basic-none-share@rcs0.html

  * igt@kms_cursor_crc@cursor-offscreen-32x32:
    - shard-snb:          NOTRUN -> [SKIP][3] ([fdo#109271]) +34 similar issues
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-snb2/igt@kms_cursor_crc@cursor-offscreen-32x32.html

  * igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
    - shard-glk:          [PASS][4] -> [FAIL][5] ([i915#2346]) +1 similar issue
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-glk6/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-glk3/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions.html

  
#### Possible fixes ####

  * igt@drm_fdinfo@virtual-idle:
    - {shard-rkl}:        [FAIL][6] ([i915#7742]) -> [PASS][7]
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-rkl-4/igt@drm_fdinfo@virtual-idle.html
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-rkl-2/igt@drm_fdinfo@virtual-idle.html

  * igt@dumb_buffer@create-clear:
    - {shard-tglu}:       [INCOMPLETE][8] -> [PASS][9]
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-tglu-4/igt@dumb_buffer@create-clear.html
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-tglu-5/igt@dumb_buffer@create-clear.html

  * igt@fbdev@pan:
    - {shard-rkl}:        [SKIP][10] ([i915#2582]) -> [PASS][11]
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-rkl-2/igt@fbdev@pan.html
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-rkl-6/igt@fbdev@pan.html

  * igt@fbdev@write:
    - {shard-tglu}:       [SKIP][12] ([i915#2582]) -> [PASS][13]
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-tglu-6/igt@fbdev@write.html
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-tglu-8/igt@fbdev@write.html

  * igt@gem_ctx_persistence@engines-hang@bcs0:
    - {shard-rkl}:        [SKIP][14] ([i915#6252]) -> [PASS][15]
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-rkl-5/igt@gem_ctx_persistence@engines-hang@bcs0.html
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-rkl-6/igt@gem_ctx_persistence@engines-hang@bcs0.html

  * igt@gem_eio@reset-stress:
    - {shard-dg1}:        [FAIL][16] ([i915#5784]) -> [PASS][17]
   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-dg1-17/igt@gem_eio@reset-stress.html
   [17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-dg1-13/igt@gem_eio@reset-stress.html

  * igt@gem_exec_fair@basic-deadline:
    - {shard-rkl}:        [FAIL][18] ([i915#2846]) -> [PASS][19]
   [18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-rkl-6/igt@gem_exec_fair@basic-deadline.html
   [19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-rkl-4/igt@gem_exec_fair@basic-deadline.html

  * igt@gem_exec_fair@basic-none-rrul@rcs0:
    - shard-glk:          [FAIL][20] ([i915#2842]) -> [PASS][21] +1 similar issue
   [20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-glk3/igt@gem_exec_fair@basic-none-rrul@rcs0.html
   [21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-glk7/igt@gem_exec_fair@basic-none-rrul@rcs0.html

  * igt@gem_exec_fair@basic-none@vcs0:
    - {shard-rkl}:        [FAIL][22] ([i915#2842]) -> [PASS][23] +3 similar issues
   [22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-rkl-4/igt@gem_exec_fair@basic-none@vcs0.html
   [23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-rkl-5/igt@gem_exec_fair@basic-none@vcs0.html

  * igt@gem_exec_reloc@basic-gtt-cpu:
    - {shard-rkl}:        [SKIP][24] ([i915#3281]) -> [PASS][25] +6 similar issues
   [24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-rkl-6/igt@gem_exec_reloc@basic-gtt-cpu.html
   [25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-rkl-5/igt@gem_exec_reloc@basic-gtt-cpu.html

  * igt@gem_lmem_swapping@smem-oom@lmem0:
    - {shard-dg1}:        [DMESG-WARN][26] ([i915#4936]) -> [PASS][27]
   [26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-dg1-14/igt@gem_lmem_swapping@smem-oom@lmem0.html
   [27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-dg1-16/igt@gem_lmem_swapping@smem-oom@lmem0.html

  * igt@gem_mmap_gtt@fault-concurrent-y:
    - shard-snb:          [ABORT][28] ([i915#5161]) -> [PASS][29]
   [28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-snb4/igt@gem_mmap_gtt@fault-concurrent-y.html
   [29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-snb2/igt@gem_mmap_gtt@fault-concurrent-y.html

  * igt@gem_partial_pwrite_pread@writes-after-reads:
    - {shard-rkl}:        [SKIP][30] ([i915#3282]) -> [PASS][31] +4 similar issues
   [30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-rkl-2/igt@gem_partial_pwrite_pread@writes-after-reads.html
   [31]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-rkl-5/igt@gem_partial_pwrite_pread@writes-after-reads.html

  * igt@gem_workarounds@suspend-resume-fd:
    - {shard-rkl}:        [FAIL][32] ([fdo#103375]) -> [PASS][33]
   [32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-rkl-3/igt@gem_workarounds@suspend-resume-fd.html
   [33]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-rkl-4/igt@gem_workarounds@suspend-resume-fd.html

  * igt@gen9_exec_parse@bb-chained:
    - {shard-rkl}:        [SKIP][34] ([i915#2527]) -> [PASS][35] +2 similar issues
   [34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-rkl-4/igt@gen9_exec_parse@bb-chained.html
   [35]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-rkl-5/igt@gen9_exec_parse@bb-chained.html

  * igt@i915_pm_dc@dc6-dpms:
    - {shard-tglu}:       [FAIL][36] ([i915#3989] / [i915#454]) -> [PASS][37]
   [36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-tglu-8/igt@i915_pm_dc@dc6-dpms.html
   [37]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-tglu-2/igt@i915_pm_dc@dc6-dpms.html

  * igt@i915_pm_rpm@modeset-lpsp-stress:
    - {shard-tglu}:       [SKIP][38] ([i915#1397]) -> [PASS][39]
   [38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-tglu-6/igt@i915_pm_rpm@modeset-lpsp-stress.html
   [39]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-tglu-7/igt@i915_pm_rpm@modeset-lpsp-stress.html

  * igt@i915_pm_rpm@modeset-non-lpsp-stress:
    - {shard-dg1}:        [SKIP][40] ([i915#1397]) -> [PASS][41]
   [40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-dg1-14/igt@i915_pm_rpm@modeset-non-lpsp-stress.html
   [41]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-dg1-18/igt@i915_pm_rpm@modeset-non-lpsp-stress.html

  * igt@i915_pm_rpm@system-suspend-modeset:
    - {shard-rkl}:        [SKIP][42] ([fdo#109308]) -> [PASS][43] +1 similar issue
   [42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-rkl-3/igt@i915_pm_rpm@system-suspend-modeset.html
   [43]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-rkl-6/igt@i915_pm_rpm@system-suspend-modeset.html

  * igt@kms_cursor_legacy@cursor-vs-flip-atomic:
    - {shard-tglu}:       [SKIP][44] ([i915#1845]) -> [PASS][45] +4 similar issues
   [44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-tglu-6/igt@kms_cursor_legacy@cursor-vs-flip-atomic.html
   [45]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-tglu-3/igt@kms_cursor_legacy@cursor-vs-flip-atomic.html

  * igt@kms_cursor_legacy@flip-vs-cursor-crc-legacy:
    - {shard-tglu}:       [SKIP][46] ([i915#1845] / [i915#7651]) -> [PASS][47] +35 similar issues
   [46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-tglu-6/igt@kms_cursor_legacy@flip-vs-cursor-crc-legacy.html
   [47]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-tglu-4/igt@kms_cursor_legacy@flip-vs-cursor-crc-legacy.html

  * igt@kms_cursor_legacy@short-flip-before-cursor-toggle:
    - {shard-rkl}:        [SKIP][48] ([i915#1845] / [i915#4098]) -> [PASS][49] +21 similar issues
   [48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-rkl-1/igt@kms_cursor_legacy@short-flip-before-cursor-toggle.html
   [49]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-rkl-6/igt@kms_cursor_legacy@short-flip-before-cursor-toggle.html

  * igt@kms_fbcon_fbt@fbc-suspend:
    - {shard-rkl}:        [SKIP][50] ([i915#4098]) -> [PASS][51]
   [50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-rkl-3/igt@kms_fbcon_fbt@fbc-suspend.html
   [51]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-rkl-6/igt@kms_fbcon_fbt@fbc-suspend.html

  * igt@kms_flip@2x-plain-flip-ts-check-interruptible@ac-hdmi-a1-hdmi-a2:
    - shard-glk:          [FAIL][52] ([i915#2122]) -> [PASS][53]
   [52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-glk7/igt@kms_flip@2x-plain-flip-ts-check-interruptible@ac-hdmi-a1-hdmi-a2.html
   [53]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-glk4/igt@kms_flip@2x-plain-flip-ts-check-interruptible@ac-hdmi-a1-hdmi-a2.html

  * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-pwrite:
    - {shard-rkl}:        [SKIP][54] ([i915#1849] / [i915#4098]) -> [PASS][55] +11 similar issues
   [54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-rkl-3/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-pwrite.html
   [55]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-rkl-6/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-pwrite.html

  * igt@kms_plane@plane-panning-bottom-right@pipe-a-planes:
    - {shard-tglu}:       [SKIP][56] ([i915#1849] / [i915#3558]) -> [PASS][57] +1 similar issue
   [56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-tglu-6/igt@kms_plane@plane-panning-bottom-right@pipe-a-planes.html
   [57]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-tglu-8/igt@kms_plane@plane-panning-bottom-right@pipe-a-planes.html

  * igt@kms_properties@crtc-properties-atomic:
    - {shard-tglu}:       [SKIP][58] ([i915#1849]) -> [PASS][59] +7 similar issues
   [58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-tglu-9/igt@kms_properties@crtc-properties-atomic.html
   [59]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-tglu-5/igt@kms_properties@crtc-properties-atomic.html

  * igt@kms_properties@plane-properties-atomic:
    - {shard-rkl}:        [SKIP][60] ([i915#1849]) -> [PASS][61] +3 similar issues
   [60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-rkl-2/igt@kms_properties@plane-properties-atomic.html
   [61]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-rkl-6/igt@kms_properties@plane-properties-atomic.html

  * igt@kms_psr@primary_mmap_gtt:
    - {shard-rkl}:        [SKIP][62] ([i915#1072]) -> [PASS][63] +2 similar issues
   [62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-rkl-5/igt@kms_psr@primary_mmap_gtt.html
   [63]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-rkl-6/igt@kms_psr@primary_mmap_gtt.html

  * igt@kms_universal_plane@universal-plane-pageflip-windowed-pipe-a:
    - {shard-rkl}:        [SKIP][64] ([i915#4070] / [i915#4098]) -> [PASS][65]
   [64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-rkl-1/igt@kms_universal_plane@universal-plane-pageflip-windowed-pipe-a.html
   [65]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-rkl-6/igt@kms_universal_plane@universal-plane-pageflip-windowed-pipe-a.html

  * igt@kms_universal_plane@universal-plane-pipe-c-sanity:
    - {shard-tglu}:       [SKIP][66] ([fdo#109274]) -> [PASS][67] +2 similar issues
   [66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-tglu-9/igt@kms_universal_plane@universal-plane-pipe-c-sanity.html
   [67]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-tglu-2/igt@kms_universal_plane@universal-plane-pipe-c-sanity.html

  * igt@perf@gen12-mi-rpc:
    - {shard-rkl}:        [SKIP][68] ([fdo#109289]) -> [PASS][69]
   [68]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-rkl-5/igt@perf@gen12-mi-rpc.html
   [69]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-rkl-6/igt@perf@gen12-mi-rpc.html

  * igt@perf@mi-rpc:
    - {shard-rkl}:        [SKIP][70] ([i915#2434]) -> [PASS][71]
   [70]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-rkl-3/igt@perf@mi-rpc.html
   [71]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-rkl-5/igt@perf@mi-rpc.html

  * igt@perf@polling-small-buf:
    - {shard-rkl}:        [FAIL][72] ([i915#1722]) -> [PASS][73]
   [72]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-rkl-1/igt@perf@polling-small-buf.html
   [73]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-rkl-5/igt@perf@polling-small-buf.html

  * igt@prime_vgem@basic-fence-read:
    - {shard-rkl}:        [SKIP][74] ([fdo#109295] / [i915#3291] / [i915#3708]) -> [PASS][75]
   [74]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12853/shard-rkl-6/igt@prime_vgem@basic-fence-read.html
   [75]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/shard-rkl-5/igt@prime_vgem@basic-fence-read.html

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

  [fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
  [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
  [fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
  [fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
  [fdo#109283]: https://bugs.freedesktop.org/show_bug.cgi?id=109283
  [fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
  [fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
  [fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
  [fdo#109307]: https://bugs.freedesktop.org/show_bug.cgi?id=109307
  [fdo#109308]: https://bugs.freedesktop.org/show_bug.cgi?id=109308
  [fdo#109312]: https://bugs.freedesktop.org/show_bug.cgi?id=109312
  [fdo#109313]: https://bugs.freedesktop.org/show_bug.cgi?id=109313
  [fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
  [fdo#109506]: https://bugs.freedesktop.org/show_bug.cgi?id=109506
  [fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
  [fdo#110723]: https://bugs.freedesktop.org/show_bug.cgi?id=110723
  [fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
  [fdo#111614]: https://bugs.freedesktop.org/show_bug.cgi?id=111614
  [fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
  [fdo#111644]: https://bugs.freedesktop.org/show_bug.cgi?id=111644
  [fdo#111656]: https://bugs.freedesktop.org/show_bug.cgi?id=111656
  [fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
  [fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
  [fdo#112054]: https://bugs.freedesktop.org/show_bug.cgi?id=112054
  [i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
  [i915#1257]: https://gitlab.freedesktop.org/drm/intel/issues/1257
  [i915#132]: https://gitlab.freedesktop.org/drm/intel/issues/132
  [i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
  [i915#1722]: https://gitlab.freedesktop.org/drm/intel/issues/1722
  [i915#1825]: https://gitlab.freedesktop.org/drm/intel/issues/1825
  [i915#1839]: https://gitlab.freedesktop.org/drm/intel/issues/1839
  [i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
  [i915#1849]: https://gitlab.freedesktop.org/drm/intel/issues/1849
  [i915#1937]: https://gitlab.freedesktop.org/drm/intel/issues/1937
  [i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
  [i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
  [i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
  [i915#2434]: https://gitlab.freedesktop.org/drm/intel/issues/2434
  [i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
  [i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
  [i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
  [i915#2587]: https://gitlab.freedesktop.org/drm/intel/issues/2587
  [i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
  [i915#2705]: https://gitlab.freedesktop.org/drm/intel/issues/2705
  [i915#280]: https://gitlab.freedesktop.org/drm/intel/issues/280
  [i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
  [i915#2846]: https://gitlab.freedesktop.org/drm/intel/issues/2846
  [i915#2856]: https://gitlab.freedesktop.org/drm/intel/issues/2856
  [i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
  [i915#3116]: https://gitlab.freedesktop.org/drm/intel/issues/3116
  [i915#315]: https://gitlab.freedesktop.org/drm/intel/issues/315
  [i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281
  [i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
  [i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
  [i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
  [i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299
  [i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
  [i915#3318]: https://gitlab.freedesktop.org/drm/intel/issues/3318
  [i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359
  [i915#3458]: https://gitlab.freedesktop.org/drm/intel/issues/3458
  [i915#3528]: https://gitlab.freedesktop.org/drm/intel/issues/3528
  [i915#3539]: https://gitlab.freedesktop.org/drm/intel/issues/3539
  [i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
  [i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
  [i915#3558]: https://gitlab.freedesktop.org/drm/intel/issues/3558
  [i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
  [i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638
  [i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
  [i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
  [i915#3734]: https://gitlab.freedesktop.org/drm/intel/issues/3734
  [i915#3742]: https://gitlab.freedesktop.org/drm/intel/issues/3742
  [i915#3804]: https://gitlab.freedesktop.org/drm/intel/issues/3804
  [i915#3825]: https://gitlab.freedesktop.org/drm/intel/issues/3825
  [i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
  [i915#3955]: https://gitlab.freedesktop.org/drm/intel/issues/3955
  [i915#3989]: https://gitlab.freedesktop.org/drm/intel/issues/3989
  [i915#404]: https://gitlab.freedesktop.org/drm/intel/issues/404
  [i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
  [i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
  [i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
  [i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
  [i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
  [i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
  [i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
  [i915#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212
  [i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
  [i915#4525]: https://gitlab.freedesktop.org/drm/intel/issues/4525
  [i915#4538]: https://gitlab.freedesktop.org/drm/intel/issues/4538
  [i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
  [i915#4565]: https://gitlab.freedesktop.org/drm/intel/issues/4565
  [i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
  [i915#4767]: https://gitlab.freedesktop.org/drm/intel/issues/4767
  [i915#4771]: https://gitlab.freedesktop.org/drm/intel/issues/4771
  [i915#4812]: https://gitlab.freedesktop.org/drm/intel/issues/4812
  [i915#4818]: https://gitlab.freedesktop.org/drm/intel/issues/4818
  [i915#4833]: https://gitlab.freedesktop.org/drm/intel/issues/4833
  [i915#4852]: https://gitlab.freedesktop.org/drm/intel/issues/4852
  [i915#4859]: https://gitlab.freedesktop.org/drm/intel/issues/4859
  [i915#4860]: https://gitlab.freedesktop.org/drm/intel/issues/4860
  [i915#4879]: https://gitlab.freedesktop.org/drm/intel/issues/4879
  [i915#4880]: https://gitlab.freedesktop.org/drm/intel/issues/4880
  [i915#4936]: https://gitlab.freedesktop.org/drm/intel/issues/4936
  [i915#4958]: https://gitlab.freedesktop.org/drm/intel/issues/4958
  [i915#5122]: https://gitlab.freedesktop.org/drm/intel/issues/5122
  [i915#5161]: https://gitlab.freedesktop.org/drm/intel/issues/5161
  [i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
  [i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
  [i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
  [i915#5288]: https://gitlab.freedesktop.org/drm/intel/issues/5288
  [i915#5289]: https://gitlab.freedesktop.org/drm/intel/issues/5289
  [i915#5325]: https://gitlab.freedesktop.org/drm/intel/issues/5325
  [i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
  [i915#5439]: https://gitlab.freedesktop.org/drm/intel/issues/5439
  [i915#5563]: https://gitlab.freedesktop.org/drm/intel/issues/5563
  [i915#5784]: https://gitlab.freedesktop.org/drm/intel/issues/5784
  [i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
  [i915#6117]: https://gitlab.freedesktop.org/drm/intel/issues/6117
  [i915#6227]: https://gitlab.freedesktop.org/drm/intel/issues/6227
  [i915#6230]: https://gitlab.freedesktop.org/drm/intel/issues/6230
  [i915#6247]: https://gitlab.freedesktop.org/drm/intel/issues/6247
  [i915#6248]: https://gitlab.freedesktop.org/drm/intel/issues/6248
  [i915#6252]: https://gitlab.freedesktop.org/drm/intel/issues/6252
  [i915#6301]: https://gitlab.freedesktop.org/drm/intel/issues/6301
  [i915#6334]: https://gitlab.freedesktop.org/drm/intel/issues/6334
  [i915#6497]: https://gitlab.freedesktop.org/drm/intel/issues/6497
  [i915#6524]: https://gitlab.freedesktop.org/drm/intel/issues/6524
  [i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
  [i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621
  [i915#6768]: https://gitlab.freedesktop.org/drm/intel/issues/6768
  [i915#6944]: https://gitlab.freedesktop.org/drm/intel/issues/6944
  [i915#6946]: https://gitlab.freedesktop.org/drm/intel/issues/6946
  [i915#6953]: https://gitlab.freedesktop.org/drm/intel/issues/6953
  [i915#7116]: https://gitlab.freedesktop.org/drm/intel/issues/7116
  [i915#7118]: https://gitlab.freedesktop.org/drm/intel/issues/7118
  [i915#7128]: https://gitlab.freedesktop.org/drm/intel/issues/7128
  [i915#7276]: https://gitlab.freedesktop.org/drm/intel/issues/7276
  [i915#7294]: https://gitlab.freedesktop.org/drm/intel/issues/7294
  [i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561
  [i915#7651]: https://gitlab.freedesktop.org/drm/intel/issues/7651
  [i915#7697]: https://gitlab.freedesktop.org/drm/intel/issues/7697
  [i915#7701]: https://gitlab.freedesktop.org/drm/intel/issues/7701
  [i915#7711]: https://gitlab.freedesktop.org/drm/intel/issues/7711
  [i915#7742]: https://gitlab.freedesktop.org/drm/intel/issues/7742
  [i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
  [i915#7949]: https://gitlab.freedesktop.org/drm/intel/issues/7949
  [i915#7957]: https://gitlab.freedesktop.org/drm/intel/issues/7957
  [i915#7975]: https://gitlab.freedesktop.org/drm/intel/issues/7975
  [i915#8150]: https://gitlab.freedesktop.org/drm/intel/issues/8150
  [i915#8152]: https://gitlab.freedesktop.org/drm/intel/issues/8152
  [i915#8154]: https://gitlab.freedesktop.org/drm/intel/issues/8154
  [i915#8228]: https://gitlab.freedesktop.org/drm/intel/issues/8228
  [i915#8282]: https://gitlab.freedesktop.org/drm/intel/issues/8282


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

  * CI: CI-20190529 -> None
  * IGT: IGT_7192 -> IGTPW_8596
  * Piglit: piglit_4509 -> None

  CI-20190529: 20190529
  CI_DRM_12853: 7cfe22e6f72f5328dded16b38e215ff290e8d7f8 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_8596: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/index.html
  IGT_7192: 18beb515ff127e64302a491ed321125b5116aa23 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
  piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_8596/index.html

[-- Attachment #2: Type: text/html, Size: 19468 bytes --]

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

* Re: [igt-dev] [i-g-t V2 1/3] tests/kms: Cleanup to use linear modifier
  2023-03-13 15:14 [igt-dev] [i-g-t V2 1/3] tests/kms: Cleanup to use linear modifier Bhanuprakash Modem
                   ` (3 preceding siblings ...)
  2023-03-14 19:43 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
@ 2023-03-15 10:01 ` Juha-Pekka Heikkila
  4 siblings, 0 replies; 7+ messages in thread
From: Juha-Pekka Heikkila @ 2023-03-15 10:01 UTC (permalink / raw)
  To: Bhanuprakash Modem, igt-dev, ville.syrjala

Look ok to me. Series is

Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>

On 13.3.2023 17.14, Bhanuprakash Modem wrote:
> While creating the framebuffer use the default modifier as
> DRM_FORMAT_MOD_LINEAR instead of using deprecated modifiers,
> magic numbers, no_tiling modifier etc..
> 
> V2: - New patch for cairo fix (Ville)
>      - Update commit message
> V3: - New patch for kms_ccs (Ville)
> 
> Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
> ---
>   tests/i915/kms_cdclk.c            |  4 ++--
>   tests/i915/kms_pipe_b_c_ivb.c     |  2 +-
>   tests/i915/kms_psr_stress_test.c  |  2 +-
>   tests/kms_addfb_basic.c           | 22 +++++++++----------
>   tests/kms_atomic.c                | 24 ++++++++++-----------
>   tests/kms_atomic_transition.c     |  4 ++--
>   tests/kms_bw.c                    |  2 +-
>   tests/kms_cursor_legacy.c         | 36 ++++++++++++++++++++-----------
>   tests/kms_display_modes.c         |  7 +++---
>   tests/kms_force_connector_basic.c |  4 ++--
>   tests/kms_getfb.c                 |  8 +++----
>   tests/kms_hdr.c                   |  9 +++++---
>   tests/kms_plane_cursor.c          | 12 +++++------
>   tests/kms_plane_scaling.c         | 20 ++++++++---------
>   tests/kms_prime.c                 |  2 +-
>   tests/kms_scaling_modes.c         |  4 ++--
>   tests/kms_universal_plane.c       |  4 ++--
>   17 files changed, 90 insertions(+), 76 deletions(-)
> 
> diff --git a/tests/i915/kms_cdclk.c b/tests/i915/kms_cdclk.c
> index 991a7c507..f3046c95a 100644
> --- a/tests/i915/kms_cdclk.c
> +++ b/tests/i915/kms_cdclk.c
> @@ -158,7 +158,7 @@ static void test_plane_scaling(data_t *data, enum pipe pipe, igt_output_t *outpu
>   		igt_create_color_pattern_fb(display->drm_fd,
>   					    mode->hdisplay, mode->vdisplay,
>   					    DRM_FORMAT_XRGB8888,
> -					    I915_TILING_NONE,
> +					    DRM_FORMAT_MOD_LINEAR,
>   					    0.0, 0.0, 0.0, &fb);
>   		igt_plane_set_fb(primary, &fb);
> 
> @@ -212,7 +212,7 @@ static void test_mode_transition(data_t *data, enum pipe pipe, igt_output_t *out
>   	igt_create_color_pattern_fb(display->drm_fd,
>   				    mode->hdisplay, mode->vdisplay,
>   				    DRM_FORMAT_XRGB8888,
> -				    I915_TILING_NONE,
> +				    DRM_FORMAT_MOD_LINEAR,
>   				    0.0, 0.0, 0.0, &fb);
> 
>   	/* switch to lower resolution */
> diff --git a/tests/i915/kms_pipe_b_c_ivb.c b/tests/i915/kms_pipe_b_c_ivb.c
> index 05ac87702..af11e3262 100644
> --- a/tests/i915/kms_pipe_b_c_ivb.c
> +++ b/tests/i915/kms_pipe_b_c_ivb.c
> @@ -92,7 +92,7 @@ set_mode_on_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
> 
>   	fb_id = igt_create_color_fb(data->drm_fd,
>   				    mode->hdisplay, mode->vdisplay,
> -				    DRM_FORMAT_XRGB8888, I915_TILING_NONE,
> +				    DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR,
>   				    1.0, 1.0, 1.0, &fb);
>   	igt_assert_lte(0, fb_id);
> 
> diff --git a/tests/i915/kms_psr_stress_test.c b/tests/i915/kms_psr_stress_test.c
> index daac41d44..9b7ddda84 100644
> --- a/tests/i915/kms_psr_stress_test.c
> +++ b/tests/i915/kms_psr_stress_test.c
> @@ -374,4 +374,4 @@ igt_main
>   		close(data.debugfs_fd);
>   		close(data.drm_fd);
>   	}
> -}
> \ No newline at end of file
> +}
> diff --git a/tests/kms_addfb_basic.c b/tests/kms_addfb_basic.c
> index c58783d54..b4526eee6 100644
> --- a/tests/kms_addfb_basic.c
> +++ b/tests/kms_addfb_basic.c
> @@ -68,10 +68,10 @@ static void invalid_tests(int fd)
> 
>   	igt_fixture {
>   		gem_bo = igt_create_bo_with_dimensions(fd, 1024, 1024,
> -			DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
> +			DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, NULL, NULL, NULL);
>   		igt_assert(gem_bo);
>   		gem_bo_small = igt_create_bo_with_dimensions(fd, 1024, 1023,
> -			DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
> +			DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, NULL, NULL, NULL);
>   		igt_assert(gem_bo_small);
> 
>   		f.handles[0] = gem_bo;
> @@ -276,7 +276,7 @@ static void pitch_tests(int fd)
> 
>   	igt_fixture {
>   		gem_bo = igt_create_bo_with_dimensions(fd, 1024, 1024,
> -			DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
> +			DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, NULL, NULL, NULL);
>   		igt_assert(gem_bo);
>   	}
> 
> @@ -417,10 +417,10 @@ static void size_tests(int fd)
>   		igt_display_require(&display, fd);
> 
>   		gem_bo = igt_create_bo_with_dimensions(fd, 1024, 1024,
> -			DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
> +			DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, NULL, NULL, NULL);
>   		igt_assert(gem_bo);
>   		gem_bo_small = igt_create_bo_with_dimensions(fd, 1024, 1023,
> -			DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
> +			DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, NULL, NULL, NULL);
>   		igt_assert(gem_bo_small);
>   	}
> 
> @@ -513,7 +513,7 @@ static void addfb25_tests(int fd)
> 
>   	igt_fixture {
>   		gem_bo = igt_create_bo_with_dimensions(fd, 1024, 1024,
> -			DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
> +			DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, NULL, NULL, NULL);
>   		igt_assert(gem_bo);
> 
>   		memset(&f, 0, sizeof(f));
> @@ -597,10 +597,10 @@ static void addfb25_ytile(int fd)
>   		igt_display_require(&display, fd);
> 
>   		gem_bo = igt_create_bo_with_dimensions(fd, 1024, 1024,
> -			DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
> +			DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, NULL, NULL, NULL);
>   		igt_assert(gem_bo);
>   		gem_bo_small = igt_create_bo_with_dimensions(fd, 1024, 1023,
> -			DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
> +			DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, NULL, NULL, NULL);
>   		igt_assert(gem_bo_small);
> 
>   		memset(&f, 0, sizeof(f));
> @@ -670,7 +670,7 @@ static void addfb25_4tile(int fd)
>   		igt_display_require(&display, fd);
> 
>   		gem_bo = igt_create_bo_with_dimensions(fd, 1024, 1024,
> -				DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
> +				DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, NULL, NULL, NULL);
>   		igt_assert(gem_bo);
> 
>   		memset(&f, 0, sizeof(f));
> @@ -719,7 +719,7 @@ static void prop_tests(int fd)
> 
>   	igt_fixture {
>   		gem_bo = igt_create_bo_with_dimensions(fd, 1024, 1024,
> -			DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
> +			DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, NULL, NULL, NULL);
>   		igt_assert(gem_bo);
> 
>   		f.handles[0] = gem_bo;
> @@ -780,7 +780,7 @@ static void master_tests(int fd)
> 
>   	igt_fixture {
>   		gem_bo = igt_create_bo_with_dimensions(fd, 1024, 1024,
> -			DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
> +			DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, NULL, NULL, NULL);
>   		igt_assert(gem_bo);
> 
>   		f.handles[0] = gem_bo;
> diff --git a/tests/kms_atomic.c b/tests/kms_atomic.c
> index 2a3fb74be..e7d1cbd75 100644
> --- a/tests/kms_atomic.c
> +++ b/tests/kms_atomic.c
> @@ -305,12 +305,12 @@ plane_primary_overlay_mutable_zpos(igt_pipe_t *pipe, igt_output_t *output,
>   	uint32_t h_overlay = mode->vdisplay / 2;
> 
>   	igt_create_color_pattern_fb(pipe->display->drm_fd,
> -				    w, h, format_primary, I915_TILING_NONE,
> +				    w, h, format_primary, DRM_FORMAT_MOD_LINEAR,
>   				    0.2, 0.2, 0.2, &fb_primary);
> 
>   	igt_create_color_pattern_fb(pipe->display->drm_fd,
>   				    w_overlay, h_overlay,
> -				    format_overlay, I915_TILING_NONE,
> +				    format_overlay, DRM_FORMAT_MOD_LINEAR,
>   				    0.2, 0.2, 0.2, &fb_overlay);
> 
>   	/* Draw a hole in the overlay */
> @@ -404,7 +404,7 @@ plane_immutable_zpos(igt_display_t *display, igt_pipe_t *pipe,
>   	igt_create_color_fb(display->drm_fd,
>   			    w_lower, h_lower,
>   			    DRM_FORMAT_XRGB8888,
> -			    I915_TILING_NONE,
> +			    DRM_FORMAT_MOD_LINEAR,
>   			    0.0, 0.0, 0.0, &fb_ref);
> 
>   	/* create reference image */
> @@ -444,14 +444,14 @@ plane_immutable_zpos(igt_display_t *display, igt_pipe_t *pipe,
>   	fb_id_lower = igt_create_color_fb(display->drm_fd,
>   					  w_lower, h_lower,
>   					  DRM_FORMAT_XRGB8888,
> -					  I915_TILING_NONE,
> +					  DRM_FORMAT_MOD_LINEAR,
>   					  0.0, 0.0, 1.0, &fb_lower);
>   	igt_assert(fb_id_lower);
> 
>   	fb_id_upper = igt_create_color_fb(display->drm_fd,
>   					  w_upper, h_upper,
>   					  DRM_FORMAT_XRGB8888,
> -					  I915_TILING_NONE,
> +					  DRM_FORMAT_MOD_LINEAR,
>   					  1.0, 1.0, 0.0, &fb_upper);
>   	igt_assert(fb_id_upper);
> 
> @@ -516,7 +516,7 @@ static void plane_overlay(igt_pipe_t *pipe, igt_output_t *output, igt_plane_t *p
>   	igt_require(format != 0);
> 
>   	igt_create_pattern_fb(pipe->display->drm_fd, w, h,
> -			      format, I915_TILING_NONE, &fb);
> +			      format, DRM_FORMAT_MOD_LINEAR, &fb);
> 
>   	igt_plane_set_fb(plane, &fb);
>   	igt_plane_set_position(plane, w/2, h/2);
> @@ -551,7 +551,7 @@ static void plane_primary(igt_pipe_t *pipe, igt_plane_t *plane, struct igt_fb *f
> 
>   	igt_create_color_pattern_fb(pipe->display->drm_fd,
>   				    fb->width, fb->height,
> -				    fb->drm_format, I915_TILING_NONE,
> +				    fb->drm_format, DRM_FORMAT_MOD_LINEAR,
>   				    0.2, 0.2, 0.2, &fb2);
> 
>   	/* Flip the primary plane using the atomic API, and double-check
> @@ -600,7 +600,7 @@ static void test_only(igt_pipe_t *pipe_obj,
> 
>   	igt_create_pattern_fb(pipe_obj->display->drm_fd,
>   			     mode->hdisplay, mode->vdisplay,
> -			     format, I915_TILING_NONE, &fb);
> +			     format, DRM_FORMAT_MOD_LINEAR, &fb);
>   	igt_plane_set_fb(primary, &fb);
>   	igt_output_set_pipe(output, pipe_obj->pipe);
> 
> @@ -737,7 +737,7 @@ static void plane_invalid_params(igt_pipe_t *pipe,
>   	/* Create a framebuffer too small for the plane configuration. */
>   	igt_create_pattern_fb(pipe->display->drm_fd,
>   			      fb->width - 1, fb->height - 1,
> -			      fb->drm_format, I915_TILING_NONE, &fb2);
> +			      fb->drm_format, DRM_FORMAT_MOD_LINEAR, &fb2);
> 
>   	igt_plane_set_prop_value(plane, IGT_PLANE_FB_ID, fb2.fb_id);
>   	plane_commit_atomic_err(plane, ATOMIC_RELAX_NONE, ENOSPC);
> @@ -1072,7 +1072,7 @@ static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt
> 
>   	/* Color fb with white rect at center */
>   	igt_create_color_fb(pipe->display->drm_fd, fb->width, fb->height,
> -			    fb->drm_format, I915_TILING_NONE, 0.2, 0.2, 0.2,
> +			    fb->drm_format, DRM_FORMAT_MOD_LINEAR, 0.2, 0.2, 0.2,
>   			    &fb_1);
>   	cr_1 = igt_get_cairo_ctx(pipe->display->drm_fd, &fb_1);
>   	igt_paint_color(cr_1, fb->width/4, fb->height/4, fb->width/2,
> @@ -1111,7 +1111,7 @@ static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt
>   	 * issue plane update with damage and verify the state.
>   	 */
>   	igt_create_color_fb(pipe->display->drm_fd, fb->width, fb->height,
> -			    fb->drm_format, I915_TILING_NONE, 0.2, 0.2, 0.2,
> +			    fb->drm_format, DRM_FORMAT_MOD_LINEAR, 0.2, 0.2, 0.2,
>   			    &fb_2);
> 
>   	damage[0].x1 = fb->width/2;
> @@ -1141,7 +1141,7 @@ static void atomic_plane_damage(igt_pipe_t *pipe, igt_plane_t *plane, struct igt
>   	/* Reszie fb_1 to be bigger than plane */
>   	igt_remove_fb(pipe->display->drm_fd, &fb_1);
>   	igt_create_color_fb(pipe->display->drm_fd, fb->width * 2, fb->height,
> -			    fb->drm_format, I915_TILING_NONE, 0.2, 0.2, 0.2,
> +			    fb->drm_format, DRM_FORMAT_MOD_LINEAR, 0.2, 0.2, 0.2,
>   			    &fb_1);
> 
>   	damage[0].x1 = fb->width;
> diff --git a/tests/kms_atomic_transition.c b/tests/kms_atomic_transition.c
> index 64e7e7091..d32be0952 100644
> --- a/tests/kms_atomic_transition.c
> +++ b/tests/kms_atomic_transition.c
> @@ -824,9 +824,9 @@ retry:
>   	}
> 
>   	igt_create_pattern_fb(data->drm_fd, width, height,
> -				   DRM_FORMAT_XRGB8888, 0, &data->fbs[0]);
> +				   DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, &data->fbs[0]);
>   	igt_create_color_pattern_fb(data->drm_fd, width, height,
> -				    DRM_FORMAT_XRGB8888, 0, .5, .5, .5, &data->fbs[1]);
> +				    DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, .5, .5, .5, &data->fbs[1]);
> 
>   	for_each_pipe(&data->display, i) {
>   		igt_pipe_t *pipe = &data->display.pipes[i];
> diff --git a/tests/kms_bw.c b/tests/kms_bw.c
> index b1dfadd69..b66473e60 100644
> --- a/tests/kms_bw.c
> +++ b/tests/kms_bw.c
> @@ -169,7 +169,7 @@ static void run_test_linear_tiling(data_t *data, int pipe, const drmModeModeInfo
> 
>   		igt_create_color_fb(display->drm_fd, mode->hdisplay,
>   				    mode->vdisplay, DRM_FORMAT_XRGB8888,
> -				    DRM_FORMAT_MOD_NONE, 1.f, 0.f, 0.f,
> +				    DRM_FORMAT_MOD_LINEAR, 1.f, 0.f, 0.f,
>   				    &buffer[i]);
> 
>   		igt_output_set_pipe(output, i);
> diff --git a/tests/kms_cursor_legacy.c b/tests/kms_cursor_legacy.c
> index feea1ac83..a8862bdfb 100644
> --- a/tests/kms_cursor_legacy.c
> +++ b/tests/kms_cursor_legacy.c
> @@ -193,7 +193,7 @@ static igt_output_t *set_fb_on_crtc(igt_display_t *display, enum pipe pipe, stru
> 
>   		igt_create_pattern_fb(display->drm_fd,
>   			      mode->hdisplay, mode->vdisplay,
> -			      DRM_FORMAT_XRGB8888, I915_TILING_NONE, fb_info);
> +			      DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, fb_info);
> 
>   		primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
>   		igt_plane_set_fb(primary, fb_info);
> @@ -386,7 +386,7 @@ static void prepare_flip_test(igt_display_t *display,
> 
>   		igt_skip_on(width <= 64 && height <= 64);
>   		igt_create_color_fb(display->drm_fd, width, height,
> -				    DRM_FORMAT_ARGB8888, 0, 1., 0., .7, cursor_fb2);
> +				    DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_LINEAR, 1., 0., .7, cursor_fb2);
> 
>   		arg[0].flags = arg[1].flags = DRM_MODE_CURSOR_BO;
>   		arg[1].handle = cursor_fb2->gem_handle;
> @@ -412,7 +412,7 @@ static void prepare_flip_test(igt_display_t *display,
>   		            display->pipes[flip_pipe].planes[1].type != DRM_PLANE_TYPE_CURSOR);
> 
>   		igt_create_color_pattern_fb(display->drm_fd, prim_fb->width, prim_fb->height,
> -					    DRM_FORMAT_ARGB8888, 0, .1, .1, .1, argb_fb);
> +					    DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_LINEAR, .1, .1, .1, argb_fb);
>   	}
>   }
> 
> @@ -458,9 +458,11 @@ static void flip(igt_display_t *display,
>   		}
>   	}
> 
> -	igt_create_color_fb(display->drm_fd, fb_info.width, fb_info.height, DRM_FORMAT_ARGB8888, 0, .5, .5, .5, &cursor_fb);
> +	igt_create_color_fb(display->drm_fd, fb_info.width, fb_info.height,
> +			    DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_LINEAR, .5, .5, .5, &cursor_fb);
> 
> -	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888, 0, 1., 1., 1., &cursor_fb);
> +	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888,
> +			    DRM_FORMAT_MOD_LINEAR, 1., 1., 1., &cursor_fb);
>   	cursor = set_cursor_on_pipe(display, cursor_pipe, &cursor_fb);
>   	populate_cursor_args(display, cursor_pipe, arg, &cursor_fb);
> 
> @@ -564,7 +566,8 @@ static void basic_flip_cursor(igt_display_t *display,
> 
>   	igt_require((output = set_fb_on_crtc(display, pipe, &fb_info)));
> 
> -	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888, 0, 1., 1., 1., &cursor_fb);
> +	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888,
> +			    DRM_FORMAT_MOD_LINEAR, 1., 1., 1., &cursor_fb);
>   	cursor = set_cursor_on_pipe(display, pipe, &cursor_fb);
>   	populate_cursor_args(display, pipe, arg, &cursor_fb);
> 
> @@ -728,7 +731,8 @@ static void flip_vs_cursor(igt_display_t *display, enum flip_test mode, int nloo
> 
>   	igt_require((output = set_fb_on_crtc(display, pipe, &fb_info)));
> 
> -	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888, 0, 1., 1., 1., &cursor_fb);
> +	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888,
> +			    DRM_FORMAT_MOD_LINEAR, 1., 1., 1., &cursor_fb);
>   	cursor = set_cursor_on_pipe(display, pipe, &cursor_fb);
>   	populate_cursor_args(display, pipe, arg, &cursor_fb);
> 
> @@ -852,7 +856,8 @@ static void nonblocking_modeset_vs_cursor(igt_display_t *display, int loops)
>   	igt_require(display->is_atomic);
>   	igt_require((output = set_fb_on_crtc(display, pipe, &fb_info)));
>   	primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY);
> -	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888, 0, 1., 1., 1., &cursor_fb);
> +	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888,
> +			    DRM_FORMAT_MOD_LINEAR, 1., 1., 1., &cursor_fb);
>   	cursor = set_cursor_on_pipe(display, pipe, &cursor_fb);
>   	populate_cursor_args(display, pipe, arg, &cursor_fb);
>   	arg[0].flags |= DRM_MODE_CURSOR_BO;
> @@ -972,7 +977,8 @@ static void two_screens_flip_vs_cursor(igt_display_t *display, int nloops, bool
>   		igt_require((output2 = set_fb_on_crtc(display, pipe2, &fb2_info)));
>   	}
> 
> -	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888, 0, 1., 1., 1., &cursor_fb);
> +	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888,
> +			    DRM_FORMAT_MOD_LINEAR, 1., 1., 1., &cursor_fb);
>   	cursor = set_cursor_on_pipe(display, pipe, &cursor_fb);
>   	populate_cursor_args(display, pipe, arg1, &cursor_fb);
> 
> @@ -1137,7 +1143,8 @@ static void cursor_vs_flip(igt_display_t *display, enum flip_test mode, int nloo
>   	igt_require((output = set_fb_on_crtc(display, pipe, &fb_info)));
>   	vrefresh = igt_output_get_mode(output)->vrefresh;
> 
> -	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888, 0, 1., 1., 1., &cursor_fb);
> +	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888,
> +			    DRM_FORMAT_MOD_LINEAR, 1., 1., 1., &cursor_fb);
>   	cursor = set_cursor_on_pipe(display, pipe, &cursor_fb);
>   	populate_cursor_args(display, pipe, arg, &cursor_fb);
> 
> @@ -1249,7 +1256,8 @@ static void two_screens_cursor_vs_flip(igt_display_t *display, int nloops, bool
>   		igt_require((outputs[1] = set_fb_on_crtc(display, pipe[1], &fb_info[1])));
>   	}
> 
> -	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888, 0, 1., 1., 1., &cursor_fb);
> +	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888,
> +			    DRM_FORMAT_MOD_LINEAR, 1., 1., 1., &cursor_fb);
> 
>   	cursors[0] = set_cursor_on_pipe(display, pipe[0], &cursor_fb);
>   	populate_cursor_args(display, pipe[0], arg[0], &cursor_fb);
> @@ -1357,7 +1365,8 @@ static void flip_vs_cursor_crc(igt_display_t *display, bool atomic)
> 
>   	igt_require((output = set_fb_on_crtc(display, pipe, &fb_info)));
> 
> -	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888, 0, 1., 1., 1., &cursor_fb);
> +	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888,
> +			    DRM_FORMAT_MOD_LINEAR, 1., 1., 1., &cursor_fb);
>   	populate_cursor_args(display, pipe, arg, &cursor_fb);
> 
>   	igt_display_commit2(display, display->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
> @@ -1430,7 +1439,8 @@ static void flip_vs_cursor_busy_crc(igt_display_t *display, bool atomic)
>   	igt_create_color_pattern_fb(display->drm_fd, fb_info[0].width, fb_info[0].height,
>   				    DRM_FORMAT_XRGB8888, I915_FORMAT_MOD_X_TILED, .1, .1, .1, &fb_info[1]);
> 
> -	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888, 0, 1., 1., 1., &cursor_fb);
> +	igt_create_color_fb(display->drm_fd, 64, 64, DRM_FORMAT_ARGB8888,
> +			    DRM_FORMAT_MOD_LINEAR, 1., 1., 1., &cursor_fb);
>   	populate_cursor_args(display, pipe, arg, &cursor_fb);
> 
>   	igt_display_commit2(display, display->is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);
> diff --git a/tests/kms_display_modes.c b/tests/kms_display_modes.c
> index e4191811e..c2e98c3c6 100644
> --- a/tests/kms_display_modes.c
> +++ b/tests/kms_display_modes.c
> @@ -64,9 +64,9 @@ static void run_extendedmode_basic(data_t *data, int pipe1, int pipe2)
>   	pipe_crc[1] = igt_pipe_crc_new(data->drm_fd, pipe2, IGT_PIPE_CRC_SOURCE_AUTO);
> 
>   	igt_create_color_fb(data->drm_fd, mode[0]->hdisplay, mode[0]->vdisplay,
> -			     DRM_FORMAT_XRGB8888, 0, 1, 0, 0, &fbs[0]);
> +			    DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 1, 0, 0, &fbs[0]);
>   	igt_create_color_fb(data->drm_fd, mode[1]->hdisplay, mode[1]->vdisplay,
> -			     DRM_FORMAT_XRGB8888, 0, 0, 0, 1, &fbs[1]);
> +			    DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, 0, 1, &fbs[1]);
> 
>   	plane[0] = igt_pipe_get_plane_type(&display->pipes[pipe1], DRM_PLANE_TYPE_PRIMARY);
>   	plane[1] = igt_pipe_get_plane_type(&display->pipes[pipe2], DRM_PLANE_TYPE_PRIMARY);
> @@ -88,7 +88,8 @@ static void run_extendedmode_basic(data_t *data, int pipe1, int pipe2)
>   	width = mode[0]->hdisplay + mode[1]->hdisplay;
>   	height = max(mode[0]->vdisplay, mode[1]->vdisplay);
> 
> -	igt_create_fb(data->drm_fd, width, height, DRM_FORMAT_XRGB8888, 0, &fb);
> +	igt_create_fb(data->drm_fd, width, height,
> +		      DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, &fb);
>   	cr = igt_get_cairo_ctx(data->drm_fd, &fb);
>   	igt_paint_color(cr, 0, 0, mode[0]->hdisplay, mode[0]->vdisplay, 1, 0, 0);
>   	igt_paint_color(cr, mode[0]->hdisplay, 0, mode[1]->hdisplay, mode[1]->vdisplay, 0, 0, 1);
> diff --git a/tests/kms_force_connector_basic.c b/tests/kms_force_connector_basic.c
> index cde47e925..4ff1efe3b 100644
> --- a/tests/kms_force_connector_basic.c
> +++ b/tests/kms_force_connector_basic.c
> @@ -68,8 +68,8 @@ static void force_load_detect(int drm_fd, drmModeConnectorPtr connector, drmMode
>   	/* No load detect on HDMI. */
>   	igt_require(connector->connector_type == DRM_MODE_CONNECTOR_VGA);
> 
> -	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_create_fb(drm_fd, w, h, DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, &xrgb_fb);
> +	igt_create_fb(drm_fd, w, h, DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_LINEAR, &argb_fb);
>   	igt_assert(drmSetClientCap(drm_fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1) == 0);
> 
>   	/*
> diff --git a/tests/kms_getfb.c b/tests/kms_getfb.c
> index 2e4552a0c..813417e77 100644
> --- a/tests/kms_getfb.c
> +++ b/tests/kms_getfb.c
> @@ -174,7 +174,7 @@ static void test_handle_input(int fd)
>   		add.pixel_format = DRM_FORMAT_XRGB8888;
>   		add.pitches[0] = 1024*4;
>   		add.handles[0] = igt_create_bo_with_dimensions(fd, 1024, 1024,
> -			DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
> +			DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, NULL, NULL, NULL);
>   		igt_require(add.handles[0] != 0);
>   		do_ioctl(fd, DRM_IOCTL_MODE_ADDFB2, &add);
>   	}
> @@ -229,7 +229,7 @@ static void test_duplicate_handles(int fd)
>   		add.pixel_format = DRM_FORMAT_XRGB8888;
>   		add.pitches[0] = 1024*4;
>   		add.handles[0] = igt_create_bo_with_dimensions(fd, 1024, 1024,
> -			DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
> +			DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, NULL, NULL, NULL);
>   		igt_assert(add.handles[0]);
>   		do_ioctl(fd, DRM_IOCTL_MODE_ADDFB2, &add);
>   	}
> @@ -296,7 +296,7 @@ static void test_getfb2(int fd)
>   		add_basic.pixel_format = DRM_FORMAT_XRGB8888;
>   		add_basic.pitches[0] = 1024*4;
>   		add_basic.handles[0] = igt_create_bo_with_dimensions(fd, 1024, 1024,
> -			DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
> +			DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, NULL, NULL, NULL);
>   		igt_assert(add_basic.handles[0]);
>   		do_ioctl(fd, DRM_IOCTL_MODE_ADDFB2, &add_basic);
> 
> @@ -403,7 +403,7 @@ static void test_handle_protection(void) {
>   		non_master_add.pixel_format = DRM_FORMAT_XRGB8888;
>   		non_master_add.pitches[0] = 1024*4;
>   		non_master_add.handles[0] = igt_create_bo_with_dimensions(non_master_fd, 1024, 1024,
> -			DRM_FORMAT_XRGB8888, 0, 0, NULL, NULL, NULL);
> +			DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, 0, NULL, NULL, NULL);
>   		igt_require(non_master_add.handles[0] != 0);
>   		do_ioctl(non_master_fd, DRM_IOCTL_MODE_ADDFB2, &non_master_add);
>   	}
> diff --git a/tests/kms_hdr.c b/tests/kms_hdr.c
> index 36669ce81..23f12c14a 100644
> --- a/tests/kms_hdr.c
> +++ b/tests/kms_hdr.c
> @@ -148,7 +148,8 @@ static void test_bpc_switch_on_output(data_t *data, enum pipe pipe,
>   	int afb_id, ret;
> 
>   	/* 10-bit formats are slow, so limit the size. */
> -	afb_id = igt_create_fb(data->fd, 512, 512, DRM_FORMAT_XRGB2101010, 0, &afb);
> +	afb_id = igt_create_fb(data->fd, 512, 512,
> +			       DRM_FORMAT_XRGB2101010, DRM_FORMAT_MOD_LINEAR, &afb);
>   	igt_assert(afb_id);
> 
>   	draw_hdr_pattern(&afb);
> @@ -396,7 +397,8 @@ static void test_static_toggle(data_t *data, enum pipe pipe,
>   	int afb_id;
> 
>   	/* 10-bit formats are slow, so limit the size. */
> -	afb_id = igt_create_fb(data->fd, 512, 512, DRM_FORMAT_XRGB2101010, 0, &afb);
> +	afb_id = igt_create_fb(data->fd, 512, 512,
> +			       DRM_FORMAT_XRGB2101010, DRM_FORMAT_MOD_LINEAR, &afb);
>   	igt_assert(afb_id);
> 
>   	draw_hdr_pattern(&afb);
> @@ -478,7 +480,8 @@ static void test_static_swap(data_t *data, enum pipe pipe, igt_output_t *output)
>   	struct hdr_output_metadata hdr;
> 
>   	/* 10-bit formats are slow, so limit the size. */
> -	afb_id = igt_create_fb(data->fd, 512, 512, DRM_FORMAT_XRGB2101010, 0, &afb);
> +	afb_id = igt_create_fb(data->fd, 512, 512,
> +			       DRM_FORMAT_XRGB2101010, DRM_FORMAT_MOD_LINEAR, &afb);
>   	igt_assert(afb_id);
> 
>   	draw_hdr_pattern(&afb);
> diff --git a/tests/kms_plane_cursor.c b/tests/kms_plane_cursor.c
> index 9b27586c1..7a677ebbe 100644
> --- a/tests/kms_plane_cursor.c
> +++ b/tests/kms_plane_cursor.c
> @@ -236,19 +236,19 @@ static void test_cursor(data_t *data, int size, unsigned int flags)
> 
>   	test_cleanup(data);
> 
> -	igt_create_color_fb(data->drm_fd, sw, sh, DRM_FORMAT_XRGB8888, 0,
> -			    1.0, 1.0, 1.0, &data->pfb);
> +	igt_create_color_fb(data->drm_fd, sw, sh, DRM_FORMAT_XRGB8888,
> +			    DRM_FORMAT_MOD_LINEAR, 1.0, 1.0, 1.0, &data->pfb);
> 
>   	if (flags & TEST_OVERLAY) {
>   		int width = (flags & TEST_VIEWPORT) ? data->or.w + pad : data->or.w;
>   		int height = (flags & TEST_VIEWPORT) ? data->or.h + pad : data->or.h;
> 
> -		igt_create_color_fb(data->drm_fd, width, height,
> -				    DRM_FORMAT_XRGB8888, 0, 0.5, 0.5, 0.5, &data->ofb);
> +		igt_create_color_fb(data->drm_fd, width, height, DRM_FORMAT_XRGB8888,
> +				    DRM_FORMAT_MOD_LINEAR, 0.5, 0.5, 0.5, &data->ofb);
>   	}
> 
> -	igt_create_color_fb(data->drm_fd, size, size, DRM_FORMAT_ARGB8888, 0,
> -			    1.0, 0.0, 1.0, &data->cfb);
> +	igt_create_color_fb(data->drm_fd, size, size, DRM_FORMAT_ARGB8888,
> +			    DRM_FORMAT_MOD_LINEAR, 1.0, 0.0, 1.0, &data->cfb);
> 
>   	igt_plane_set_fb(data->primary, &data->pfb);
>   	igt_output_set_pipe(data->output, data->pipe_id);
> diff --git a/tests/kms_plane_scaling.c b/tests/kms_plane_scaling.c
> index c6c6f3ec6..9e45af947 100644
> --- a/tests/kms_plane_scaling.c
> +++ b/tests/kms_plane_scaling.c
> @@ -702,7 +702,7 @@ static void setup_fb(int fd, int width, int height,
>   {
>   	igt_create_color_pattern_fb(fd, width, height,
>   				    DRM_FORMAT_XRGB8888,
> -				    I915_TILING_NONE,
> +				    DRM_FORMAT_MOD_LINEAR,
>   				    r, g, b, fb);
>   }
> 
> @@ -787,17 +787,17 @@ test_invalid_num_scalers(data_t *d, enum pipe pipe, igt_output_t *output)
>   	igt_create_color_pattern_fb(display->drm_fd,
>                                       width, height,
>                                       DRM_FORMAT_XRGB8888,
> -                                    I915_TILING_NONE,
> +                                    DRM_FORMAT_MOD_LINEAR,
>                                       1.0, 0.0, 0.0, &d->fb[0]);
>   	igt_create_color_pattern_fb(display->drm_fd,
>                                       width, height,
>                                       DRM_FORMAT_XRGB8888,
> -                                    I915_TILING_NONE,
> +                                    DRM_FORMAT_MOD_LINEAR,
>                                       0.0, 1.0, 0.0, &d->fb[1]);
>   	igt_create_color_pattern_fb(display->drm_fd,
>                                       width, height,
>                                       DRM_FORMAT_XRGB8888,
> -                                    I915_TILING_NONE,
> +                                    DRM_FORMAT_MOD_LINEAR,
>                                       0.0, 0.0, 1.0, &d->fb[2]);
> 
>   	igt_plane_set_fb(plane[0], &d->fb[0]);
> @@ -854,16 +854,16 @@ static void test_scaler_with_multi_pipe_plane(data_t *d)
> 
>   	igt_create_pattern_fb(d->drm_fd, 600, 600,
>   			      DRM_FORMAT_XRGB8888,
> -			      I915_TILING_NONE, &d->fb[0]);
> +			      DRM_FORMAT_MOD_LINEAR, &d->fb[0]);
>   	igt_create_pattern_fb(d->drm_fd, 500, 500,
>   			      DRM_FORMAT_XRGB8888,
> -			      I915_TILING_NONE, &d->fb[1]);
> +			      DRM_FORMAT_MOD_LINEAR, &d->fb[1]);
>   	igt_create_pattern_fb(d->drm_fd, 700, 700,
>   			      DRM_FORMAT_XRGB8888,
> -			      I915_TILING_NONE, &d->fb[2]);
> +			      DRM_FORMAT_MOD_LINEAR, &d->fb[2]);
>   	igt_create_pattern_fb(d->drm_fd, 400, 400,
>   			      DRM_FORMAT_XRGB8888,
> -			      I915_TILING_NONE, &d->fb[3]);
> +			      DRM_FORMAT_MOD_LINEAR, &d->fb[3]);
> 
>   	igt_plane_set_fb(plane[0], &d->fb[0]);
>   	igt_plane_set_fb(plane[1], &d->fb[1]);
> @@ -935,7 +935,7 @@ static void invalid_parameter_tests(data_t *d)
> 
>   		igt_create_fb(d->drm_fd, 256, 256,
>   			      DRM_FORMAT_XRGB8888,
> -			      DRM_FORMAT_MOD_NONE,
> +			      DRM_FORMAT_MOD_LINEAR,
>   			      &fb);
>   	}
> 
> @@ -1045,7 +1045,7 @@ static void i915_max_source_size_test(data_t *d)
> 
>   		igt_create_fb(d->drm_fd, 5120, 4320,
>   			      DRM_FORMAT_XRGB8888,
> -			      DRM_FORMAT_MOD_NONE,
> +			      DRM_FORMAT_MOD_LINEAR,
>   			      &fb);
>   	}
> 
> diff --git a/tests/kms_prime.c b/tests/kms_prime.c
> index ad199915b..d2a6503e5 100644
> --- a/tests/kms_prime.c
> +++ b/tests/kms_prime.c
> @@ -119,7 +119,7 @@ static void prepare_scratch(int exporter_fd, struct dumb_bo *scratch,
>   					      scratch->size, PROT_WRITE);
>   	} else {
>   		igt_calc_fb_size(exporter_fd, mode->hdisplay, mode->vdisplay, DRM_FORMAT_XRGB8888,
> -				 DRM_FORMAT_MOD_NONE, &scratch->size, &scratch->pitch);
> +				 DRM_FORMAT_MOD_LINEAR, &scratch->size, &scratch->pitch);
>   		if (gem_has_lmem(exporter_fd))
>   			scratch->handle = gem_create_in_memory_regions(exporter_fd, scratch->size,
>   								       REGION_LMEM(0), REGION_SMEM);
> diff --git a/tests/kms_scaling_modes.c b/tests/kms_scaling_modes.c
> index 039e4a8d9..b17d00230 100644
> --- a/tests/kms_scaling_modes.c
> +++ b/tests/kms_scaling_modes.c
> @@ -49,11 +49,11 @@ static void test_scaling_mode_on_output(igt_display_t *display, const enum pipe
>   	sprite = igt_output_get_plane_type(output, DRM_PLANE_TYPE_OVERLAY);
> 
>   	igt_create_color_fb(display->drm_fd, mode.hdisplay, mode.vdisplay,
> -			    DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE,
> +			    DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR,
>   			    0.f, 0.f, 1.f, &blue);
> 
>   	igt_create_color_fb(display->drm_fd, 640, 480,
> -			    DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE,
> +			    DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR,
>   			    1.f, 0.f, 0.f, &red);
> 
>   	igt_plane_set_fb(primary, &blue);
> diff --git a/tests/kms_universal_plane.c b/tests/kms_universal_plane.c
> index dd8fa1937..d38886f39 100644
> --- a/tests/kms_universal_plane.c
> +++ b/tests/kms_universal_plane.c
> @@ -613,7 +613,7 @@ cursor_leak_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
>   	/* Black background FB */
>   	igt_create_color_fb(data->drm_fd, mode->hdisplay, mode->vdisplay,
>   			    DRM_FORMAT_XRGB8888,
> -			    false,
> +			    DRM_FORMAT_MOD_LINEAR,
>   			    0.0, 0.0, 0.0,
>   			    &background_fb);
> 
> @@ -624,7 +624,7 @@ cursor_leak_test_pipe(data_t *data, enum pipe pipe, igt_output_t *output)
>   		b = rand() % 0xFF;
>   		igt_create_color_fb(data->drm_fd, 64, 64,
>   				    DRM_FORMAT_ARGB8888,
> -				    false,
> +				    DRM_FORMAT_MOD_LINEAR,
>   				    (double)r / 0xFF,
>   				    (double)g / 0xFF,
>   				    (double)b / 0xFF,
> --
> 2.39.1
> 

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

* Re: [igt-dev] [i-g-t V2 2/3] tests/i915/kms_ccs: Cleanup to use linear modifier
  2023-03-13 15:14 ` [igt-dev] [i-g-t V2 2/3] tests/i915/kms_ccs: " Bhanuprakash Modem
@ 2023-03-15 10:25   ` Ville Syrjälä
  0 siblings, 0 replies; 7+ messages in thread
From: Ville Syrjälä @ 2023-03-15 10:25 UTC (permalink / raw)
  To: Bhanuprakash Modem; +Cc: igt-dev

On Mon, Mar 13, 2023 at 08:44:05PM +0530, Bhanuprakash Modem wrote:
> Use either compressed or linear modifier to test. Due to the
> lack of available bandwidth, we cannot fit two CCS planes into
> the available FIFO configurations.
> 
> Cc: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
> Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
> ---
>  tests/i915/kms_ccs.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/tests/i915/kms_ccs.c b/tests/i915/kms_ccs.c
> index 9be3fa252..18d48fb80 100644
> --- a/tests/i915/kms_ccs.c
> +++ b/tests/i915/kms_ccs.c
> @@ -393,10 +393,8 @@ static void generate_fb(data_t *data, struct igt_fb *fb,
>  	 */
>  	if (fb_flags & FB_COMPRESSED)
>  		modifier = data->ccs_modifier;
> -	else if (!(fb_flags & FB_HAS_PLANE))
> -		modifier = DRM_FORMAT_MOD_LINEAR;
>  	else
> -		modifier = 0;
> +		modifier = DRM_FORMAT_MOD_LINEAR;

Isn't this whole change a nop? If so why does the commit message
seem to indicate some kind of functional change?

>  
>  	create_fb_prepare_add(data->drm_fd, width, height,
>  			      data->format, modifier,
> -- 
> 2.39.1

-- 
Ville Syrjälä
Intel

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

end of thread, other threads:[~2023-03-15 10:25 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-13 15:14 [igt-dev] [i-g-t V2 1/3] tests/kms: Cleanup to use linear modifier Bhanuprakash Modem
2023-03-13 15:14 ` [igt-dev] [i-g-t V2 2/3] tests/i915/kms_ccs: " Bhanuprakash Modem
2023-03-15 10:25   ` Ville Syrjälä
2023-03-13 15:14 ` [igt-dev] [i-g-t V2 3/3] tests/kms: Add missing igt_put_cairo_ctx() Bhanuprakash Modem
2023-03-13 16:49 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,V2,1/3] tests/kms: Cleanup to use linear modifier Patchwork
2023-03-14 19:43 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2023-03-15 10:01 ` [igt-dev] [i-g-t V2 1/3] " Juha-Pekka Heikkila

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox