* [igt-dev] [PATCH 1/2] tests/kms_cursor_crc.c: Improve test_cursor_alpha()
@ 2019-01-24 5:40 Mamta Shukla
2019-01-24 5:57 ` [igt-dev] [PATCH i-g-t, 2/2] tests/kms_cursor_crc.c: Remove framebuffer at the end of the test Mamta Shukla
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Mamta Shukla @ 2019-01-24 5:40 UTC (permalink / raw)
To: igt-dev; +Cc: hamohammed.sa, daniel
Changes in test_cursor_alpha() to fix CRC mismatch error
[1] Set cursor plane in HW test using drmModeSetCursor()
[2] Remove igt_display_commit()
[3] Add igt_remove_fb() after disabling the cursor plane in HW test.
This function is aligned with test_cursor_size.
With the above changes,got passing results for alpha blending support
added in VKMS CRC API.
Signed-off-by: Mamta Shukla <mamtashukla555@gmail.com>
---
tests/kms_cursor_crc.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/tests/kms_cursor_crc.c b/tests/kms_cursor_crc.c
index 3c9856d9..c1ea7faf 100644
--- a/tests/kms_cursor_crc.c
+++ b/tests/kms_cursor_crc.c
@@ -413,24 +413,26 @@ static void test_cursor_alpha(data_t *data, double a)
uint32_t fb_id;
int curw=data->curw;
int curh=data->curh;
+ int ret;
/*alpha cursor fb*/
- fb_id = igt_create_color_fb(data->drm_fd, curw, curh,
+ fb_id = igt_create_fb(data->drm_fd, curw, curh,
DRM_FORMAT_ARGB8888,
LOCAL_DRM_FORMAT_MOD_NONE,
- 1.0, 1.0, 1.0,
&data->fb);
igt_assert(fb_id);
cr = igt_get_cairo_ctx(data->drm_fd, &data->fb);
- draw_cursor(cr, 0, 0, curw, curh, a);
+ igt_paint_color_alpha(cr, 0, 0, curw, curh, 1.0, 1.0, 1.0, a);
igt_put_cairo_ctx(data->drm_fd, &data->fb, cr);
/*Hardware Test*/
cursor_enable(data);
- igt_display_commit(display);
+ ret=drmModeSetCursor(data->drm_fd, data->output->config.crtc->crtc_id, data->fb.gem_handle, curw, curh);
+ igt_assert_eq(ret, 0);
igt_wait_for_vblank(data->drm_fd, data->pipe);
igt_pipe_crc_collect_crc(pipe_crc, &crc);
cursor_disable(data);
+ igt_remove_fb(data->drm_fd, &data->fb);
/*Software Test*/
cr = igt_get_cairo_ctx(data->drm_fd, &data->primary_fb);
@@ -447,7 +449,6 @@ static void test_cursor_alpha(data_t *data, double a)
igt_paint_color(cr, 0, 0, data->screenw, data->screenh,
0.0, 0.0, 0.0);
igt_put_cairo_ctx(data->drm_fd, &data->primary_fb, cr);
- igt_remove_fb(data->drm_fd, &data->fb);
}
static void test_cursor_transparent(data_t *data)
--
2.17.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [igt-dev] [PATCH i-g-t, 2/2] tests/kms_cursor_crc.c: Remove framebuffer at the end of the test
2019-01-24 5:40 [igt-dev] [PATCH 1/2] tests/kms_cursor_crc.c: Improve test_cursor_alpha() Mamta Shukla
@ 2019-01-24 5:57 ` Mamta Shukla
2019-01-24 6:34 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [1/2] tests/kms_cursor_crc.c: Improve test_cursor_alpha() Patchwork
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Mamta Shukla @ 2019-01-24 5:57 UTC (permalink / raw)
To: igt-dev, harry.wentland, daniel, hamohammed.sa,
rodrigosiqueiramelo
Use igt_remove_fb(data->drm_fd, &data->fb) to remove locally created
framebuffer at the end of the hardware test.
Signed-off-by: Mamta Shukla <mamtashukla555@gmail.com>
---
tests/kms_cursor_crc.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/kms_cursor_crc.c b/tests/kms_cursor_crc.c
index c1ea7faf..0ac2c226 100644
--- a/tests/kms_cursor_crc.c
+++ b/tests/kms_cursor_crc.c
@@ -583,6 +583,7 @@ static void test_cursor_size(data_t *data)
igt_pipe_crc_collect_crc(pipe_crc, &crc[i]);
}
cursor_disable(data);
+ igt_remove_fb(data->drm_fd, &data->fb);
/* Software test loop */
for (i = 0, size = cursor_max_size; size >= 64; size /= 2, i++) {
/* Now render the same in software and collect crc */
--
2.17.1
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for series starting with [1/2] tests/kms_cursor_crc.c: Improve test_cursor_alpha()
2019-01-24 5:40 [igt-dev] [PATCH 1/2] tests/kms_cursor_crc.c: Improve test_cursor_alpha() Mamta Shukla
2019-01-24 5:57 ` [igt-dev] [PATCH i-g-t, 2/2] tests/kms_cursor_crc.c: Remove framebuffer at the end of the test Mamta Shukla
@ 2019-01-24 6:34 ` Patchwork
2019-01-24 7:21 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2019-01-24 21:10 ` [igt-dev] [PATCH i-g-t, 1/2] " Rodrigo Siqueira
3 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2019-01-24 6:34 UTC (permalink / raw)
To: Mamta Shukla; +Cc: igt-dev
== Series Details ==
Series: series starting with [1/2] tests/kms_cursor_crc.c: Improve test_cursor_alpha()
URL : https://patchwork.freedesktop.org/series/55666/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5472 -> IGTPW_2288
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/55666/revisions/1/mbox/
Known issues
------------
Here are the changes found in IGTPW_2288 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@debugfs_test@read_all_entries:
- fi-kbl-7567u: PASS -> DMESG-WARN [fdo#103558] / [fdo#105602]
* igt@gem_exec_suspend@basic-s3:
- fi-kbl-7567u: PASS -> DMESG-WARN [fdo#103558] / [fdo#105079] / [fdo#105602]
* igt@i915_module_load@reload-with-fault-injection:
- fi-kbl-7567u: PASS -> DMESG-WARN [fdo#105602] / [fdo#108529] +1
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-kbl-7567u: PASS -> DMESG-FAIL [fdo#105079]
* igt@pm_rpm@module-reload:
- fi-kbl-7567u: PASS -> DMESG-WARN [fdo#108529]
#### Possible fixes ####
* igt@i915_selftest@live_hangcheck:
- {fi-icl-u3}: INCOMPLETE [fdo#108569] / [fdo#109226] -> PASS
* igt@pm_rpm@basic-pci-d3-state:
- fi-byt-j1900: {SKIP} [fdo#109271] -> PASS
* igt@pm_rpm@basic-rte:
- fi-byt-j1900: FAIL [fdo#108800] -> PASS
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103558]: https://bugs.freedesktop.org/show_bug.cgi?id=103558
[fdo#105079]: https://bugs.freedesktop.org/show_bug.cgi?id=105079
[fdo#105602]: https://bugs.freedesktop.org/show_bug.cgi?id=105602
[fdo#108529]: https://bugs.freedesktop.org/show_bug.cgi?id=108529
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[fdo#108800]: https://bugs.freedesktop.org/show_bug.cgi?id=108800
[fdo#109226]: https://bugs.freedesktop.org/show_bug.cgi?id=109226
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
Participating hosts (45 -> 39)
------------------------------
Missing (6): fi-kbl-soraka fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-icl-y fi-skl-6700hq
Build changes
-------------
* IGT: IGT_4786 -> IGTPW_2288
CI_DRM_5472: c7fd80b9e4d5e789377f0f4a52a889c589226064 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_2288: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2288/
IGT_4786: 85cf76182087c09604bcae2bbee9e58b33bcb4f2 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2288/
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 5+ messages in thread
* [igt-dev] ✓ Fi.CI.IGT: success for series starting with [1/2] tests/kms_cursor_crc.c: Improve test_cursor_alpha()
2019-01-24 5:40 [igt-dev] [PATCH 1/2] tests/kms_cursor_crc.c: Improve test_cursor_alpha() Mamta Shukla
2019-01-24 5:57 ` [igt-dev] [PATCH i-g-t, 2/2] tests/kms_cursor_crc.c: Remove framebuffer at the end of the test Mamta Shukla
2019-01-24 6:34 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [1/2] tests/kms_cursor_crc.c: Improve test_cursor_alpha() Patchwork
@ 2019-01-24 7:21 ` Patchwork
2019-01-24 21:10 ` [igt-dev] [PATCH i-g-t, 1/2] " Rodrigo Siqueira
3 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2019-01-24 7:21 UTC (permalink / raw)
To: Mamta Shukla; +Cc: igt-dev
== Series Details ==
Series: series starting with [1/2] tests/kms_cursor_crc.c: Improve test_cursor_alpha()
URL : https://patchwork.freedesktop.org/series/55666/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5472_full -> IGTPW_2288_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/55666/revisions/1/mbox/
Known issues
------------
Here are the changes found in IGTPW_2288_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_isolation@bcs0-s3:
- shard-kbl: PASS -> INCOMPLETE [fdo#103665]
* igt@kms_available_modes_crc@available_mode_test_crc:
- shard-apl: PASS -> FAIL [fdo#106641]
- shard-glk: PASS -> FAIL [fdo#106641]
- shard-kbl: PASS -> FAIL [fdo#106641]
* igt@kms_color@pipe-c-ctm-max:
- shard-kbl: PASS -> FAIL [fdo#108147]
- shard-apl: PASS -> FAIL [fdo#108147]
* igt@kms_cursor_crc@cursor-256x85-onscreen:
- shard-glk: PASS -> FAIL [fdo#103232] +5
* igt@kms_cursor_crc@cursor-64x21-sliding:
- shard-apl: PASS -> FAIL [fdo#103232] +1
* igt@kms_flip@2x-modeset-vs-vblank-race:
- shard-hsw: PASS -> DMESG-WARN [fdo#102614] +1
* igt@kms_plane@pixel-format-pipe-a-planes-source-clamping:
- shard-apl: PASS -> FAIL [fdo#108948]
* igt@kms_plane@plane-position-covered-pipe-c-planes:
- shard-apl: PASS -> FAIL [fdo#103166] +4
* igt@kms_plane_alpha_blend@pipe-c-alpha-basic:
- shard-glk: NOTRUN -> FAIL [fdo#108145]
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-max:
- shard-glk: PASS -> FAIL [fdo#108145] +1
* igt@kms_plane_multiple@atomic-pipe-a-tiling-yf:
- shard-kbl: PASS -> FAIL [fdo#103166] +1
* igt@kms_plane_multiple@atomic-pipe-b-tiling-none:
- shard-glk: PASS -> FAIL [fdo#103166] +7
* igt@kms_setmode@basic:
- shard-apl: PASS -> FAIL [fdo#99912]
#### Possible fixes ####
* igt@gem_pwrite@big-cpu-backwards:
- shard-snb: INCOMPLETE [fdo#105411] / [fdo#107469] -> PASS
* igt@kms_color@pipe-b-degamma:
- shard-apl: FAIL [fdo#104782] -> PASS
* igt@kms_cursor_crc@cursor-128x128-random:
- shard-apl: FAIL [fdo#103232] -> PASS +6
* igt@kms_cursor_crc@cursor-128x42-sliding:
- shard-kbl: FAIL [fdo#103232] -> PASS +1
* igt@kms_cursor_crc@cursor-256x256-sliding:
- shard-glk: FAIL [fdo#103232] -> PASS +1
* igt@kms_cursor_crc@cursor-alpha-opaque:
- shard-kbl: FAIL [fdo#109350] -> PASS +1
- shard-apl: FAIL [fdo#109350] -> PASS +1
- shard-snb: FAIL [fdo#109350] -> PASS +1
* igt@kms_cursor_crc@cursor-alpha-transparent:
- shard-hsw: FAIL [fdo#109350] -> PASS +1
- shard-glk: FAIL [fdo#109350] -> PASS +1
* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-apl: FAIL [fdo#102887] / [fdo#105363] -> PASS
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes:
- shard-kbl: INCOMPLETE [fdo#103665] -> PASS
* igt@kms_plane@plane-position-covered-pipe-a-planes:
- shard-glk: FAIL [fdo#103166] -> PASS +1
* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-max:
- shard-glk: FAIL [fdo#108145] -> PASS
* igt@kms_plane_lowres@pipe-a-tiling-none:
- shard-snb: {SKIP} [fdo#109271] -> PASS
* igt@kms_plane_multiple@atomic-pipe-a-tiling-none:
- shard-kbl: FAIL [fdo#103166] -> PASS +1
* igt@kms_plane_multiple@atomic-pipe-b-tiling-none:
- shard-apl: FAIL [fdo#103166] -> PASS +2
* igt@kms_setmode@basic:
- shard-hsw: FAIL [fdo#99912] -> PASS
#### Warnings ####
* igt@gem_cs_tlb@bsd2:
- shard-snb: {SKIP} [fdo#109271] -> INCOMPLETE [fdo#105411] / [fdo#107469]
* igt@i915_suspend@shrink:
- shard-snb: DMESG-WARN [fdo#109244] -> INCOMPLETE [fdo#105411] / [fdo#106886]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#102614]: https://bugs.freedesktop.org/show_bug.cgi?id=102614
[fdo#102887]: https://bugs.freedesktop.org/show_bug.cgi?id=102887
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#104782]: https://bugs.freedesktop.org/show_bug.cgi?id=104782
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
[fdo#106641]: https://bugs.freedesktop.org/show_bug.cgi?id=106641
[fdo#106886]: https://bugs.freedesktop.org/show_bug.cgi?id=106886
[fdo#107469]: https://bugs.freedesktop.org/show_bug.cgi?id=107469
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108147]: https://bugs.freedesktop.org/show_bug.cgi?id=108147
[fdo#108948]: https://bugs.freedesktop.org/show_bug.cgi?id=108948
[fdo#109244]: https://bugs.freedesktop.org/show_bug.cgi?id=109244
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109350]: https://bugs.freedesktop.org/show_bug.cgi?id=109350
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (7 -> 5)
------------------------------
Missing (2): shard-skl shard-iclb
Build changes
-------------
* IGT: IGT_4786 -> IGTPW_2288
* Piglit: piglit_4509 -> None
CI_DRM_5472: c7fd80b9e4d5e789377f0f4a52a889c589226064 @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_2288: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2288/
IGT_4786: 85cf76182087c09604bcae2bbee9e58b33bcb4f2 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2288/
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [igt-dev] [PATCH i-g-t, 1/2] tests/kms_cursor_crc.c: Improve test_cursor_alpha()
2019-01-24 5:40 [igt-dev] [PATCH 1/2] tests/kms_cursor_crc.c: Improve test_cursor_alpha() Mamta Shukla
` (2 preceding siblings ...)
2019-01-24 7:21 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
@ 2019-01-24 21:10 ` Rodrigo Siqueira
3 siblings, 0 replies; 5+ messages in thread
From: Rodrigo Siqueira @ 2019-01-24 21:10 UTC (permalink / raw)
To: Mamta Shukla; +Cc: igt-dev, hamohammed.sa, daniel
Hi,
I checked your patch in two environments:
1. My computer with i915 and kernel 2.20;
2. In a QEMU machine with a patched version of VKMS and running the
Kernel 5.0.
All the tested completed with success \o/
I Just have some tiny comments inline.
On 01/24, Mamta Shukla wrote:
> Changes in test_cursor_alpha() to fix CRC mismatch error
> [1] Set cursor plane in HW test using drmModeSetCursor()
> [2] Remove igt_display_commit()
> [3] Add igt_remove_fb() after disabling the cursor plane in HW test.
>
> This function is aligned with test_cursor_size.
> With the above changes,got passing results for alpha blending support
> added in VKMS CRC API.
Add some additional information about the problem in the commit body.
Additionally, try to improve the commit message to better describe the
problem that you solved here.
> Signed-off-by: Mamta Shukla <mamtashukla555@gmail.com>
> ---
> tests/kms_cursor_crc.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/tests/kms_cursor_crc.c b/tests/kms_cursor_crc.c
> index 3c9856d9..c1ea7faf 100644
> --- a/tests/kms_cursor_crc.c
> +++ b/tests/kms_cursor_crc.c
> @@ -413,24 +413,26 @@ static void test_cursor_alpha(data_t *data, double a)
> uint32_t fb_id;
> int curw=data->curw;
> int curh=data->curh;
> + int ret;
>
> /*alpha cursor fb*/
> - fb_id = igt_create_color_fb(data->drm_fd, curw, curh,
> + fb_id = igt_create_fb(data->drm_fd, curw, curh,
> DRM_FORMAT_ARGB8888,
> LOCAL_DRM_FORMAT_MOD_NONE,
> - 1.0, 1.0, 1.0,
> &data->fb);
> igt_assert(fb_id);
> cr = igt_get_cairo_ctx(data->drm_fd, &data->fb);
> - draw_cursor(cr, 0, 0, curw, curh, a);
> + igt_paint_color_alpha(cr, 0, 0, curw, curh, 1.0, 1.0, 1.0, a);
> igt_put_cairo_ctx(data->drm_fd, &data->fb, cr);
>
> /*Hardware Test*/
> cursor_enable(data);
> - igt_display_commit(display);
> + ret=drmModeSetCursor(data->drm_fd, data->output->config.crtc->crtc_id, data->fb.gem_handle, curw, curh);
Add spaces between '='.
Finally, IMHO patch 1 and 2 could be merged in a single one.
Best Regards
Rodrigo Siqueira
> + igt_assert_eq(ret, 0);
> igt_wait_for_vblank(data->drm_fd, data->pipe);
> igt_pipe_crc_collect_crc(pipe_crc, &crc);
> cursor_disable(data);
> + igt_remove_fb(data->drm_fd, &data->fb);
>
> /*Software Test*/
> cr = igt_get_cairo_ctx(data->drm_fd, &data->primary_fb);
> @@ -447,7 +449,6 @@ static void test_cursor_alpha(data_t *data, double a)
> igt_paint_color(cr, 0, 0, data->screenw, data->screenh,
> 0.0, 0.0, 0.0);
> igt_put_cairo_ctx(data->drm_fd, &data->primary_fb, cr);
> - igt_remove_fb(data->drm_fd, &data->fb);
> }
>
> static void test_cursor_transparent(data_t *data)
> --
> 2.17.1
>
--
Rodrigo Siqueira
https://siqueira.tech
Graduate Student
Department of Computer Science
University of São Paulo
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-01-24 21:10 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-24 5:40 [igt-dev] [PATCH 1/2] tests/kms_cursor_crc.c: Improve test_cursor_alpha() Mamta Shukla
2019-01-24 5:57 ` [igt-dev] [PATCH i-g-t, 2/2] tests/kms_cursor_crc.c: Remove framebuffer at the end of the test Mamta Shukla
2019-01-24 6:34 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [1/2] tests/kms_cursor_crc.c: Improve test_cursor_alpha() Patchwork
2019-01-24 7:21 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2019-01-24 21:10 ` [igt-dev] [PATCH i-g-t, 1/2] " Rodrigo Siqueira
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox