Skip to contentSkip to conversation

tests/kms_cursor_crc Stripping rendercopy implementation to use cairo

PATCH In review Kamati Srinivas 3 participants 4 messages Sep 3, 2020 – Sep 10, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests/kms_cursor_crc Stripping rendercopy implementation to use cairo

Rendercopy implementation is stripped to use cairo for restoring image. With cario, no more crc errors are observed and dead code is removed.

Cc Heikkila, Juha-pekka <[email protected]>
---
 tests/kms_cursor_crc.c | 91 ++++++------------------------------------
 1 file changed, 13 insertions(+), 78 deletions(-)
tests/kms_cursor_crc.c +13 -78
index e9491847..0be8f7f8 100644
@@ -64,11 +64,6 @@ typedef struct {
 	igt_plane_t *cursor;
 	cairo_surface_t *surface;
 	uint32_t devid;
-	drm_intel_bufmgr *bufmgr;
-	igt_render_copyfunc_t rendercopy;
-	drm_intel_bo * drmibo[2];
-	struct intel_batchbuffer *batch;
-	struct igt_buf igtbo[2];
 
 } data_t;
 
@@ -153,23 +148,14 @@ static void restore_image(data_t *data)
 {
 	cairo_t *cr;
 
-	if (data->rendercopy != NULL) {
-		/* use rendercopy if available */
-		data->rendercopy(data->batch, NULL,
-				 &data->igtbo[RESTOREBUFFER], 0, 0,
-				 data->primary_fb[RESTOREBUFFER].width,
-				 data->primary_fb[RESTOREBUFFER].height,
-				 &data->igtbo[FRONTBUFFER], 0, 0);
-	} else {
-		/* if rendercopy not implemented in igt use cairo */
-		cr = igt_get_cairo_ctx(data->drm_fd,
-				       &data->primary_fb[FRONTBUFFER]);
-		cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
-		cairo_set_source_surface(cr, data->surface, 0, 0);
-		cairo_rectangle(cr, 0, 0, data->screenw, data->screenh);
-		cairo_fill(cr);
-		igt_put_cairo_ctx(cr);
-	}
+	/* rendercopy stripped in igt using cairo */
+	cr = igt_get_cairo_ctx(data->drm_fd,
+			       &data->primary_fb[FRONTBUFFER]);
+	cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
+	cairo_set_source_surface(cr, data->surface, 0, 0);
+	cairo_rectangle(cr, 0, 0, data->screenw, data->screenh);
+	cairo_fill(cr);
+	igt_put_cairo_ctx(cr);
 	igt_dirty_fb(data->drm_fd, &data->primary_fb[FRONTBUFFER]);
 }
 
@@ -384,15 +370,6 @@ static void cleanup_crtc(data_t *data)
 	igt_display_reset(display);
 }
 
-static void scratch_buf_init(data_t *data, int buffer)
-{
-	data->igtbo[buffer].bo = data->drmibo[buffer];
-	data->igtbo[buffer].surface[0].stride = data->primary_fb[buffer].strides[0];
-	data->igtbo[buffer].tiling = data->primary_fb[buffer].modifier;
-	data->igtbo[buffer].surface[0].size = data->primary_fb[buffer].size;
-	data->igtbo[buffer].bpp = data->primary_fb[buffer].plane_bpp[0];
-}
-
 static void prepare_crtc(data_t *data, igt_output_t *output,
 			 int cursor_w, int cursor_h)
 {
@@ -443,38 +420,11 @@ static void prepare_crtc(data_t *data, igt_output_t *output,
 
 	data->surface = cairo_image_surface_create(CAIRO_FORMAT_RGB24, data->screenw, data->screenh);
 
-	if (data->rendercopy == NULL) {
-		/* store test image as cairo surface */
-		cr = cairo_create(data->surface);
-		cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
-		igt_paint_test_pattern(cr, data->screenw, data->screenh);
-		cairo_destroy(cr);
-	} else {
-		/* store test image as fb if rendercopy is available */
-		cr = igt_get_cairo_ctx(data->drm_fd,
-		                       &data->primary_fb[RESTOREBUFFER]);
-		cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
-		igt_paint_test_pattern(cr, data->screenw, data->screenh);
-		igt_put_cairo_ctx(cr);
-
-		data->drmibo[FRONTBUFFER] = gem_handle_to_libdrm_bo(data->bufmgr,
-								    data->drm_fd,
-								    "", data->primary_fb[FRONTBUFFER].gem_handle);
-		igt_assert(data->drmibo[FRONTBUFFER]);
-
-		data->drmibo[RESTOREBUFFER] = gem_handle_to_libdrm_bo(data->bufmgr,
-								      data->drm_fd,
-								      "", data->primary_fb[RESTOREBUFFER].gem_handle);
-		igt_assert(data->drmibo[RESTOREBUFFER]);
-
-		scratch_buf_init(data, RESTOREBUFFER);
-		scratch_buf_init(data, FRONTBUFFER);
-
-		data->batch = intel_batchbuffer_alloc(data->bufmgr,
-						      data->devid);
-		igt_assert(data->batch);
-	}
-
+	/* store test image as cairo surface */
+	cr = cairo_create(data->surface);
+	cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
+	igt_paint_test_pattern(cr, data->screenw, data->screenh);
+	cairo_destroy(cr);
 	igt_pipe_crc_start(data->pipe_crc);
 }
 
@@ -830,16 +780,6 @@ igt_main
 		igt_require_pipe_crc(data.drm_fd);
 
 		igt_display_require(&data.display, data.drm_fd);
-
-		if (is_i915_device(data.drm_fd)) {
-			data.bufmgr = drm_intel_bufmgr_gem_init(data.drm_fd, 4096);
-			igt_assert(data.bufmgr);
-			drm_intel_bufmgr_gem_enable_reuse(data.bufmgr);
-
-			data.devid = intel_get_drm_devid(data.drm_fd);
-			data.rendercopy = igt_get_render_copyfunc(data.devid);
-		}
-		igt_debug("Using %s for restoring test image\n", (data.rendercopy == NULL)?"Cairo":"rendercopy");
 	}
 
 	data.cursor_max_w = cursor_width;
@@ -855,11 +795,6 @@ igt_main
 			igt_pipe_crc_free(data.pipe_crc);
 		}
 
-		if (data.bufmgr != NULL) {
-			intel_batchbuffer_free(data.batch);
-			drm_intel_bufmgr_destroy(data.bufmgr);
-		}
-
 		igt_display_fini(&data.display);
 	}
 }
Signature · 6 lines
2.20.1

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

[igt-dev] ✓ Fi.CI.BAT: success for tests/kms_cursor_crc Stripping rendercopy implementation to use cairo

== Series Details ==

== Series Details ==

Series: tests/kms_cursor_crc Stripping rendercopy implementation to use cairo
URL : https://patchwork.freedesktop.org/series/81280/
State : success

== Summary ==

CI Bug Log - changes from IGT_5777 -> IGTPW_4948
====================================================

Summary
-------

**SUCCESS**

No regressions found.

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

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

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

### IGT changes ###

#### Issues hit ####

* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic:
- fi-bsw-kefka: [PASS][1] -> [DMESG-WARN][2] ([i915#1982])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/fi-bsw-kefka/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/fi-bsw-kefka/igt@[email protected]

* igt@kms_cursor_legacy@basic-flip-before-cursor-atomic:
- fi-icl-u2: [PASS][3] -> [DMESG-WARN][4] ([i915#1982])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/fi-icl-u2/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/fi-icl-u2/igt@[email protected]

#### Possible fixes ####

* igt@kms_cursor_legacy@basic-flip-after-cursor-legacy:
- fi-icl-u2: [DMESG-WARN][5] ([i915#1982]) -> [PASS][6] +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/fi-icl-u2/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/fi-icl-u2/igt@[email protected]

* igt@kms_frontbuffer_tracking@basic:
- fi-cml-s: [DMESG-WARN][7] ([i915#1982]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/fi-cml-s/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/fi-cml-s/igt@[email protected]

#### Warnings ####

* igt@i915_module_load@reload:
- fi-icl-u2: [DMESG-WARN][9] ([i915#1982] / [i915#289]) -> [DMESG-WARN][10] ([i915#289])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/fi-icl-u2/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/fi-icl-u2/igt@[email protected]

[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#289]: https://gitlab.freedesktop.org/drm/intel/issues/289

Participating hosts (38 -> 33)
------------------------------

Missing (5): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-byt-clapper

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

* CI: CI-20190529 -> None
* IGT: IGT_5777 -> IGTPW_4948

CI-20190529: 20190529
CI_DRM_8956: a0761632b0f443c3c018aad55866fbda1429770d @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_4948: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/index.html
IGT_5777: c240b5c00d58860e376b012cc3c883c17ae63f37 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools

== Logs ==

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

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

#2 lore raw

[igt-dev] ✓ Fi.CI.IGT: success for tests/kms_cursor_crc Stripping rendercopy implementation to use cairo

In reply to Kamati Srinivas
== Series Details ==

== Series Details ==

Series: tests/kms_cursor_crc Stripping rendercopy implementation to use cairo
URL : https://patchwork.freedesktop.org/series/81280/
State : success

== Summary ==

CI Bug Log - changes from IGT_5777_full -> IGTPW_4948_full
====================================================

Summary
-------

**SUCCESS**

No regressions found.

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

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

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

### IGT changes ###

#### Issues hit ####

* igt@gem_eio@kms:
- shard-snb: [PASS][1] -> [DMESG-WARN][2] ([i915#1982])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-snb4/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-snb2/igt@[email protected]

* igt@gem_exec_reloc@basic-concurrent0:
- shard-kbl: [PASS][3] -> [TIMEOUT][4] ([i915#1958]) +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-kbl1/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-kbl1/igt@[email protected]

* igt@gem_exec_whisper@basic-contexts:
- shard-apl: [PASS][5] -> [TIMEOUT][6] ([i915#1635] / [i915#1958]) +2 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-apl6/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-apl3/igt@[email protected]

* igt@gem_exec_whisper@basic-forked:
- shard-tglb: [PASS][7] -> [TIMEOUT][8] ([i915#1958])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-tglb1/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-tglb8/igt@[email protected]

* igt@gem_exec_whisper@basic-queues-forked-all:
- shard-glk: [PASS][9] -> [TIMEOUT][10] ([i915#1958]) +4 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-glk5/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-glk7/igt@[email protected]

* igt@gen9_exec_parse@allowed-all:
- shard-apl: [PASS][11] -> [DMESG-WARN][12] ([i915#1436] / [i915#1635] / [i915#716])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-apl6/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-apl8/igt@[email protected]

* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [PASS][13] -> [FAIL][14] ([i915#454])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-iclb1/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-iclb2/igt@[email protected]

* igt@kms_big_fb@linear-64bpp-rotate-180:
- shard-glk: [PASS][15] -> [DMESG-FAIL][16] ([i915#118] / [i915#95])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-glk9/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-glk8/igt@[email protected]

* igt@kms_big_fb@x-tiled-64bpp-rotate-180:
- shard-kbl: [PASS][17] -> [DMESG-WARN][18] ([i915#1982]) +2 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-kbl7/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-kbl7/igt@[email protected]

* igt@kms_cursor_crc@pipe-a-cursor-256x256-onscreen:
- shard-apl: [PASS][19] -> [FAIL][20] ([i915#1635] / [i915#54])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-apl4/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-apl4/igt@[email protected]
- shard-kbl: [PASS][21] -> [FAIL][22] ([i915#54])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-kbl4/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-kbl7/igt@[email protected]

* igt@kms_flip@flip-vs-suspend-interruptible@a-dp1:
- shard-kbl: [PASS][23] -> [DMESG-WARN][24] ([i915#180]) +10 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-kbl7/igt@kms_flip@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-kbl7/igt@kms_flip@[email protected]

* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-blt:
- shard-tglb: [PASS][25] -> [DMESG-WARN][26] ([i915#1982]) +2 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-tglb8/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-tglb1/igt@[email protected]

* igt@kms_psr2_su@page_flip:
- shard-tglb: [PASS][27] -> [SKIP][28] ([i915#1911])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-tglb3/igt@kms_psr2_su@page_flip.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-tglb1/igt@kms_psr2_su@page_flip.html

* igt@kms_psr@psr2_cursor_plane_move:
- shard-iclb: [PASS][29] -> [SKIP][30] ([fdo#109441]) +2 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-iclb2/igt@kms_psr@psr2_cursor_plane_move.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-iclb1/igt@kms_psr@psr2_cursor_plane_move.html

* igt@kms_vblank@pipe-b-ts-continuation-dpms-suspend:
- shard-kbl: [PASS][31] -> [INCOMPLETE][32] ([i915#155])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-kbl7/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-kbl4/igt@[email protected]

* igt@perf@polling-parameterized:
- shard-glk: [PASS][33] -> [FAIL][34] ([i915#1542])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-glk9/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-glk9/igt@[email protected]

#### Possible fixes ####

* igt@gem_exec_nop@basic-sequential:
- shard-kbl: [TIMEOUT][35] ([i915#1958]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-kbl1/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-kbl4/igt@[email protected]

* igt@gem_exec_parallel@engines@fds:
- shard-kbl: [INCOMPLETE][37] ([i915#2398] / [i915#794]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-kbl4/igt@gem_exec_parallel@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-kbl1/igt@gem_exec_parallel@[email protected]

* igt@gem_exec_reloc@basic-concurrent0:
- shard-tglb: [TIMEOUT][39] ([i915#1958]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-tglb8/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-tglb7/igt@[email protected]

* igt@gem_exec_reloc@basic-many-active@vecs0:
- shard-glk: [FAIL][41] ([i915#2389]) -> [PASS][42] +1 similar issue
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-glk5/igt@gem_exec_reloc@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-glk4/igt@gem_exec_reloc@[email protected]

* igt@gem_exec_whisper@basic-contexts-forked:
- shard-apl: [TIMEOUT][43] ([i915#1635] / [i915#1958]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-apl7/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-apl3/igt@[email protected]

* igt@gem_exec_whisper@basic-fds:
- shard-iclb: [TIMEOUT][45] ([i915#1958]) -> [PASS][46] +1 similar issue
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-iclb1/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-iclb8/igt@[email protected]

* igt@gem_exec_whisper@basic-normal:
- shard-glk: [TIMEOUT][47] ([i915#1958]) -> [PASS][48] +2 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-glk2/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-glk1/igt@[email protected]

* igt@gen9_exec_parse@allowed-all:
- shard-kbl: [DMESG-WARN][49] ([i915#1436] / [i915#716]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-kbl1/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-kbl4/igt@[email protected]

* igt@i915_selftest@mock@contexts:
- shard-apl: [INCOMPLETE][51] ([i915#1635] / [i915#2278]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-apl8/igt@i915_selftest@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-apl4/igt@i915_selftest@[email protected]

* igt@kms_big_fb@linear-64bpp-rotate-0:
- shard-glk: [DMESG-FAIL][53] ([i915#118] / [i915#95]) -> [PASS][54] +1 similar issue
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-glk8/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-glk5/igt@[email protected]

* igt@kms_big_fb@x-tiled-8bpp-rotate-0:
- shard-kbl: [DMESG-WARN][55] ([i915#1982]) -> [PASS][56] +1 similar issue
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-kbl4/igt@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-kbl4/igt@[email protected]

* igt@kms_cursor_crc@pipe-a-cursor-128x128-sliding:
- shard-apl: [FAIL][57] ([i915#1635] / [i915#54]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-apl8/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-apl2/igt@[email protected]

* igt@kms_flip@2x-flip-vs-blocking-wf-vblank@ac-hdmi-a1-hdmi-a2:
- shard-glk: [FAIL][59] ([i915#2122]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-glk3/igt@kms_flip@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-glk3/igt@kms_flip@[email protected]

* igt@kms_flip@flip-vs-expired-vblank-interruptible@a-dp1:
- shard-apl: [FAIL][61] ([i915#1635] / [i915#79]) -> [PASS][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-apl8/igt@kms_flip@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-apl4/igt@kms_flip@[email protected]

* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-wc:
- shard-tglb: [DMESG-WARN][63] ([i915#1982]) -> [PASS][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-tglb1/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-wc.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-tglb5/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-wc.html

* igt@kms_psr@psr2_primary_page_flip:
- shard-iclb: [SKIP][65] ([fdo#109441]) -> [PASS][66] +2 similar issues
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-iclb5/igt@kms_psr@psr2_primary_page_flip.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-iclb2/igt@kms_psr@psr2_primary_page_flip.html

#### Warnings ####

* igt@gem_exec_suspend@basic-s0:
- shard-tglb: [DMESG-WARN][67] ([i915#2411]) -> [INCOMPLETE][68] ([i915#1602] / [i915#456])
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-tglb5/igt@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-tglb1/igt@[email protected]

* igt@gem_exec_whisper@basic-queues-priority:
- shard-glk: [DMESG-WARN][69] ([i915#118] / [i915#95]) -> [TIMEOUT][70] ([i915#1958])
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-glk4/igt@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-glk4/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-a-alpha-7efc:
- shard-apl: [DMESG-FAIL][71] ([fdo#108145] / [i915#1635] / [i915#1982]) -> [FAIL][72] ([fdo#108145] / [i915#1635] / [i915#265])
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-apl7/igt@[email protected]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-apl4/igt@[email protected]

* igt@runner@aborted:
- shard-apl: [FAIL][73] ([i915#1635]) -> [FAIL][74] ([fdo#109271] / [i915#1635] / [i915#716])
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5777/shard-apl8/igt@[email protected]
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/shard-apl8/igt@[email protected]

[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#155]: https://gitlab.freedesktop.org/drm/intel/issues/155
[i915#1602]: https://gitlab.freedesktop.org/drm/intel/issues/1602
[i915#1635]: https://gitlab.freedesktop.org/drm/intel/issues/1635
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1911]: https://gitlab.freedesktop.org/drm/intel/issues/1911
[i915#1958]: https://gitlab.freedesktop.org/drm/intel/issues/1958
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2278]: https://gitlab.freedesktop.org/drm/intel/issues/2278
[i915#2389]: https://gitlab.freedesktop.org/drm/intel/issues/2389
[i915#2398]: https://gitlab.freedesktop.org/drm/intel/issues/2398
[i915#2411]: https://gitlab.freedesktop.org/drm/intel/issues/2411
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#456]: https://gitlab.freedesktop.org/drm/intel/issues/456
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#794]: https://gitlab.freedesktop.org/drm/intel/issues/794
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95

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

No changes in participating hosts

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

* CI: CI-20190529 -> None
* IGT: IGT_5777 -> IGTPW_4948

CI-20190529: 20190529
CI_DRM_8956: a0761632b0f443c3c018aad55866fbda1429770d @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_4948: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_4948/index.html
IGT_5777: c240b5c00d58860e376b012cc3c883c17ae63f37 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools

== Logs ==

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

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev

Reviewed-by on v1 1/1
#3 lore raw
In reply to Kamati Srinivas
Quoted 2 lines · Kamati Srinivas

Rendercopy implementation is stripped to use cairo for restoring image. With cario, no more crc errors are observed and dead code is removed.

       ^^

cairo

There's colon (:) missing from subject.

otherwise changes look ok, this test doesn't need to use rendercopy.

I'll add missing colon to subject and fix that one typo and push to igt bit later.

Quoted 135 lines
Cc Heikkila, Juha-pekka <[email protected]>
---
  tests/kms_cursor_crc.c | 91 ++++++------------------------------------
  1 file changed, 13 insertions(+), 78 deletions(-)
tests/kms_cursor_crc.c +13 -73
index e9491847..0be8f7f8 100644
@@ -64,11 +64,6 @@ typedef struct {
  	igt_plane_t *cursor;
  	cairo_surface_t *surface;
  	uint32_t devid;
-	drm_intel_bufmgr *bufmgr;
-	igt_render_copyfunc_t rendercopy;
-	drm_intel_bo * drmibo[2];
-	struct intel_batchbuffer *batch;
-	struct igt_buf igtbo[2];
 
  } data_t;
 
@@ -153,23 +148,14 @@ static void restore_image(data_t *data)
  {
  	cairo_t *cr;
 
-	if (data->rendercopy != NULL) {
-		/* use rendercopy if available */
-		data->rendercopy(data->batch, NULL,
-				 &data->igtbo[RESTOREBUFFER], 0, 0,
-				 data->primary_fb[RESTOREBUFFER].width,
-				 data->primary_fb[RESTOREBUFFER].height,
-				 &data->igtbo[FRONTBUFFER], 0, 0);
-	} else {
-		/* if rendercopy not implemented in igt use cairo */
-		cr = igt_get_cairo_ctx(data->drm_fd,
-				       &data->primary_fb[FRONTBUFFER]);
-		cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
-		cairo_set_source_surface(cr, data->surface, 0, 0);
-		cairo_rectangle(cr, 0, 0, data->screenw, data->screenh);
-		cairo_fill(cr);
-		igt_put_cairo_ctx(cr);
-	}
+	/* rendercopy stripped in igt using cairo */
+	cr = igt_get_cairo_ctx(data->drm_fd,
+			       &data->primary_fb[FRONTBUFFER]);
+	cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
+	cairo_set_source_surface(cr, data->surface, 0, 0);
+	cairo_rectangle(cr, 0, 0, data->screenw, data->screenh);
+	cairo_fill(cr);
+	igt_put_cairo_ctx(cr);
  	igt_dirty_fb(data->drm_fd, &data->primary_fb[FRONTBUFFER]);
  }
 
@@ -384,15 +370,6 @@ static void cleanup_crtc(data_t *data)
  	igt_display_reset(display);
  }
 
-static void scratch_buf_init(data_t *data, int buffer)
-{
-	data->igtbo[buffer].bo = data->drmibo[buffer];
-	data->igtbo[buffer].surface[0].stride = data->primary_fb[buffer].strides[0];
-	data->igtbo[buffer].tiling = data->primary_fb[buffer].modifier;
-	data->igtbo[buffer].surface[0].size = data->primary_fb[buffer].size;
-	data->igtbo[buffer].bpp = data->primary_fb[buffer].plane_bpp[0];
-}
-
  static void prepare_crtc(data_t *data, igt_output_t *output,
  			 int cursor_w, int cursor_h)
  {
@@ -443,38 +420,11 @@ static void prepare_crtc(data_t *data, igt_output_t *output,
 
  	data->surface = cairo_image_surface_create(CAIRO_FORMAT_RGB24, data->screenw, data->screenh);
 
-	if (data->rendercopy == NULL) {
-		/* store test image as cairo surface */
-		cr = cairo_create(data->surface);
-		cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
-		igt_paint_test_pattern(cr, data->screenw, data->screenh);
-		cairo_destroy(cr);
-	} else {
-		/* store test image as fb if rendercopy is available */
-		cr = igt_get_cairo_ctx(data->drm_fd,
-		                       &data->primary_fb[RESTOREBUFFER]);
-		cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
-		igt_paint_test_pattern(cr, data->screenw, data->screenh);
-		igt_put_cairo_ctx(cr);
-
-		data->drmibo[FRONTBUFFER] = gem_handle_to_libdrm_bo(data->bufmgr,
-								    data->drm_fd,
-								    "", data->primary_fb[FRONTBUFFER].gem_handle);
-		igt_assert(data->drmibo[FRONTBUFFER]);
-
-		data->drmibo[RESTOREBUFFER] = gem_handle_to_libdrm_bo(data->bufmgr,
-								      data->drm_fd,
-								      "", data->primary_fb[RESTOREBUFFER].gem_handle);
-		igt_assert(data->drmibo[RESTOREBUFFER]);
-
-		scratch_buf_init(data, RESTOREBUFFER);
-		scratch_buf_init(data, FRONTBUFFER);
-
-		data->batch = intel_batchbuffer_alloc(data->bufmgr,
-						      data->devid);
-		igt_assert(data->batch);
-	}
-
+	/* store test image as cairo surface */
+	cr = cairo_create(data->surface);
+	cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
+	igt_paint_test_pattern(cr, data->screenw, data->screenh);
+	cairo_destroy(cr);
  	igt_pipe_crc_start(data->pipe_crc);
  }
 
@@ -830,16 +780,6 @@ igt_main
  		igt_require_pipe_crc(data.drm_fd);
 
  		igt_display_require(&data.display, data.drm_fd);
-
-		if (is_i915_device(data.drm_fd)) {
-			data.bufmgr = drm_intel_bufmgr_gem_init(data.drm_fd, 4096);
-			igt_assert(data.bufmgr);
-			drm_intel_bufmgr_gem_enable_reuse(data.bufmgr);
-
-			data.devid = intel_get_drm_devid(data.drm_fd);
-			data.rendercopy = igt_get_render_copyfunc(data.devid);
-		}
-		igt_debug("Using %s for restoring test image\n", (data.rendercopy == NULL)?"Cairo":"rendercopy");
  	}
 
  	data.cursor_max_w = cursor_width;
@@ -855,11 +795,6 @@ igt_main
  			igt_pipe_crc_free(data.pipe_crc);

tests/kms_cursor_crc.c igt_main · line 800

Quoted 10 lines
tests/kms_cursor_crc.c +0 -5
  		}
 
-		if (data.bufmgr != NULL) {
-			intel_batchbuffer_free(data.batch);
-			drm_intel_bufmgr_destroy(data.bufmgr);
-		}
-
  		igt_display_fini(&data.display);
  	}
  }

_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev