* [igt-dev] [PATCH i-g-t 1/2] tests/intel/kms_psr: Add FBC support to PSR/PSR2 tests
2023-11-24 16:00 [igt-dev] [PATCH i-g-t 0/2] Add FBC support to PSR/PSR2 tests Jeevan B
@ 2023-11-24 16:00 ` Jeevan B
2023-11-24 16:00 ` [igt-dev] [PATCH i-g-t 2/2] tests/intel/kms_psr2_sf: Add FBC support to PSR2 tests Jeevan B
1 sibling, 0 replies; 12+ messages in thread
From: Jeevan B @ 2023-11-24 16:00 UTC (permalink / raw)
To: igt-dev
For intel_display_ver 20, FBC can be enabled along with PSR/PSR2,
thereby adding FBC checks to validate this scenario.
Signed-off-by: Jeevan B <jeevan.b@intel.com>
---
lib/igt_psr.h | 5 +
tests/intel/kms_psr.c | 240 ++++++++++++++++++++++++------------------
2 files changed, 142 insertions(+), 103 deletions(-)
diff --git a/lib/igt_psr.h b/lib/igt_psr.h
index a30330e6c..fee9df6b3 100644
--- a/lib/igt_psr.h
+++ b/lib/igt_psr.h
@@ -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);
diff --git a/tests/intel/kms_psr.c b/tests/intel/kms_psr.c
index 6b80f6f4b..c1d987415 100644
--- a/tests/intel/kms_psr.c
+++ b/tests/intel/kms_psr.c
@@ -31,6 +31,7 @@
#include "igt.h"
#include "igt_sysfs.h"
#include "igt_psr.h"
+#include "i915/intel_fbc.h"
#include <errno.h>
#include <stdbool.h>
#include <stdio.h>
@@ -366,6 +367,7 @@ typedef struct {
enum operations op;
int test_plane_id;
enum psr_mode op_psr_mode;
+ enum fbc_mode op_fbc_mode;
uint32_t devid;
uint32_t crtc_id;
igt_display_t display;
@@ -376,6 +378,7 @@ typedef struct {
int mod_stride;
drmModeModeInfo *mode;
igt_output_t *output;
+ bool fbc_flag;
} data_t;
static void create_cursor_fb(data_t *data)
@@ -802,6 +805,11 @@ static void test_setup(data_t *data)
psr_entered = true;
break;
}
+
+ if (data->fbc_flag)
+ igt_assert_f(intel_fbc_wait_until_enabled(data->drm_fd,
+ pipe),
+ "FBC still disabled");
}
igt_assert(psr_entered);
@@ -819,14 +827,20 @@ data_t data = {};
igt_main
{
- int z;
+ int z, y;
enum operations op;
+ enum pipe pipe;
const char *append_subtest_name[3] = {
"psr_",
"psr2_",
"pr_"
};
+ const char *append_fbc_subtest[2] = {
+ "",
+ "fbc_"
+ };
int modes[] = {PSR_MODE_1, PSR_MODE_2, PR_MODE};
+ int fbc_status[] = {FBC_ENABLED, FBC_DISABLED};
igt_output_t *output;
igt_fixture {
@@ -837,52 +851,42 @@ igt_main
data.bops = buf_ops_create(data.drm_fd);
igt_display_require(&data.display, data.drm_fd);
igt_require_f(output_supports_psr(&data), "Sink does not support PSR/PSR2/PR\n");
+ if ((intel_display_ver(intel_get_drm_devid(data.drm_fd) == 20)) &&
+ (intel_fbc_supported_on_chipset(data.drm_fd, pipe))) {
+ data.fbc_flag = true;
+ }
}
- for (z = 0; z < ARRAY_SIZE(modes); z++) {
- data.op_psr_mode = modes[z];
-
- igt_describe("Basic check for psr if it is detecting changes made in planes");
- igt_subtest_with_dynamic_f("%sbasic", append_subtest_name[z]) {
- for_each_connected_output(&data.display, output) {
- if (!psr_sink_support(data.drm_fd, data.debugfs_fd,
- data.op_psr_mode, output))
- continue;
- igt_display_reset(&data.display);
- data.output = output;
- igt_dynamic_f("%s", data.output->name) {
- data.test_plane_id = DRM_PLANE_TYPE_PRIMARY;
- test_setup(&data);
- test_cleanup(&data);
- }
- }
- }
+ for (y = 0; y < ARRAY_SIZE(fbc_status); y++) {
+
+ data.op_fbc_mode = fbc_status[y];
+ if (data.op_fbc_mode == FBC_ENABLED)
+ data.fbc_flag = false;
+
+ for (z = 0; z < ARRAY_SIZE(modes); z++) {
+ data.op_psr_mode = modes[z];
- igt_describe("Check if psr is detecting changes when drrs is disabled");
- igt_subtest_with_dynamic_f("%sno_drrs", append_subtest_name[z]) {
- for_each_connected_output(&data.display, output) {
- if (!psr_sink_support(data.drm_fd, data.debugfs_fd,
- data.op_psr_mode, output))
- continue;
- igt_display_reset(&data.display);
- data.output = output;
- igt_dynamic_f("%s", data.output->name) {
- data.test_plane_id = DRM_PLANE_TYPE_PRIMARY;
- test_setup(&data);
- igt_assert(drrs_disabled(&data));
- test_cleanup(&data);
+ igt_describe("Basic check for psr if it is detecting changes made in "
+ "planes");
+ igt_subtest_with_dynamic_f("%s%sbasic", append_fbc_subtest[y],
+ append_subtest_name[z]) {
+ for_each_connected_output(&data.display, output) {
+ if (!psr_sink_support(data.drm_fd, data.debugfs_fd,
+ data.op_psr_mode, output))
+ continue;
+ igt_display_reset(&data.display);
+ data.output = output;
+ igt_dynamic_f("%s", data.output->name) {
+ data.test_plane_id = DRM_PLANE_TYPE_PRIMARY;
+ test_setup(&data);
+ test_cleanup(&data);
+ }
}
}
- }
- for (op = PAGE_FLIP; op <= RENDER; op++) {
- igt_describe("Check if psr is detecting page-flipping,memory mapping and "
- "rendering operations performed on primary planes");
- igt_subtest_with_dynamic_f("%sprimary_%s",
- append_subtest_name[z],
- op_str(op)) {
- igt_skip_on(is_xe_device(data.drm_fd) &&
- (op == MMAP_CPU || op == MMAP_GTT));
+ igt_describe("Check if psr is detecting changes when drrs is disabled");
+ igt_subtest_with_dynamic_f("%s%sno_drrs", append_fbc_subtest[y],
+ append_subtest_name[z]) {
for_each_connected_output(&data.display, output) {
if (!psr_sink_support(data.drm_fd, data.debugfs_fd,
data.op_psr_mode, output))
@@ -890,24 +894,94 @@ igt_main
igt_display_reset(&data.display);
data.output = output;
igt_dynamic_f("%s", data.output->name) {
- data.op = op;
data.test_plane_id = DRM_PLANE_TYPE_PRIMARY;
test_setup(&data);
- run_test(&data);
+ igt_assert(drrs_disabled(&data));
test_cleanup(&data);
}
}
}
- }
- for (op = MMAP_GTT; op <= PLANE_ONOFF; op++) {
- igt_describe("Check if psr is detecting memory mapping,rendering "
- "and plane operations performed on sprite planes");
- igt_subtest_with_dynamic_f("%ssprite_%s",
- append_subtest_name[z],
- op_str(op)) {
- igt_skip_on(is_xe_device(data.drm_fd) &&
- (op == MMAP_CPU || op == MMAP_GTT));
+ for (op = PAGE_FLIP; op <= RENDER; op++) {
+ igt_describe("Check if psr is detecting page-flipping,memory "
+ "mapping and rendering operations performed "
+ "on primary planes");
+ igt_subtest_with_dynamic_f("%s%sprimary_%s",
+ append_fbc_subtest[y],
+ append_subtest_name[z],
+ op_str(op)) {
+ igt_skip_on(is_xe_device(data.drm_fd) &&
+ (op == MMAP_CPU || op == MMAP_GTT));
+ for_each_connected_output(&data.display, output) {
+ if (!psr_sink_support(data.drm_fd, data.debugfs_fd,
+ data.op_psr_mode, output))
+ continue;
+ igt_display_reset(&data.display);
+ data.output = output;
+ igt_dynamic_f("%s", data.output->name) {
+ data.op = op;
+ data.test_plane_id = DRM_PLANE_TYPE_PRIMARY;
+ test_setup(&data);
+ run_test(&data);
+ test_cleanup(&data);
+ }
+ }
+ }
+ }
+
+ for (op = MMAP_GTT; op <= PLANE_ONOFF; op++) {
+ igt_describe("Check if psr is detecting memory mapping,rendering "
+ "and plane operations performed on sprite planes");
+ igt_subtest_with_dynamic_f("%s%ssprite_%s",
+ append_fbc_subtest[y],
+ append_subtest_name[z],
+ op_str(op)) {
+ igt_skip_on(is_xe_device(data.drm_fd) &&
+ (op == MMAP_CPU || op == MMAP_GTT));
+ for_each_connected_output(&data.display, output) {
+ if (!psr_sink_support(data.drm_fd, data.debugfs_fd,
+ data.op_psr_mode, output))
+ continue;
+ igt_display_reset(&data.display);
+ data.output = output;
+ igt_dynamic_f("%s", data.output->name) {
+ data.op = op;
+ data.test_plane_id = DRM_PLANE_TYPE_OVERLAY;
+ test_setup(&data);
+ run_test(&data);
+ test_cleanup(&data);
+ }
+ }
+ }
+
+ igt_describe("Check if psr is detecting memory mapping, rendering "
+ "and plane operations performed on cursor planes");
+ igt_subtest_with_dynamic_f("%s%scursor_%s",
+ append_fbc_subtest[y],
+ append_subtest_name[z],
+ op_str(op)) {
+ igt_skip_on(is_xe_device(data.drm_fd) &&
+ (op == MMAP_CPU || op == MMAP_GTT));
+ for_each_connected_output(&data.display, output) {
+ if (!psr_sink_support(data.drm_fd, data.debugfs_fd,
+ data.op_psr_mode, output))
+ continue;
+ igt_display_reset(&data.display);
+ data.output = output;
+ igt_dynamic_f("%s", data.output->name) {
+ data.test_plane_id = DRM_PLANE_TYPE_CURSOR;
+ test_setup(&data);
+ run_test(&data);
+ test_cleanup(&data);
+ }
+ }
+ }
+ }
+
+ igt_describe("Check if psr is detecting changes when rendering operation "
+ "is performed with dpms enabled or disabled");
+ igt_subtest_with_dynamic_f("%s%sdpms", append_fbc_subtest[y],
+ append_subtest_name[z]) {
for_each_connected_output(&data.display, output) {
if (!psr_sink_support(data.drm_fd, data.debugfs_fd,
data.op_psr_mode, output))
@@ -915,22 +989,20 @@ igt_main
igt_display_reset(&data.display);
data.output = output;
igt_dynamic_f("%s", data.output->name) {
- data.op = op;
- data.test_plane_id = DRM_PLANE_TYPE_OVERLAY;
+ data.op = RENDER;
+ data.test_plane_id = DRM_PLANE_TYPE_PRIMARY;
test_setup(&data);
+ dpms_off_on(&data);
run_test(&data);
test_cleanup(&data);
}
}
}
- igt_describe("Check if psr is detecting memory mapping, rendering "
- "and plane operations performed on cursor planes");
- igt_subtest_with_dynamic_f("%scursor_%s",
- append_subtest_name[z],
- op_str(op)) {
- igt_skip_on(is_xe_device(data.drm_fd) &&
- (op == MMAP_CPU || op == MMAP_GTT));
+ igt_describe("Check if psr is detecting changes when plane operation is "
+ "performed with suspend resume cycles");
+ igt_subtest_with_dynamic_f("%s%ssuspend", append_fbc_subtest[y],
+ append_subtest_name[z]) {
for_each_connected_output(&data.display, output) {
if (!psr_sink_support(data.drm_fd, data.debugfs_fd,
data.op_psr_mode, output))
@@ -938,56 +1010,18 @@ igt_main
igt_display_reset(&data.display);
data.output = output;
igt_dynamic_f("%s", data.output->name) {
+ data.op = PLANE_ONOFF;
data.test_plane_id = DRM_PLANE_TYPE_CURSOR;
test_setup(&data);
+ igt_system_suspend_autoresume(SUSPEND_STATE_MEM,
+ SUSPEND_TEST_NONE);
+ igt_assert(psr_wait_entry_if_enabled(&data));
run_test(&data);
test_cleanup(&data);
}
}
}
}
-
- igt_describe("Check if psr is detecting changes when rendering operation is performed"
- " with dpms enabled or disabled");
- igt_subtest_with_dynamic_f("%sdpms", append_subtest_name[z]) {
- for_each_connected_output(&data.display, output) {
- if (!psr_sink_support(data.drm_fd, data.debugfs_fd,
- data.op_psr_mode, output))
- continue;
- igt_display_reset(&data.display);
- data.output = output;
- igt_dynamic_f("%s", data.output->name) {
- data.op = RENDER;
- data.test_plane_id = DRM_PLANE_TYPE_PRIMARY;
- test_setup(&data);
- dpms_off_on(&data);
- run_test(&data);
- test_cleanup(&data);
- }
- }
- }
-
- igt_describe("Check if psr is detecting changes when plane operation is performed "
- "with suspend resume cycles");
- igt_subtest_with_dynamic_f("%ssuspend", append_subtest_name[z]) {
- for_each_connected_output(&data.display, output) {
- if (!psr_sink_support(data.drm_fd, data.debugfs_fd,
- data.op_psr_mode, output))
- continue;
- igt_display_reset(&data.display);
- data.output = output;
- igt_dynamic_f("%s", data.output->name) {
- data.op = PLANE_ONOFF;
- data.test_plane_id = DRM_PLANE_TYPE_CURSOR;
- test_setup(&data);
- igt_system_suspend_autoresume(SUSPEND_STATE_MEM,
- SUSPEND_TEST_NONE);
- igt_assert(psr_wait_entry_if_enabled(&data));
- run_test(&data);
- test_cleanup(&data);
- }
- }
- }
}
igt_fixture {
--
2.25.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [igt-dev] [PATCH i-g-t 2/2] tests/intel/kms_psr2_sf: Add FBC support to PSR2 tests
2023-11-24 16:00 [igt-dev] [PATCH i-g-t 0/2] Add FBC support to PSR/PSR2 tests Jeevan B
2023-11-24 16:00 ` [igt-dev] [PATCH i-g-t 1/2] tests/intel/kms_psr: " Jeevan B
@ 2023-11-24 16:00 ` Jeevan B
1 sibling, 0 replies; 12+ messages in thread
From: Jeevan B @ 2023-11-24 16:00 UTC (permalink / raw)
To: igt-dev
For intel_display_ver 20, FBC can be enabled along with PSR2,
thereby adding FBC checks to validate this scenario.
Signed-off-by: Jeevan B <jeevan.b@intel.com>
---
tests/intel/kms_psr2_sf.c | 567 ++++++++++++++++++++------------------
1 file changed, 296 insertions(+), 271 deletions(-)
diff --git a/tests/intel/kms_psr2_sf.c b/tests/intel/kms_psr2_sf.c
index a597c8701..d935b0097 100644
--- a/tests/intel/kms_psr2_sf.c
+++ b/tests/intel/kms_psr2_sf.c
@@ -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>
@@ -157,9 +158,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 +868,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 +975,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 +999,11 @@ igt_main
display_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 +1038,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++) {
- for (j = FEATURE_NONE; j < FEATURE_COUNT; j++) {
- if (j != FEATURE_NONE && !(coexist_features[i] & j))
+ data.op_fbc_mode = fbc_status[y];
+ if (data.op_fbc_mode == FBC_DISABLED)
+ data.fbc_flag = false;
+
+ /* 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("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;
+ /* 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))
+ 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);
+ }
+ }
+ }
+ }
+ }
+
+ 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;
- 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_OVERLAY;
+ data.coexist_feature = j;
+ for (k = 1; k <= MAX_DAMAGE_AREAS; k++) {
+ data.damage_area_count = k;
+ prepare(&data);
+ run(&data);
+ cleanup(&data);
+ }
+ }
+ }
+ }
+ }
+
+ 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;
+
+ 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 +1155,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 +1180,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 +1310,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 +1398,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);
--
2.25.1
^ permalink raw reply related [flat|nested] 12+ messages in thread