* [PATCH i-g-t 0/2] Fix primary_format setting and Skip bigfb test for FBC
@ 2023-12-26 6:24 Jeevan B
2023-12-26 6:24 ` [PATCH i-g-t 1/2] tests/intel/kms_psr2_sf: Fix primary_format setting Jeevan B
2023-12-26 6:24 ` [PATCH i-g-t 2/2] tests/intel/kms_psr2_sf: Skip the test for bigfb with FBC enabled Jeevan B
0 siblings, 2 replies; 4+ messages in thread
From: Jeevan B @ 2023-12-26 6:24 UTC (permalink / raw)
To: igt-dev
Signed-off-by: Jeevan B <jeevan.b@intel.com>
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 | 72 +++++++++++++++++++++------------------
1 file changed, 39 insertions(+), 33 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH i-g-t 1/2] tests/intel/kms_psr2_sf: Fix primary_format setting
2023-12-26 6:24 [PATCH i-g-t 0/2] Fix primary_format setting and Skip bigfb test for FBC Jeevan B
@ 2023-12-26 6:24 ` Jeevan B
2023-12-26 6:24 ` [PATCH i-g-t 2/2] tests/intel/kms_psr2_sf: Skip the test for bigfb with FBC enabled Jeevan B
1 sibling, 0 replies; 4+ messages in thread
From: Jeevan B @ 2023-12-26 6:24 UTC (permalink / raw)
To: igt-dev
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 <jeevan.b@intel.com>
Reviewed-by: Vinod Govindapillai <vinod.govindapillai@intel.com>
---
tests/intel/kms_psr2_sf.c | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/tests/intel/kms_psr2_sf.c b/tests/intel/kms_psr2_sf.c
index 76435f501..68cedf577 100644
--- a/tests/intel/kms_psr2_sf.c
+++ b/tests/intel/kms_psr2_sf.c
@@ -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,6 @@ 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 +1039,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 +1388,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 +1404,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
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH i-g-t 2/2] tests/intel/kms_psr2_sf: Skip the test for bigfb with FBC enabled
2023-12-26 6:24 [PATCH i-g-t 0/2] Fix primary_format setting and Skip bigfb test for FBC Jeevan B
2023-12-26 6:24 ` [PATCH i-g-t 1/2] tests/intel/kms_psr2_sf: Fix primary_format setting Jeevan B
@ 2023-12-26 6:24 ` Jeevan B
1 sibling, 0 replies; 4+ messages in thread
From: Jeevan B @ 2023-12-26 6:24 UTC (permalink / raw)
To: igt-dev
The size of the 'bigfb' plane is too large for FBC, so we are
skipping that test.
Signed-off-by: Jeevan B <jeevan.b@intel.com>
Reviewed-by: Vinod Govindapillai <vinod.govindapillai@intel.com>
---
tests/intel/kms_psr2_sf.c | 52 ++++++++++++++++++++-------------------
1 file changed, 27 insertions(+), 25 deletions(-)
diff --git a/tests/intel/kms_psr2_sf.c b/tests/intel/kms_psr2_sf.c
index 68cedf577..08dcb4bfb 100644
--- a/tests/intel/kms_psr2_sf.c
+++ b/tests/intel/kms_psr2_sf.c
@@ -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"
@@ -1075,29 +1072,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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH i-g-t 0/2] Fix primary_format setting and Skip bigfb test for FBC
@ 2023-12-26 8:47 Jeevan B
2023-12-26 8:47 ` [PATCH i-g-t 1/2] tests/intel/kms_psr2_sf: Fix primary_format setting Jeevan B
0 siblings, 1 reply; 4+ messages in thread
From: Jeevan B @ 2023-12-26 8:47 UTC (permalink / raw)
To: igt-dev
Signed-off-by: Jeevan B <jeevan.b@intel.com>
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(-)
--
2.25.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH i-g-t 1/2] tests/intel/kms_psr2_sf: Fix primary_format setting
2023-12-26 8:47 [PATCH i-g-t 0/2] Fix primary_format setting and Skip bigfb test for FBC Jeevan B
@ 2023-12-26 8:47 ` Jeevan B
0 siblings, 0 replies; 4+ messages in thread
From: Jeevan B @ 2023-12-26 8:47 UTC (permalink / raw)
To: igt-dev
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 <jeevan.b@intel.com>
Reviewed-by: Vinod Govindapillai <vinod.govindapillai@intel.com>
---
tests/intel/kms_psr2_sf.c | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/tests/intel/kms_psr2_sf.c b/tests/intel/kms_psr2_sf.c
index 76435f501..9e0b3c32d 100644
--- a/tests/intel/kms_psr2_sf.c
+++ b/tests/intel/kms_psr2_sf.c
@@ -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
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-12-26 8:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-26 6:24 [PATCH i-g-t 0/2] Fix primary_format setting and Skip bigfb test for FBC Jeevan B
2023-12-26 6:24 ` [PATCH i-g-t 1/2] tests/intel/kms_psr2_sf: Fix primary_format setting Jeevan B
2023-12-26 6:24 ` [PATCH i-g-t 2/2] tests/intel/kms_psr2_sf: Skip the test for bigfb with FBC enabled Jeevan B
-- strict thread matches above, loose matches on Subject: below --
2023-12-26 8:47 [PATCH i-g-t 0/2] Fix primary_format setting and Skip bigfb test for FBC Jeevan B
2023-12-26 8:47 ` [PATCH i-g-t 1/2] tests/intel/kms_psr2_sf: Fix primary_format setting Jeevan B
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox