* [igt-dev] [PATCH i-g-t, v3, 1/2] tests/kms_cursor_crc.c: Improve test_cursor_alpha()
@ 2019-02-03 14:38 Mamta Shukla
2019-02-03 15:31 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,v3,1/2] " Patchwork
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Mamta Shukla @ 2019-02-03 14:38 UTC (permalink / raw)
To: igt-dev, daniel, harry.wentland, hamohammed.sa, rodrigosiqueiramelo
In the kms_cursor_crc, the subtest to check exterme alpha values failed due
to different CRCs observed in hardware and software rendering. This patch fixes
CRC mismatch error in cursor-alpha-opaque and cursor-alpha-transparent subtests
by improving the order in which cursor was rendered in hardware test. Changes
made in test_cursor_alpha() to ensure cursor rendering in hardware test and
acquire CRC value:
- Add drmModeSetCursor() to set cursor image.
- Remove igt_display_commit() to reduce the chance of getting crc values cleared
before it is acquired.
- Add igt_remove_fb() to remove locally created framebuffer after disabling the
cursor plane in HW test
Also, aligned this function with test_cursor_size and after these changes
got passing results for alpha blending support added in VKMS CRC API.
Signed-off-by: Mamta Shukla <mamtashukla555@gmail.com>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
---
changes in v2:
-Modify commit message
-Add spaces around '='
No changes in v3.
tests/kms_cursor_crc.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/tests/kms_cursor_crc.c b/tests/kms_cursor_crc.c
index 3c9856d9..144b44b0 100644
--- a/tests/kms_cursor_crc.c
+++ b/tests/kms_cursor_crc.c
@@ -411,26 +411,28 @@ static void test_cursor_alpha(data_t *data, double a)
igt_crc_t crc, ref_crc;
cairo_t *cr;
uint32_t fb_id;
- int curw=data->curw;
- int curh=data->curh;
+ 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] 6+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,v3,1/2] tests/kms_cursor_crc.c: Improve test_cursor_alpha()
2019-02-03 14:38 [igt-dev] [PATCH i-g-t, v3, 1/2] tests/kms_cursor_crc.c: Improve test_cursor_alpha() Mamta Shukla
@ 2019-02-03 15:31 ` Patchwork
2019-02-03 16:28 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2019-02-03 15:31 UTC (permalink / raw)
To: Mamta Shukla; +Cc: igt-dev
== Series Details ==
Series: series starting with [i-g-t,v3,1/2] tests/kms_cursor_crc.c: Improve test_cursor_alpha()
URL : https://patchwork.freedesktop.org/series/56143/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5530 -> IGTPW_2337
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/56143/revisions/1/mbox/
Known issues
------------
Here are the changes found in IGTPW_2337 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_busy@basic-flip-b:
- fi-gdg-551: PASS -> FAIL [fdo#103182]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b:
- fi-apl-guc: PASS -> DMESG-WARN [fdo#108566]
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s3:
- fi-blb-e6850: INCOMPLETE [fdo#107718] -> PASS
* igt@i915_selftest@live_hangcheck:
- {fi-icl-u3}: INCOMPLETE [fdo#108569] -> PASS
* igt@kms_busy@basic-flip-a:
- fi-gdg-551: FAIL [fdo#103182] -> PASS
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103182]: https://bugs.freedesktop.org/show_bug.cgi?id=103182
[fdo#105998]: https://bugs.freedesktop.org/show_bug.cgi?id=105998
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109294]: https://bugs.freedesktop.org/show_bug.cgi?id=109294
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#109527]: https://bugs.freedesktop.org/show_bug.cgi?id=109527
[fdo#109528]: https://bugs.freedesktop.org/show_bug.cgi?id=109528
[fdo#109530]: https://bugs.freedesktop.org/show_bug.cgi?id=109530
Participating hosts (46 -> 43)
------------------------------
Additional (1): fi-icl-y
Missing (4): fi-byt-clapper fi-ilk-m540 fi-byt-squawks fi-bsw-cyan
Build changes
-------------
* IGT: IGT_4804 -> IGTPW_2337
CI_DRM_5530: 172243f0dd47614186ed35cba3a001ab9c2ad00a @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_2337: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2337/
IGT_4804: 0b9ac934a6aad9ed5c1fdfd48d2b0faa10bfbbc4 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2337/
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 6+ messages in thread
* [igt-dev] ✓ Fi.CI.IGT: success for series starting with [i-g-t,v3,1/2] tests/kms_cursor_crc.c: Improve test_cursor_alpha()
2019-02-03 14:38 [igt-dev] [PATCH i-g-t, v3, 1/2] tests/kms_cursor_crc.c: Improve test_cursor_alpha() Mamta Shukla
2019-02-03 15:31 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,v3,1/2] " Patchwork
@ 2019-02-03 16:28 ` Patchwork
[not found] ` <f6b066cd3ad75629844ade3853e71c6c0786f3a1.1549204343.git.mamtashukla555@gmail.com>
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2019-02-03 16:28 UTC (permalink / raw)
To: Mamta Shukla; +Cc: igt-dev
== Series Details ==
Series: series starting with [i-g-t,v3,1/2] tests/kms_cursor_crc.c: Improve test_cursor_alpha()
URL : https://patchwork.freedesktop.org/series/56143/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5530_full -> IGTPW_2337_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/56143/revisions/1/mbox/
Known issues
------------
Here are the changes found in IGTPW_2337_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_eio@reset-stress:
- shard-snb: PASS -> INCOMPLETE [fdo#105411]
* igt@i915_suspend@shrink:
- shard-apl: NOTRUN -> DMESG-WARN [fdo#107886] / [fdo#109244]
* igt@kms_busy@extended-modeset-hang-newfb-render-a:
- shard-snb: NOTRUN -> DMESG-WARN [fdo#107956]
* igt@kms_busy@extended-pageflip-hang-newfb-render-b:
- shard-apl: NOTRUN -> DMESG-WARN [fdo#107956]
* igt@kms_color@pipe-b-degamma:
- shard-kbl: PASS -> FAIL [fdo#104782]
- shard-apl: PASS -> FAIL [fdo#104782]
* igt@kms_cursor_crc@cursor-256x256-dpms:
- shard-apl: PASS -> FAIL [fdo#103232]
* igt@kms_cursor_crc@cursor-256x256-suspend:
- shard-kbl: PASS -> INCOMPLETE [fdo#103665]
* igt@kms_cursor_crc@cursor-64x64-sliding:
- shard-glk: PASS -> FAIL [fdo#103232] +1
- shard-kbl: PASS -> FAIL [fdo#103232]
* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-kbl: PASS -> FAIL [fdo#102887] / [fdo#105363]
- shard-glk: PASS -> FAIL [fdo#102887] / [fdo#105363]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-wc:
- shard-kbl: PASS -> FAIL [fdo#103167]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt:
- shard-apl: PASS -> FAIL [fdo#103167] +1
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-onoff:
- shard-glk: PASS -> FAIL [fdo#103167] +5
* igt@kms_plane@pixel-format-pipe-c-planes-source-clamping:
- shard-apl: NOTRUN -> FAIL [fdo#108948]
* igt@kms_plane@plane-position-covered-pipe-a-planes:
- shard-glk: PASS -> FAIL [fdo#103166] +3
* igt@kms_plane_alpha_blend@pipe-c-alpha-7efc:
- shard-kbl: NOTRUN -> FAIL [fdo#108145] / [fdo#108590]
- shard-apl: NOTRUN -> FAIL [fdo#108145] +2
* igt@kms_plane_multiple@atomic-pipe-a-tiling-yf:
- shard-kbl: PASS -> FAIL [fdo#103166] +2
* igt@kms_plane_multiple@atomic-pipe-b-tiling-none:
- shard-apl: PASS -> FAIL [fdo#103166] +5
* igt@kms_plane_multiple@atomic-pipe-b-tiling-x:
- shard-apl: NOTRUN -> FAIL [fdo#103166] +1
* igt@perf_pmu@rc6-runtime-pm:
- shard-kbl: PASS -> FAIL [fdo#105010]
#### Possible fixes ####
* igt@kms_busy@extended-pageflip-hang-oldfb-render-b:
- shard-apl: DMESG-WARN [fdo#103558] / [fdo#105602] -> PASS
* igt@kms_ccs@pipe-a-crc-sprite-planes-basic:
- shard-glk: FAIL [fdo#108145] -> PASS
- shard-kbl: FAIL [fdo#107725] / [fdo#108145] -> PASS
* igt@kms_color@pipe-b-ctm-max:
- shard-apl: FAIL [fdo#108147] -> PASS
* igt@kms_cursor_crc@cursor-128x42-random:
- shard-glk: INCOMPLETE [fdo#103359] / [k.org#198133] -> PASS
* igt@kms_cursor_crc@cursor-256x256-onscreen:
- shard-kbl: FAIL [fdo#103232] -> PASS
* igt@kms_cursor_crc@cursor-256x85-onscreen:
- shard-apl: FAIL [fdo#103232] -> PASS +5
- shard-glk: FAIL [fdo#103232] -> PASS +1
* igt@kms_cursor_crc@cursor-64x64-suspend:
- shard-apl: FAIL [fdo#103191] / [fdo#103232] -> PASS
* igt@kms_cursor_crc@cursor-alpha-opaque:
- shard-kbl: 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
- shard-apl: FAIL [fdo#109350] -> PASS
* igt@kms_flip@dpms-vs-vblank-race-interruptible:
- shard-glk: FAIL [fdo#103060] -> PASS
* igt@kms_flip@flip-vs-expired-vblank:
- shard-glk: FAIL [fdo#102887] / [fdo#105363] -> PASS
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-onoff:
- shard-kbl: FAIL [fdo#103167] -> PASS
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite:
- shard-apl: FAIL [fdo#103167] -> PASS +4
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-draw-mmap-wc:
- shard-glk: FAIL [fdo#103167] -> PASS +4
* igt@kms_frontbuffer_tracking@fbc-2p-rte:
- shard-glk: FAIL [fdo#103167] / [fdo#105682] -> PASS
* igt@kms_plane@pixel-format-pipe-a-planes-source-clamping:
- shard-glk: FAIL [fdo#108948] -> PASS
* igt@kms_plane_multiple@atomic-pipe-c-tiling-none:
- shard-glk: FAIL [fdo#103166] -> PASS +3
* igt@kms_plane_multiple@atomic-pipe-c-tiling-yf:
- shard-apl: FAIL [fdo#103166] -> PASS +1
* igt@kms_setmode@basic:
- shard-apl: FAIL [fdo#99912] -> PASS
* igt@pm_rc6_residency@rc6-accuracy:
- shard-snb: {SKIP} [fdo#109271] -> PASS
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#102887]: https://bugs.freedesktop.org/show_bug.cgi?id=102887
[fdo#103060]: https://bugs.freedesktop.org/show_bug.cgi?id=103060
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103359]: https://bugs.freedesktop.org/show_bug.cgi?id=103359
[fdo#103558]: https://bugs.freedesktop.org/show_bug.cgi?id=103558
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#104782]: https://bugs.freedesktop.org/show_bug.cgi?id=104782
[fdo#105010]: https://bugs.freedesktop.org/show_bug.cgi?id=105010
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
[fdo#105602]: https://bugs.freedesktop.org/show_bug.cgi?id=105602
[fdo#105682]: https://bugs.freedesktop.org/show_bug.cgi?id=105682
[fdo#107725]: https://bugs.freedesktop.org/show_bug.cgi?id=107725
[fdo#107886]: https://bugs.freedesktop.org/show_bug.cgi?id=107886
[fdo#107956]: https://bugs.freedesktop.org/show_bug.cgi?id=107956
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108147]: https://bugs.freedesktop.org/show_bug.cgi?id=108147
[fdo#108590]: https://bugs.freedesktop.org/show_bug.cgi?id=108590
[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
[k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133
Participating hosts (7 -> 5)
------------------------------
Missing (2): shard-skl shard-iclb
Build changes
-------------
* IGT: IGT_4804 -> IGTPW_2337
* Piglit: piglit_4509 -> None
CI_DRM_5530: 172243f0dd47614186ed35cba3a001ab9c2ad00a @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_2337: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2337/
IGT_4804: 0b9ac934a6aad9ed5c1fdfd48d2b0faa10bfbbc4 @ 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_2337/
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [igt-dev] [PATCH i-g-t, v3, 2/2] tests/kms_cursor_crc.c: Remove framebuffer at the end of the test
[not found] ` <f6b066cd3ad75629844ade3853e71c6c0786f3a1.1549204343.git.mamtashukla555@gmail.com>
@ 2019-02-03 20:25 ` Rodrigo Siqueira
0 siblings, 0 replies; 6+ messages in thread
From: Rodrigo Siqueira @ 2019-02-03 20:25 UTC (permalink / raw)
To: Mamta Shukla; +Cc: igt-dev, hamohammed.sa, daniel
[-- Attachment #1.1: Type: text/plain, Size: 1240 bytes --]
On 02/03, Mamta Shukla wrote:
> Use igt_remove_fb(data->drm_fd, &data->fb) to remove locally
> created framebuffer at the end of the hardware test loop in
> test_cursor_size() function for cursor-size-change subtest in
> kms_cursor_crc.
>
> Signed-off-by: Mamta Shukla <mamtashukla555@gmail.com>
> Reviewed-by: Harry Wentland <harry.wentland@amd.com>
> ---
> No changes in v2
>
> changes in v3:
> -Modify commit message
>
> 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 144b44b0..fd74fda5 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
>
Reviewed-by: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
--
Rodrigo Siqueira
https://siqueira.tech
Graduate Student
Department of Computer Science
University of São Paulo
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 154 bytes --]
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [igt-dev] [PATCH i-g-t, v3, 1/2] tests/kms_cursor_crc.c: Improve test_cursor_alpha()
2019-02-03 14:38 [igt-dev] [PATCH i-g-t, v3, 1/2] tests/kms_cursor_crc.c: Improve test_cursor_alpha() Mamta Shukla
` (2 preceding siblings ...)
[not found] ` <f6b066cd3ad75629844ade3853e71c6c0786f3a1.1549204343.git.mamtashukla555@gmail.com>
@ 2019-02-03 20:26 ` Rodrigo Siqueira
2019-02-04 13:04 ` Petri Latvala
4 siblings, 0 replies; 6+ messages in thread
From: Rodrigo Siqueira @ 2019-02-03 20:26 UTC (permalink / raw)
To: Mamta Shukla; +Cc: igt-dev, hamohammed.sa, daniel
[-- Attachment #1.1: Type: text/plain, Size: 3186 bytes --]
On 02/03, Mamta Shukla wrote:
> In the kms_cursor_crc, the subtest to check exterme alpha values failed due
> to different CRCs observed in hardware and software rendering. This patch fixes
> CRC mismatch error in cursor-alpha-opaque and cursor-alpha-transparent subtests
> by improving the order in which cursor was rendered in hardware test. Changes
> made in test_cursor_alpha() to ensure cursor rendering in hardware test and
> acquire CRC value:
> - Add drmModeSetCursor() to set cursor image.
> - Remove igt_display_commit() to reduce the chance of getting crc values cleared
> before it is acquired.
> - Add igt_remove_fb() to remove locally created framebuffer after disabling the
> cursor plane in HW test
>
> Also, aligned this function with test_cursor_size and after these changes
> got passing results for alpha blending support added in VKMS CRC API.
>
> Signed-off-by: Mamta Shukla <mamtashukla555@gmail.com>
> Reviewed-by: Harry Wentland <harry.wentland@amd.com>
> ---
> changes in v2:
> -Modify commit message
> -Add spaces around '='
>
> No changes in v3.
>
> tests/kms_cursor_crc.c | 15 ++++++++-------
> 1 file changed, 8 insertions(+), 7 deletions(-)
>
> diff --git a/tests/kms_cursor_crc.c b/tests/kms_cursor_crc.c
> index 3c9856d9..144b44b0 100644
> --- a/tests/kms_cursor_crc.c
> +++ b/tests/kms_cursor_crc.c
> @@ -411,26 +411,28 @@ static void test_cursor_alpha(data_t *data, double a)
> igt_crc_t crc, ref_crc;
> cairo_t *cr;
> uint32_t fb_id;
> - int curw=data->curw;
> - int curh=data->curh;
> + 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
>
Reviewed-by: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
--
Rodrigo Siqueira
https://siqueira.tech
Graduate Student
Department of Computer Science
University of São Paulo
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 154 bytes --]
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [igt-dev] [PATCH i-g-t, v3, 1/2] tests/kms_cursor_crc.c: Improve test_cursor_alpha()
2019-02-03 14:38 [igt-dev] [PATCH i-g-t, v3, 1/2] tests/kms_cursor_crc.c: Improve test_cursor_alpha() Mamta Shukla
` (3 preceding siblings ...)
2019-02-03 20:26 ` [igt-dev] [PATCH i-g-t, v3, 1/2] tests/kms_cursor_crc.c: Improve test_cursor_alpha() Rodrigo Siqueira
@ 2019-02-04 13:04 ` Petri Latvala
4 siblings, 0 replies; 6+ messages in thread
From: Petri Latvala @ 2019-02-04 13:04 UTC (permalink / raw)
To: Mamta Shukla; +Cc: igt-dev, hamohammed.sa, daniel
On Sun, Feb 03, 2019 at 08:08:03PM +0530, Mamta Shukla wrote:
> In the kms_cursor_crc, the subtest to check exterme alpha values failed due
> to different CRCs observed in hardware and software rendering. This patch fixes
> CRC mismatch error in cursor-alpha-opaque and cursor-alpha-transparent subtests
> by improving the order in which cursor was rendered in hardware test. Changes
> made in test_cursor_alpha() to ensure cursor rendering in hardware test and
> acquire CRC value:
> - Add drmModeSetCursor() to set cursor image.
> - Remove igt_display_commit() to reduce the chance of getting crc values cleared
> before it is acquired.
> - Add igt_remove_fb() to remove locally created framebuffer after disabling the
> cursor plane in HW test
>
> Also, aligned this function with test_cursor_size and after these changes
> got passing results for alpha blending support added in VKMS CRC API.
>
> Signed-off-by: Mamta Shukla <mamtashukla555@gmail.com>
> Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Added link to https://bugs.freedesktop.org/show_bug.cgi?id=109350 and
merged the bunch, thanks.
--
Petri Latvala
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-02-04 13:05 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-03 14:38 [igt-dev] [PATCH i-g-t, v3, 1/2] tests/kms_cursor_crc.c: Improve test_cursor_alpha() Mamta Shukla
2019-02-03 15:31 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,v3,1/2] " Patchwork
2019-02-03 16:28 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
[not found] ` <f6b066cd3ad75629844ade3853e71c6c0786f3a1.1549204343.git.mamtashukla555@gmail.com>
2019-02-03 20:25 ` [igt-dev] [PATCH i-g-t, v3, 2/2] tests/kms_cursor_crc.c: Remove framebuffer at the end of the test Rodrigo Siqueira
2019-02-03 20:26 ` [igt-dev] [PATCH i-g-t, v3, 1/2] tests/kms_cursor_crc.c: Improve test_cursor_alpha() Rodrigo Siqueira
2019-02-04 13:04 ` Petri Latvala
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.