tests/intel/kms_psr2_sf: Fix primary_format setting
PATCH 1/1 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.
bigfb plane size is too big for FBC, so skipping that test.
--- tests/intel/kms_psr2_sf.c | 68 +++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 28 deletions(-)
tests/intel/kms_psr2_sf.c +40 -28
@@ -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,14 +100,12 @@* 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 -* 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"
@@ -1043,6 +1041,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" );
@@ -1074,29 +1077,35 @@ 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); + } } } }
@@ -1387,7 +1396,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 +1412,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);
Signature · 1 line
2.25.1
Hi
Well.. I tried these changes and the fbc variant of kms_psr2_sf tests are all passing. But I think, at some point some refactoring is warranted for this whole kms_psr_sf tests as the code looks clumsy with unstructured "data" handling.
+Jouni, to see if all the selective fetch cases are handled as expected!
And please check two comments inline, with those addressed,
BR
vinod
Quoted 49 lines · Jeevan B
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. bigfb plane size is too big for FBC, so skipping that test.
Signed-off-by Jeevan B <[email protected]>---
tests/intel/kms_psr2_sf.c | 68 +++++++++++++++++++++++----------------1 file changed, 40 insertions(+), 28 deletions(-)tests/intel/kms_psr2_sf.c +3
-5@@ -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,14 +100,12 @@* 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 -* 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"tests/intel/kms_psr2_sf.c +0
-0@@ -1043,6 +1041,11 @@ igt_main }
Quoted 7 lines
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;
+
Now that these members are initialized here, do we need the same in igt_fixture block?
Quoted 11 lines
data.op_fbc_mode = fbc_status[y];
/* Verify primary plane selective fetch */igt_describe("Test that selective fetch works on primary plane");tests/intel/kms_psr2_sf.c +0
-0@@ -1074,29 +1077,35 @@ 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],
Quoted 8 lines
-
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) {
This change should be a separate patch.
Quoted 64 lines
+ 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);
+ }
}
}
}tests/intel/kms_psr2_sf.c +4
-1@@ -1387,7 +1396,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 +1412,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);