Fix primary_format setting and Skip bigfb test for FBC
cover Fix primary_format setting and Skip bigfb test for FBC
Signed-off-by Jeevan B <[email protected]>
Jeevan B (2):
tests/intel/kms_psr2_sf: Fix primary_format setting tests/intel/kms_psr2_sf: Skip the test for bigfb with FBC enabled
tests/intel/kms_psr2_sf.c | 71 +++++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 32 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/2 tests/intel/kms_psr2_sf: Fix primary_format setting
The format is being changed globally to DRM_FORMAT_NV12. Additionally, FBC doesn't support the NV12 format, so this issue is being addressed.
v2: Initialize data members at the beginning of the loop.
Signed-off-by Jeevan B <[email protected]>
Reviewed-by Vinod Govindapillai <[email protected]>
--- tests/intel/kms_psr2_sf.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
tests/intel/kms_psr2_sf.c +13 -8
@@ -68,13 +68,13 @@* SUBTEST: cursor-plane-update-sf * Description: Test that selective fetch works on cursor plane * -* SUBTEST: fbc-cursor-plane-update-continuous-sf +* SUBTEST: fbc-cursor-plane-update-sf * Description: Test that fbc with selective fetch works on cursor plane * * SUBTEST: overlay-plane-update-continuous-sf * Description: Test that selective fetch works on overlay plane * -* SUBTEST: fbc-overlay-plane-update-continuous-sf-dmg-area +* SUBTEST: fbc-overlay-plane-update-sf-dmg-area * Description: Test that fbc with selective fetch works on overlay plane * * SUBTEST: overlay-plane-update-sf-dmg-area
@@ -100,13 +100,13 @@* SUBTEST: primary-plane-update-sf-dmg-area * Description: Test that selective fetch works on primary plane * -* SUBTEST: fbc-primary-plane-update-continuous-sf-dmg-area +* SUBTEST: fbc-primary-plane-update-sf-dmg-area * Description: Test that fbc with selective fetch works on primary plane * * SUBTEST: primary-plane-update-sf-dmg-area-big-fb * Description: Test that selective fetch works on primary plane with big fb * -* SUBTEST: fbc-primary-plane-update-continuous-sf-dmg-area-big-fb +* SUBTEST: fbc-primary-plane-update-sf-dmg-area-big-fb * Description: Test that fbc with selective fetch works on primary plane with big fb */
@@ -1014,10 +1014,7 @@ igt_main "Error enabling PSR2\n"); data.damage_area_count =MAX_DAMAGE_AREAS ; - data.op =PLANE_UPDATE ; - data.test_plane_id =DRM_PLANE_TYPE_PRIMARY ; data.primary_format =DRM_FORMAT_XRGB8888 ; - data.big_fb_test =0 ; res =drmModeGetResources (data.drm_fd); data.big_fb_width = res->max_width;
@@ -1043,6 +1040,11 @@ igt_main }for (y =0 ; y <ARRAY_SIZE (fbc_status); y++) { + data.op =PLANE_UPDATE ; + data.test_plane_id =DRM_PLANE_TYPE_PRIMARY ; + data.primary_format =DRM_FORMAT_XRGB8888 ; + data.big_fb_test =0 ; + data.op_fbc_mode = fbc_status[y];/* Verify primary plane selective fetch */ igt_describe ("Test that selective fetch works on primary plane" );
@@ -1387,7 +1389,6 @@ igt_main* 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)) {
@@ -1404,6 +1405,10 @@ igt_main data.pipe = pipes[i]; data.output = outputs[i]; data.damage_area_count =1 ; +if (data.op_fbc_mode ==FBC_ENABLED ) + data.primary_format =DRM_FORMAT_XRGB8888 ; +else + data.primary_format =DRM_FORMAT_NV12 ; data.test_plane_id =DRM_PLANE_TYPE_OVERLAY ; data.coexist_feature = j;prepare (&data);
--
2.25.1
PATCH 2/2 tests/intel/kms_psr2_sf: Skip the test for bigfb with FBC enabled
In reply to Jeevan BThe size of the 'bigfb' plane is too large for FBC, so we are skipping that test.
Signed-off-by Jeevan B <[email protected]>
Reviewed-by Vinod Govindapillai <[email protected]>
--- tests/intel/kms_psr2_sf.c | 52 ++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 25 deletions(-)
tests/intel/kms_psr2_sf.c +27 -25
@@ -105,9 +105,6 @@* * SUBTEST: primary-plane-update-sf-dmg-area-big-fb * Description: Test that selective fetch works on primary plane with big fb -* -* SUBTEST: fbc-primary-plane-update-sf-dmg-area-big-fb -* Description: Test that fbc with selective fetch works on primary plane with big fb */ IGT_TEST_DESCRIPTION("Tests to varify PSR2 selective fetch by sending multiple"
@@ -1076,29 +1073,34 @@ igt_main }/* 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)) +if (data.op_fbc_mode ==FBC_DISABLED ) { + 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 ; -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); + } } } }
--
2.25.1