Add FBC support to PSR/PSR2 tests
cover Add FBC support to PSR/PSR2 tests
Jeevan B (2):
tests/intel/kms_psr: Add FBC support to PSR/PSR2/PR tests tests/intel/kms_psr2_sf: Add FBC support to PSR2 tests
lib/igt_psr.h | 5 + tests/intel/kms_psr.c | 488 ++++++++++++++++++++--------- tests/intel/kms_psr2_sf.c | 625 +++++++++++++++++++++----------------- 3 files changed, 711 insertions(+), 407 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/2 tests/intel/kms_psr: Add FBC support to PSR/PSR2/PR tests
For LunarLake (intel_display_ver 20), FBC can be enabled along with PSR/PSR2/PR, thereby adding FBC checks to validate this scenario.
--- lib/igt_psr.h | 5 + tests/intel/kms_psr.c | 488 ++++++++++++++++++++++++++++++------------ 2 files changed, 357 insertions(+), 136 deletions(-)
lib/igt_psr.h +5 -0
@@ -40,6 +40,11 @@ enum psr_mode { PSR_DISABLED, }; +enum fbc_mode { +FBC_ENABLED , +FBC_DISABLED , +}; +bool psr_disabled_check (int debugfs_fd);bool psr2_selective_fetch_check (int debugfs_fd);bool psr_wait_entry (int debugfs_fd,enum psr_mode mode,igt_output_t *output);
tests/intel/kms_psr.c +352 -136
792 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 2/2 tests/intel/kms_psr2_sf: Add FBC support to PSR2 tests
In reply to Jeevan BFor LunarLake (intel_display_ver 20), FBC can be enabled along with PSR2, thereby adding FBC checks to validate this scenario.
--- tests/intel/kms_psr2_sf.c | 625 +++++++++++++++++++++----------------- 1 file changed, 354 insertions(+), 271 deletions(-)
tests/intel/kms_psr2_sf.c +354 -271
@@ -26,6 +26,7 @@#include "igt_sysfs.h" #include "igt_psr.h" #include "kms_dsc_helper.h" +#include "i915/intel_fbc.h" #include <errno.h> #include <stdbool.h> #include <stdio.h>
@@ -44,6 +45,14 @@* Mega feature: PSR * Test category: functionality test * +* SUBTEST: fbc-%s-plane-move-continuous-%s +* Description: Test that fbc with selective fetch works on moving %arg[1] plane %arg[2] +* visible area (no update) +* Driver requirement: i915, xe +* Functionality: plane, psr2, selective_fetch, fbc +* Mega feature: PSR, FBC +* Test category: functionality test +* * arg[1]: * * @cursor: Cursor
@@ -64,6 +73,13 @@* Mega feature: PSR * Test category: functionality test * +* SUBTEST: fbc-cursor-plane-update-sf +* Description: Test that fbc with selective fetch works on cursor plane +* Driver requirement: i915, xe +* Functionality: cursor, psr2, selective_fetch, fbc +* Mega feature: PSR, FBC +* Test category: functionality test +* * SUBTEST: overlay-plane-update-continuous-sf * Description: Test that selective fetch works on overlay plane * Driver requirement: i915, xe
@@ -71,6 +87,13 @@* Mega feature: PSR * Test category: functionality test * +* SUBTEST: fbc-overlay-plane-update-continuous-sf +* Description: Test that fbc with selective fetch works on overlay plane +* Driver requirement: i915, xe +* Functionality: plane, psr2, selective_fetch, fbc +* Mega feature: PSR, FBC +* Test category: functionality test +* * SUBTEST: overlay-plane-update-sf-dmg-area * Description: Test that selective fetch works on overlay plane * Driver requirement: i915, xe
@@ -78,6 +101,13 @@* Mega feature: PSR * Test category: functionality test * +* SUBTEST: fbc-overlay-plane-update-sf-dmg-area +* Description: Test that fbc with selective fetch works on overlay plane +* Driver requirement: i915, xe +* Functionality: plane, psr2, selective_fetch, fbc +* Mega feature: PSR, FBC +* Test category: functionality test +* * SUBTEST: overlay-primary-update-sf-dmg-area * Description: Test that selective fetch works on primary plane with blended * overlay plane
@@ -86,6 +116,14 @@* Mega feature: PSR * Test category: functionality test * +* SUBTEST: fbc-overlay-primary-update-sf-dmg-area +* Description: Test that fbc with selective fetch works on primary plane with blended +* overlay plane +* Driver requirement: i915, xe +* Functionality: plane, psr2, selective_fetch, fbc +* Mega feature: PSR, FBC +* Test category: functionality test +* * SUBTEST: plane-move-sf-dmg-area * Description: Test that selective fetch works on moving overlay plane * Driver requirement: i915, xe
@@ -93,6 +131,13 @@* Mega feature: PSR * Test category: functionality test * +* SUBTEST: fbc-plane-move-sf-dmg-area +* Description: Test that fbc with selective fetch works on moving overlay plane +* Driver requirement: i915, xe +* Functionality: plane, psr2, selective_fetch, fbc +* Mega feature: PSR, FBC +* Test category: functionality test +* * SUBTEST: primary-plane-update-sf-dmg-area * Description: Test that selective fetch works on primary plane * Driver requirement: i915, xe
@@ -100,12 +145,26 @@* Mega feature: PSR * Test category: functionality test * +* SUBTEST: fbc-primary-plane-update-sf-dmg-area +* Description: Test that fbc with selective fetch works on primary plane +* Driver requirement: i915, xe +* Functionality: plane, psr2, selective_fetch, fbc +* Mega feature: PSR, FBC +* Test category: functionality test +* * SUBTEST: primary-plane-update-sf-dmg-area-big-fb * Description: Test that selective fetch works on primary plane with big fb * Driver requirement: i915, xe * Functionality: plane, psr2, selective_fetch * Mega feature: PSR * Test category: functionality test +* +* SUBTEST: fbc-primary-plane-update-sf-dmg-area-big-fb +* Description: Test that fbc with selective fetch works on primary plane with big fb +* Driver requirement: i915, xe +* Functionality: plane, psr2, selective_fetch, fbc +* Mega feature: PSR, FBC +* Test category: functionality test */ IGT_TEST_DESCRIPTION("Tests to varify PSR2 selective fetch by sending multiple"
@@ -157,9 +216,11 @@ typedef struct {struct drm_mode_rect cursor_clip;enum operations op;enum plane_move_postion pos; +enum fbc_mode op_fbc_mode;int test_plane_id;igt_plane_t *test_plane;bool big_fb_test; +bool fbc_flag;cairo_t *cr;uint32_t screen_changes;int cur_x, cur_y;
@@ -865,6 +926,11 @@ static void run(data_t *data)igt_assert (psr_wait_entry (data->debugfs_fd,PSR_MODE_2 ,NULL )); +if (data->fbc_flag) +igt_assert_f (intel_fbc_wait_until_enabled (data->drm_fd, + data->pipe), +"FBC still disabled" ); + data->screen_changes =0 ;switch (data->op) {
@@ -967,10 +1033,15 @@ igt_main {data_t data = {};igt_output_t *outputs[IGT_MAX_PIPES *IGT_MAX_PIPES ]; -int i, j, k; +int i, j, k, y;int pipes[IGT_MAX_PIPES *IGT_MAX_PIPES ];int n_pipes =0 ;int coexist_features[IGT_MAX_PIPES *IGT_MAX_PIPES ]; +const char *append_fbc_subtest[2 ] = { +"" , +"fbc_" + }; +int fbc_status[] = {FBC_DISABLED ,FBC_ENABLED }; igt_fixture {drmModeResPtr res;
@@ -986,6 +1057,11 @@ igt_maindisplay_init (&data); +if ((intel_display_ver (intel_get_drm_devid (data.drm_fd) ==20 )) && + (intel_fbc_supported_on_chipset (data.drm_fd, data.pipe))) { + data.fbc_flag = true; + } +/* Test if PSR2 can be enabled */ igt_require_f(psr_enable(data.drm_fd, data.debugfs_fd, PSR_MODE_2_SEL_FETCH),
@@ -1020,54 +1096,116 @@ igt_main } } -/* Verify primary plane selective fetch */ -igt_describe ("Test that selective fetch works on primary plane" ); - igt_subtest_with_dynamic_f("primary-%s-sf-dmg-area", op_str(data.op)) { -for (i =0 ; i < n_pipes; i++) { -if (!pipe_output_combo_valid (&data.display, pipes[i], outputs[i])) -continue ; +for (y =0 ; y <ARRAY_SIZE (fbc_status); y++) { + + data.op_fbc_mode = fbc_status[y]; +if (data.op_fbc_mode ==FBC_DISABLED ) + data.fbc_flag = false; -for (j =FEATURE_NONE ; j <FEATURE_COUNT ; j++) { -if (j !=FEATURE_NONE && !(coexist_features[i] & j)) +/* Verify primary plane selective fetch */ +igt_describe ("Test that selective fetch works on primary plane" ); + igt_subtest_with_dynamic_f("%sprimary-%s-sf-dmg-area", append_fbc_subtest[y], op_str(data.op)) { +for (i =0 ; i < n_pipes; i++) { +if (!pipe_output_combo_valid (&data.display, pipes[i], outputs[i]))continue ; -igt_dynamic_f ("pipe-%s-%s%s" ,kmstest_pipe_name (pipes[i]), -igt_output_name (outputs[i]), - coexist_feature_str(j)) { - data.pipe = pipes[i]; - data.output = outputs[i]; - data.test_plane_id =DRM_PLANE_TYPE_PRIMARY ; - data.coexist_feature = j; -for (k =1 ; k <=MAX_DAMAGE_AREAS ; k++) { - data.damage_area_count = k; -prepare (&data); -run (&data); -cleanup (&data); + +for (j =FEATURE_NONE ; j <FEATURE_COUNT ; j++) { +if (j !=FEATURE_NONE && !(coexist_features[i] & j)) +continue ; +igt_dynamic_f ("pipe-%s-%s%s" ,kmstest_pipe_name (pipes[i]), +igt_output_name (outputs[i]), + coexist_feature_str(j)) { + data.pipe = pipes[i]; + data.output = outputs[i]; + data.test_plane_id =DRM_PLANE_TYPE_PRIMARY ; + data.coexist_feature = j; +for (k =1 ; k <=MAX_DAMAGE_AREAS ; k++) { + data.damage_area_count = k; +prepare (&data); +run (&data); +cleanup (&data); + } + } + } + } + } + +/* Verify primary plane selective fetch with big fb */ + data.big_fb_test =1 ; +igt_describe ("Test that selective fetch works on primary plane with big fb" ); + igt_subtest_with_dynamic_f("%sprimary-%s-sf-dmg-area-big-fb", append_fbc_subtest[y], op_str(data.op)) { +for (i =0 ; i < n_pipes; i++) { +if (!pipe_output_combo_valid (&data.display, pipes[i], outputs[i])) +continue ; + +for (j =FEATURE_NONE ; j <FEATURE_COUNT ; j++) { +if (j !=FEATURE_NONE && !(coexist_features[i] & j)) +continue ; +igt_dynamic_f ("pipe-%s-%s%s" ,kmstest_pipe_name (pipes[i]), +igt_output_name (outputs[i]), + coexist_feature_str(j)) { + data.pipe = pipes[i]; + data.output = outputs[i]; + data.test_plane_id =DRM_PLANE_TYPE_PRIMARY ; + data.coexist_feature = j; +for (k =1 ; k <=MAX_DAMAGE_AREAS ; k++) { + data.damage_area_count = k; +prepare (&data); +run (&data); +cleanup (&data); + } } } } } - } -/* Verify primary plane selective fetch with big fb */ - data.big_fb_test =1 ; -igt_describe ("Test that selective fetch works on primary plane with big fb" ); - igt_subtest_with_dynamic_f("primary-%s-sf-dmg-area-big-fb", op_str(data.op)) { -for (i =0 ; i < n_pipes; i++) { -if (!pipe_output_combo_valid (&data.display, pipes[i], outputs[i])) -continue ; + data.big_fb_test =0 ; +/* Verify overlay plane selective fetch */ +igt_describe ("Test that selective fetch works on overlay plane" ); + igt_subtest_with_dynamic_f("%soverlay-%s-sf-dmg-area", append_fbc_subtest[y], op_str(data.op)) { +for (i =0 ; i < n_pipes; i++) { +if (!pipe_output_combo_valid (&data.display, pipes[i], outputs[i])) +continue ; + +for (j =FEATURE_NONE ; j <FEATURE_COUNT ; j++) { +if (j !=FEATURE_NONE && !(coexist_features[i] & j)) +continue ; +igt_dynamic_f ("pipe-%s-%s%s" ,kmstest_pipe_name (pipes[i]), +igt_output_name (outputs[i]), + coexist_feature_str(j)) { + data.pipe = pipes[i]; + data.output = outputs[i]; + data.test_plane_id =DRM_PLANE_TYPE_OVERLAY ; + data.coexist_feature = j; +for (k =1 ; k <=MAX_DAMAGE_AREAS ; k++) { + data.damage_area_count = k; +prepare (&data); +run (&data); +cleanup (&data); + } + } + } + } + } -for (j =FEATURE_NONE ; j <FEATURE_COUNT ; j++) { -if (j !=FEATURE_NONE && !(coexist_features[i] & j)) + data.damage_area_count =1 ; +/* Verify cursor plane selective fetch */ +igt_describe ("Test that selective fetch works on cursor plane" ); + igt_subtest_with_dynamic_f("%scursor-%s-sf", append_fbc_subtest[y], op_str(data.op)) { +for (i =0 ; i < n_pipes; i++) { +if (!pipe_output_combo_valid (&data.display, pipes[i], outputs[i]))continue ; -igt_dynamic_f ("pipe-%s-%s%s" ,kmstest_pipe_name (pipes[i]), -igt_output_name (outputs[i]), - coexist_feature_str(j)) { - data.pipe = pipes[i]; - data.output = outputs[i]; - data.test_plane_id =DRM_PLANE_TYPE_PRIMARY ; - data.coexist_feature = j; -for (k =1 ; k <=MAX_DAMAGE_AREAS ; k++) { - data.damage_area_count = k; + +for (j =FEATURE_NONE ; j <FEATURE_COUNT ; j++) { +if (j !=FEATURE_NONE && !(coexist_features[i] & j)) +continue ; +igt_dynamic_f ("pipe-%s-%s%s" ,kmstest_pipe_name (pipes[i]), +igt_output_name (outputs[i]), + coexist_feature_str(j)) { + data.pipe = pipes[i]; + data.output = outputs[i]; + data.test_plane_id =DRM_PLANE_TYPE_CURSOR ; + data.coexist_feature = j;prepare (&data);run (&data);cleanup (&data);
@@ -1075,28 +1213,24 @@ igt_main } } } - } - data.big_fb_test =0 ; -/* Verify overlay plane selective fetch */ -igt_describe ("Test that selective fetch works on overlay plane" ); - igt_subtest_with_dynamic_f("overlay-%s-sf-dmg-area", op_str(data.op)) { -for (i =0 ; i < n_pipes; i++) { -if (!pipe_output_combo_valid (&data.display, pipes[i], outputs[i])) -continue ; - -for (j =FEATURE_NONE ; j <FEATURE_COUNT ; j++) { -if (j !=FEATURE_NONE && !(coexist_features[i] & j)) + data.op =PLANE_MOVE_CONTINUOUS ; +igt_describe ("Test that selective fetch works on moving cursor plane (no update)" ); + igt_subtest_with_dynamic_f("%scursor-%s-sf", append_fbc_subtest[y], op_str(data.op)) { +for (i =0 ; i < n_pipes; i++) { +if (!pipe_output_combo_valid (&data.display, pipes[i], outputs[i]))continue ; -igt_dynamic_f ("pipe-%s-%s%s" ,kmstest_pipe_name (pipes[i]), -igt_output_name (outputs[i]), - coexist_feature_str(j)) { - data.pipe = pipes[i]; - data.output = outputs[i]; - data.test_plane_id =DRM_PLANE_TYPE_OVERLAY ; - data.coexist_feature = j; -for (k =1 ; k <=MAX_DAMAGE_AREAS ; k++) { - data.damage_area_count = k; + +for (j =FEATURE_NONE ; j <FEATURE_COUNT ; j++) { +if (j !=FEATURE_NONE && !(coexist_features[i] & j)) +continue ; +igt_dynamic_f ("pipe-%s-%s%s" ,kmstest_pipe_name (pipes[i]), +igt_output_name (outputs[i]), + coexist_feature_str(j)) { + data.pipe = pipes[i]; + data.output = outputs[i]; + data.test_plane_id =DRM_PLANE_TYPE_CURSOR ; + data.coexist_feature = j;prepare (&data);run (&data);cleanup (&data);
@@ -1104,130 +1238,129 @@ igt_main } } } - } - data.damage_area_count =1 ; -/* Verify cursor plane selective fetch */ -igt_describe ("Test that selective fetch works on cursor plane" ); - igt_subtest_with_dynamic_f("cursor-%s-sf", op_str(data.op)) { -for (i =0 ; i < n_pipes; i++) { -if (!pipe_output_combo_valid (&data.display, pipes[i], outputs[i])) -continue ; - -for (j =FEATURE_NONE ; j <FEATURE_COUNT ; j++) { -if (j !=FEATURE_NONE && !(coexist_features[i] & j)) + data.op =PLANE_MOVE_CONTINUOUS_EXCEED ; +igt_describe ("Test that selective fetch works on moving cursor plane exceeding partially visible area (no update)" ); + igt_subtest_with_dynamic_f("%scursor-%s-sf", append_fbc_subtest[y], op_str(data.op)) { +for (i =0 ; i < n_pipes; i++) { +if (!pipe_output_combo_valid (&data.display, pipes[i], outputs[i]))continue ; -igt_dynamic_f ("pipe-%s-%s%s" ,kmstest_pipe_name (pipes[i]), -igt_output_name (outputs[i]), - coexist_feature_str(j)) { - data.pipe = pipes[i]; - data.output = outputs[i]; - data.test_plane_id =DRM_PLANE_TYPE_CURSOR ; - data.coexist_feature = j; -prepare (&data); -run (&data); -cleanup (&data); + +for (j =FEATURE_NONE ; j <FEATURE_COUNT ; j++) { +if (j !=FEATURE_NONE && !(coexist_features[i] & j)) +continue ; +igt_dynamic_f ("pipe-%s-%s%s" ,kmstest_pipe_name (pipes[i]), +igt_output_name (outputs[i]), + coexist_feature_str(j)) { + data.pipe = pipes[i]; + data.output = outputs[i]; + data.test_plane_id =DRM_PLANE_TYPE_CURSOR ; + data.coexist_feature = j; +prepare (&data); +run (&data); +cleanup (&data); + } } } } - } - - data.op =PLANE_MOVE_CONTINUOUS ; -igt_describe ("Test that selective fetch works on moving cursor plane (no update)" ); - igt_subtest_with_dynamic_f("cursor-%s-sf", op_str(data.op)) { -for (i =0 ; i < n_pipes; i++) { -if (!pipe_output_combo_valid (&data.display, pipes[i], outputs[i])) -continue ; -for (j =FEATURE_NONE ; j <FEATURE_COUNT ; j++) { -if (j !=FEATURE_NONE && !(coexist_features[i] & j)) + data.op =PLANE_MOVE_CONTINUOUS_EXCEED_FULLY ; +igt_describe ("Test that selective fetch works on moving cursor plane exceeding fully visible area (no update)" ); + igt_subtest_with_dynamic_f("%scursor-%s-sf", append_fbc_subtest[y], op_str(data.op)) { +for (i =0 ; i < n_pipes; i++) { +if (!pipe_output_combo_valid (&data.display, pipes[i], outputs[i]))continue ; -igt_dynamic_f ("pipe-%s-%s%s" ,kmstest_pipe_name (pipes[i]), -igt_output_name (outputs[i]), - coexist_feature_str(j)) { - data.pipe = pipes[i]; - data.output = outputs[i]; - data.test_plane_id =DRM_PLANE_TYPE_CURSOR ; - data.coexist_feature = j; -prepare (&data); -run (&data); -cleanup (&data); + +for (j =FEATURE_NONE ; j <FEATURE_COUNT ; j++) { +if (j !=FEATURE_NONE && !(coexist_features[i] & j)) +continue ; +igt_dynamic_f ("pipe-%s-%s%s" ,kmstest_pipe_name (pipes[i]), +igt_output_name (outputs[i]), + coexist_feature_str(j)) { + data.pipe = pipes[i]; + data.output = outputs[i]; + data.test_plane_id =DRM_PLANE_TYPE_CURSOR ; + data.coexist_feature = j; +prepare (&data); +run (&data); +cleanup (&data); + } } } } - } - - data.op =PLANE_MOVE_CONTINUOUS_EXCEED ; -igt_describe ("Test that selective fetch works on moving cursor plane exceeding partially visible area (no update)" ); - igt_subtest_with_dynamic_f("cursor-%s-sf", op_str(data.op)) { -for (i =0 ; i < n_pipes; i++) { -if (!pipe_output_combo_valid (&data.display, pipes[i], outputs[i])) -continue ; -for (j =FEATURE_NONE ; j <FEATURE_COUNT ; j++) { -if (j !=FEATURE_NONE && !(coexist_features[i] & j)) +/* Only for overlay plane */ + data.op =PLANE_MOVE ; +/* Verify overlay plane move selective fetch */ +igt_describe ("Test that selective fetch works on moving overlay plane" ); + igt_subtest_with_dynamic_f("%s%s-sf-dmg-area", append_fbc_subtest[y], op_str(data.op)) { +for (i =0 ; i < n_pipes; i++) { +if (!pipe_output_combo_valid (&data.display, pipes[i], outputs[i]))continue ; -igt_dynamic_f ("pipe-%s-%s%s" ,kmstest_pipe_name (pipes[i]), -igt_output_name (outputs[i]), - coexist_feature_str(j)) { - data.pipe = pipes[i]; - data.output = outputs[i]; - data.test_plane_id =DRM_PLANE_TYPE_CURSOR ; - data.coexist_feature = j; -prepare (&data); -run (&data); -cleanup (&data); + +for (j =FEATURE_NONE ; j <FEATURE_COUNT ; j++) { +if (j !=FEATURE_NONE && !(coexist_features[i] & j)) +continue ; +igt_dynamic_f ("pipe-%s-%s%s" ,kmstest_pipe_name (pipes[i]), +igt_output_name (outputs[i]), + coexist_feature_str(j)) { + data.pipe = pipes[i]; + data.output = outputs[i]; + data.test_plane_id =DRM_PLANE_TYPE_OVERLAY ; + data.coexist_feature = j; +for (k =POS_TOP_LEFT ; k <=POS_BOTTOM_RIGHT ; k++) { + data.pos = k; +prepare (&data); +run (&data); +cleanup (&data); + } + } } } } - } - - data.op =PLANE_MOVE_CONTINUOUS_EXCEED_FULLY ; -igt_describe ("Test that selective fetch works on moving cursor plane exceeding fully visible area (no update)" ); - igt_subtest_with_dynamic_f("cursor-%s-sf", op_str(data.op)) { -for (i =0 ; i < n_pipes; i++) { -if (!pipe_output_combo_valid (&data.display, pipes[i], outputs[i])) -continue ; -for (j =FEATURE_NONE ; j <FEATURE_COUNT ; j++) { -if (j !=FEATURE_NONE && !(coexist_features[i] & j)) + data.op =PLANE_MOVE_CONTINUOUS ; +igt_describe ("Test that selective fetch works on moving overlay plane (no update)" ); + igt_subtest_with_dynamic_f("%soverlay-%s-sf", append_fbc_subtest[y], op_str(data.op)) { +for (i =0 ; i < n_pipes; i++) { +if (!pipe_output_combo_valid (&data.display, pipes[i], outputs[i]))continue ; -igt_dynamic_f ("pipe-%s-%s%s" ,kmstest_pipe_name (pipes[i]), -igt_output_name (outputs[i]), - coexist_feature_str(j)) { + +for (j =FEATURE_NONE ; j <FEATURE_COUNT ; j++) { +if (j !=FEATURE_NONE && !(coexist_features[i] & j)) +continue ; +igt_dynamic_f ("pipe-%s-%s%s" ,kmstest_pipe_name (pipes[i]), +igt_output_name (outputs[i]), + coexist_feature_str(j)) { data.pipe = pipes[i]; data.output = outputs[i]; - data.test_plane_id =DRM_PLANE_TYPE_CURSOR ; + data.test_plane_id =DRM_PLANE_TYPE_OVERLAY ; data.coexist_feature = j;prepare (&data);run (&data);cleanup (&data); + } } } } - } -/* Only for overlay plane */ - data.op =PLANE_MOVE ; -/* Verify overlay plane move selective fetch */ -igt_describe ("Test that selective fetch works on moving overlay plane" ); - igt_subtest_with_dynamic_f("%s-sf-dmg-area", op_str(data.op)) { -for (i =0 ; i < n_pipes; i++) { -if (!pipe_output_combo_valid (&data.display, pipes[i], outputs[i])) -continue ; - -for (j =FEATURE_NONE ; j <FEATURE_COUNT ; j++) { -if (j !=FEATURE_NONE && !(coexist_features[i] & j)) + data.op =PLANE_MOVE_CONTINUOUS_EXCEED ; +igt_describe ("Test that selective fetch works on moving overlay plane partially exceeding visible area (no update)" ); + igt_subtest_with_dynamic_f("%soverlay-%s-sf", append_fbc_subtest[y], op_str(data.op)) { +for (i =0 ; i < n_pipes; i++) { +if (!pipe_output_combo_valid (&data.display, pipes[i], outputs[i]))continue ; -igt_dynamic_f ("pipe-%s-%s%s" ,kmstest_pipe_name (pipes[i]), -igt_output_name (outputs[i]), - coexist_feature_str(j)) { - data.pipe = pipes[i]; - data.output = outputs[i]; - data.test_plane_id =DRM_PLANE_TYPE_OVERLAY ; - data.coexist_feature = j; -for (k =POS_TOP_LEFT ; k <=POS_BOTTOM_RIGHT ; k++) { - data.pos = k; + +for (j =FEATURE_NONE ; j <FEATURE_COUNT ; j++) { +if (j !=FEATURE_NONE && !(coexist_features[i] & j)) +continue ; +igt_dynamic_f ("pipe-%s-%s%s" ,kmstest_pipe_name (pipes[i]), +igt_output_name (outputs[i]), + coexist_feature_str(j)) { + data.pipe = pipes[i]; + data.output = outputs[i]; + data.test_plane_id =DRM_PLANE_TYPE_OVERLAY ; + data.coexist_feature = j;prepare (&data);run (&data);cleanup (&data);
@@ -1235,103 +1368,84 @@ igt_main } } } - } - data.op =PLANE_MOVE_CONTINUOUS ; -igt_describe ("Test that selective fetch works on moving overlay plane (no update)" ); - igt_subtest_with_dynamic_f("overlay-%s-sf", op_str(data.op)) { -for (i =0 ; i < n_pipes; i++) { -if (!pipe_output_combo_valid (&data.display, pipes[i], outputs[i])) -continue ; - -for (j =FEATURE_NONE ; j <FEATURE_COUNT ; j++) { -if (j !=FEATURE_NONE && !(coexist_features[i] & j)) + data.op =PLANE_MOVE_CONTINUOUS_EXCEED_FULLY ; +igt_describe ("Test that selective fetch works on moving overlay plane fully exceeding visible area (no update)" ); + igt_subtest_with_dynamic_f("%soverlay-%s-sf", append_fbc_subtest[y], op_str(data.op)) { +for (i =0 ; i < n_pipes; i++) { +if (!pipe_output_combo_valid (&data.display, pipes[i], outputs[i]))continue ; -igt_dynamic_f ("pipe-%s-%s%s" ,kmstest_pipe_name (pipes[i]), -igt_output_name (outputs[i]), - coexist_feature_str(j)) { - data.pipe = pipes[i]; - data.output = outputs[i]; - data.test_plane_id =DRM_PLANE_TYPE_OVERLAY ; - data.coexist_feature = j; -prepare (&data); -run (&data); -cleanup (&data); - } - } - } - } - data.op =PLANE_MOVE_CONTINUOUS_EXCEED ; -igt_describe ("Test that selective fetch works on moving overlay plane partially exceeding visible area (no update)" ); - igt_subtest_with_dynamic_f("overlay-%s-sf", op_str(data.op)) { -for (i =0 ; i < n_pipes; i++) { -if (!pipe_output_combo_valid (&data.display, pipes[i], outputs[i])) -continue ; - -for (j =FEATURE_NONE ; j <FEATURE_COUNT ; j++) { -if (j !=FEATURE_NONE && !(coexist_features[i] & j)) -continue ; -igt_dynamic_f ("pipe-%s-%s%s" ,kmstest_pipe_name (pipes[i]), -igt_output_name (outputs[i]), - coexist_feature_str(j)) { - data.pipe = pipes[i]; - data.output = outputs[i]; - data.test_plane_id =DRM_PLANE_TYPE_OVERLAY ; - data.coexist_feature = j; -prepare (&data); -run (&data); -cleanup (&data); +for (j =FEATURE_NONE ; j <FEATURE_COUNT ; j++) { +if (j !=FEATURE_NONE && !(coexist_features[i] & j)) +continue ; +igt_dynamic_f ("pipe-%s-%s%s" ,kmstest_pipe_name (pipes[i]), +igt_output_name (outputs[i]), + coexist_feature_str(j)) { + data.pipe = pipes[i]; + data.output = outputs[i]; + data.test_plane_id =DRM_PLANE_TYPE_OVERLAY ; + data.coexist_feature = j; +prepare (&data); +run (&data); +cleanup (&data); + } } } } - } - - data.op =PLANE_MOVE_CONTINUOUS_EXCEED_FULLY ; -igt_describe ("Test that selective fetch works on moving overlay plane fully exceeding visible area (no update)" ); - igt_subtest_with_dynamic_f("overlay-%s-sf", op_str(data.op)) { -for (i =0 ; i < n_pipes; i++) { -if (!pipe_output_combo_valid (&data.display, pipes[i], outputs[i])) -continue ; -for (j =FEATURE_NONE ; j <FEATURE_COUNT ; j++) { -if (j !=FEATURE_NONE && !(coexist_features[i] & j)) +/* Verify primary plane selective fetch with overplay plane blended */ + data.op =OVERLAY_PRIM_UPDATE ; +igt_describe ("Test that selective fetch works on primary plane " +"with blended overlay plane" ); + igt_subtest_with_dynamic_f("%s%s-sf-dmg-area", append_fbc_subtest[y], op_str(data.op)) { +for (i =0 ; i < n_pipes; i++) { +if (!pipe_output_combo_valid (&data.display, pipes[i], outputs[i]))continue ; -igt_dynamic_f ("pipe-%s-%s%s" ,kmstest_pipe_name (pipes[i]), -igt_output_name (outputs[i]), - coexist_feature_str(j)) { - data.pipe = pipes[i]; - data.output = outputs[i]; - data.test_plane_id =DRM_PLANE_TYPE_OVERLAY ; - data.coexist_feature = j; -prepare (&data); -run (&data); -cleanup (&data); + +for (j =FEATURE_NONE ; j <FEATURE_COUNT ; j++) { +if (j !=FEATURE_NONE && !(coexist_features[i] & j)) +continue ; +igt_dynamic_f ("pipe-%s-%s%s" ,kmstest_pipe_name (pipes[i]), +igt_output_name (outputs[i]), + coexist_feature_str(j)) { + data.pipe = pipes[i]; + data.output = outputs[i]; +for (k =1 ; k <=MAX_DAMAGE_AREAS ; k++) { + data.damage_area_count = k; + data.test_plane_id =DRM_PLANE_TYPE_PRIMARY ; + data.coexist_feature = j; +prepare (&data); +run (&data); +cleanup (&data); + } + } } } } - } -/* Verify primary plane selective fetch with overplay plane blended */ - data.op =OVERLAY_PRIM_UPDATE ; -igt_describe ("Test that selective fetch works on primary plane " -"with blended overlay plane" ); - igt_subtest_with_dynamic_f("%s-sf-dmg-area", op_str(data.op)) { -for (i =0 ; i < n_pipes; i++) { -if (!pipe_output_combo_valid (&data.display, pipes[i], outputs[i])) -continue ; - -for (j =FEATURE_NONE ; j <FEATURE_COUNT ; j++) { -if (j !=FEATURE_NONE && !(coexist_features[i] & j)) +/* +* Verify overlay plane selective fetch using NV12 primary +* plane and continuous updates. +*/ + data.op =PLANE_UPDATE_CONTINUOUS ; + data.primary_format =DRM_FORMAT_NV12 ; +igt_describe ("Test that selective fetch works on overlay plane" ); + igt_subtest_with_dynamic_f("%soverlay-%s-sf", append_fbc_subtest[y], op_str(data.op)) { +for (i =0 ; i < n_pipes; i++) { +if (!pipe_output_combo_valid (&data.display, pipes[i], outputs[i]))continue ; -igt_dynamic_f ("pipe-%s-%s%s" ,kmstest_pipe_name (pipes[i]), -igt_output_name (outputs[i]), - coexist_feature_str(j)) { - data.pipe = pipes[i]; - data.output = outputs[i]; -for (k =1 ; k <=MAX_DAMAGE_AREAS ; k++) { - data.damage_area_count = k; - data.test_plane_id =DRM_PLANE_TYPE_PRIMARY ; + +for (j =FEATURE_NONE ; j <FEATURE_COUNT ; j++) { +if (j !=FEATURE_NONE && !(coexist_features[i] & j)) +continue ; +igt_dynamic_f ("pipe-%s-%s%s" ,kmstest_pipe_name (pipes[i]), +igt_output_name (outputs[i]), + coexist_feature_str(j)) { + data.pipe = pipes[i]; + data.output = outputs[i]; + data.damage_area_count =1 ; + data.test_plane_id =DRM_PLANE_TYPE_OVERLAY ; data.coexist_feature = j;prepare (&data);run (&data);
@@ -1342,37 +1456,6 @@ igt_main } } -/* -* Verify overlay plane selective fetch using NV12 primary -* plane and continuous updates. -*/ - data.op =PLANE_UPDATE_CONTINUOUS ; - data.primary_format =DRM_FORMAT_NV12 ; -igt_describe ("Test that selective fetch works on overlay plane" ); - igt_subtest_with_dynamic_f("overlay-%s-sf", op_str(data.op)) { -for (i =0 ; i < n_pipes; i++) { -if (!pipe_output_combo_valid (&data.display, pipes[i], outputs[i])) -continue ; - -for (j =FEATURE_NONE ; j <FEATURE_COUNT ; j++) { -if (j !=FEATURE_NONE && !(coexist_features[i] & j)) -continue ; -igt_dynamic_f ("pipe-%s-%s%s" ,kmstest_pipe_name (pipes[i]), -igt_output_name (outputs[i]), - coexist_feature_str(j)) { - data.pipe = pipes[i]; - data.output = outputs[i]; - data.damage_area_count =1 ; - data.test_plane_id =DRM_PLANE_TYPE_OVERLAY ; - data.coexist_feature = j; -prepare (&data); -run (&data); -cleanup (&data); - } - } - } - } - igt_fixture {close (data.debugfs_fd);display_fini (&data);
Signature · 1 line
2.25.1
Patchwork
CI[igt-dev] ✗ Fi.CI.BUILD: failure for Add FBC support to PSR/PSR2 tests (rev6)
In reply to Jeevan B== Series Details ==
== Series Details ==
Series: Add FBC support to PSR/PSR2 tests (rev6)
URL : https://patchwork.freedesktop.org/series/126689/
State : failure
== Summary ==
Applying: tests/intel/kms_psr: Add FBC support to PSR/PSR2/PR tests Using index info to reconstruct a base tree...
M tests/intel/kms_psr.c
Falling back to patching base and 3-way merge...
Auto-merging tests/intel/kms_psr.c
CONFLICT (content): Merge conflict in tests/intel/kms_psr.c
Patch failed at 0001 tests/intel/kms_psr: Add FBC support to PSR/PSR2/PR tests When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".