* [igt-dev] [PATCH i-g-t 1/2] tests/intel/kms_psr: Add FBC support to PSR/PSR2/PR tests
2023-11-28 11:37 [igt-dev] [PATCH i-g-t 0/2] Add FBC support to PSR/PSR2 tests Jeevan B
@ 2023-11-28 11:37 ` Jeevan B
0 siblings, 0 replies; 10+ messages in thread
From: Jeevan B @ 2023-11-28 11:37 UTC (permalink / raw)
To: igt-dev
For LunarLake (intel_display_ver 20), FBC can be enabled along with
PSR/PSR2/PR, 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 | 488 ++++++++++++++++++++++++++++++------------
2 files changed, 357 insertions(+), 136 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 afd74eaff..c801b5901 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>
@@ -39,14 +40,21 @@
#include "xe/xe_query.h"
/**
- * SUBTEST: psr_basic
+ * SUBTEST: psr-basic
* Description: Basic check for psr if it is detecting changes made in planes
* Driver requirement: i915, xe
* Functionality: psr
* Mega feature: PSR
* Test category: functionality test
*
- * SUBTEST: psr_%s_%s
+ * SUBTEST: fbc-psr-basic
+ * Description: Basic check for psr if it is detecting changes made in planes
+ * Driver requirement: i915, xe
+ * Functionality: psr, fbc
+ * Mega feature: PSR, FBC
+ * Test category: functionality test
+ *
+ * SUBTEST: psr-%s-%s
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on %arg[1]
* Driver requirement: i915
@@ -54,6 +62,14 @@
* Mega feature: PSR
* Test category: functionality test
*
+ * SUBTEST: fbc-psr-%s-%s
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1]
+ * Driver requirement: i915
+ * Functionality: kms_core, plane, psr, fbc
+ * Mega feature: PSR, FBC
+ * Test category: functionality test
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -67,7 +83,7 @@
*/
/**
- * SUBTEST: psr_sprite_plane_move
+ * SUBTEST: psr-sprite-plane-move
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on sprite planes
* Driver requirement: i915, xe
@@ -75,7 +91,15 @@
* Mega feature: PSR
* Test category: functionality test
*
- * SUBTEST: psr_%s_%s
+ * SUBTEST: fbc-psr-sprite-plane-move
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on sprite planes
+ * Driver requirement: i915, xe
+ * Functionality: plane, psr, fbc
+ * Mega feature: PSR, FBC
+ * Test category: functionality test
+ *
+ * SUBTEST: psr-%s-%s
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Driver requirement: i915, xe
@@ -83,6 +107,14 @@
* Mega feature: PSR
* Test category: functionality test
*
+ * SUBTEST: fbc-psr-%s-%s
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Driver requirement: i915, xe
+ * Functionality: kms_core, plane, psr, fbc
+ * Mega feature: PSR, FBC
+ * Test category: functionality test
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -96,7 +128,7 @@
*/
/**
- * SUBTEST: psr_primary_%s
+ * SUBTEST: psr-primary-%s
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Driver requirement: i915, xe
@@ -104,6 +136,14 @@
* Mega feature: PSR
* Test category: functionality test
*
+ * SUBTEST: fbc-psr-primary-%s
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Driver requirement: i915, xe
+ * Functionality: kms_core, psr, fbc
+ * Mega feature: PSR, FBC
+ * Test category: functionality test
+ *
* arg[1]:
*
* @blt: Blitter
@@ -111,7 +151,7 @@
*/
/**
- * SUBTEST: psr_dpms
+ * SUBTEST: psr-dpms
* Description: Check if psr is detecting changes when rendering operation is
* performed with dpms enabled or disabled
* Driver requirement: i915, xe
@@ -119,14 +159,29 @@
* Mega feature: PSR
* Test category: functionality test
*
- * SUBTEST: psr_no_drrs
+ * SUBTEST: fbc-psr-dpms
+ * Description: Check if fbc with psr is detecting changes when rendering operation is
+ * performed with dpms enabled or disabled
+ * Driver requirement: i915, xe
+ * Functionality: dpms, psr, fbc
+ * Mega feature: PSR, FBC
+ * Test category: functionality test
+ *
+ * SUBTEST: psr-no-drrs
* Description: Check if psr is detecting changes when drrs is disabled
* Driver requirement: i915, xe
* Functionality: drrs, psr
* Mega feature: PSR
* Test category: functionality test
*
- * SUBTEST: psr_suspend
+ * SUBTEST: fbc-psr-no-drrs
+ * Description: Check if fbc with psr is detecting changes when drrs is disabled
+ * Driver requirement: i915, xe
+ * Functionality: drrs, psr, fbc
+ * Mega feature: PSR, FBC
+ * Test category: functionality test
+ *
+ * SUBTEST: psr-suspend
* Description: Check if psr is detecting changes when plane operation
* is performed with suspend resume cycles
* Driver requirement: i915, xe
@@ -134,7 +189,15 @@
* Mega feature: PSR
* Test category: functionality test
*
- * SUBTEST: psr2_dpms
+ * SUBTEST: fbc-psr-suspend
+ * Description: Check if fbc with psr is detecting changes when plane operation
+ * is performed with suspend resume cycles
+ * Driver requirement: i915, xe
+ * Functionality: psr, suspend, fbc
+ * Mega feature: PSR, FBC
+ * Test category: functionality test
+ *
+ * SUBTEST: psr2-dpms
* Description: Check if psr is detecting changes when rendering operation
* is performed with dpms enabled or disabled
* Driver requirement: i915, xe
@@ -142,14 +205,29 @@
* Mega feature: PSR
* Test category: functionality test
*
- * SUBTEST: psr2_no_drrs
+ * SUBTEST: fbc-psr2-dpms
+ * Description: Check if fbc with psr is detecting changes when rendering operation
+ * is performed with dpms enabled or disabled
+ * Driver requirement: i915, xe
+ * Functionality: dpms, psr, psr2, fbc
+ * Mega feature: PSR, FBC
+ * Test category: functionality test
+ *
+ * SUBTEST: psr2-no-drrs
* Description: Check if psr is detecting changes when drrs is disabled
* Driver requirement: i915, xe
* Functionality: drrs, psr, psr2
* Mega feature: PSR
* Test category: functionality test
*
- * SUBTEST: psr2_suspend
+ * SUBTEST: fbc-psr2-no-drrs
+ * Description: Check if fbc with psr is detecting changes when drrs is disabled
+ * Driver requirement: i915, xe
+ * Functionality: drrs, psr, psr2, fbc
+ * Mega feature: PSR, FBC
+ * Test category: functionality test
+ *
+ * SUBTEST: psr2-suspend
* Description: Check if psr is detecting changes when plane operation is
* performed with suspend resume cycles
* Driver requirement: i915, xe
@@ -157,14 +235,29 @@
* Mega feature: PSR
* Test category: functionality test
*
- * SUBTEST: psr2_basic
+ * SUBTEST: fbc-psr2-suspend
+ * Description: Check if fbc with psr is detecting changes when plane operation is
+ * performed with suspend resume cycles
+ * Driver requirement: i915, xe
+ * Functionality: psr, psr2, suspend, fbc
+ * Mega feature: PSR, FBC
+ * Test category: functionality test
+ *
+ * SUBTEST: psr2-basic
* Description: Basic check for psr if it is detecting changes made in planes
* Driver requirement: i915, xe
* Functionality: psr, psr2
* Mega feature: PSR
* Test category: functionality test
*
- * SUBTEST: psr2_%s_%s
+ * SUBTEST: fbc-psr2-basic
+ * Description: Basic check for fbc with psr if it is detecting changes made in planes
+ * Driver requirement: i915, xe
+ * Functionality: psr, psr2, fbc
+ * Mega feature: PSR, FBC
+ * Test category: functionality test
+ *
+ * SUBTEST: psr2-%s-%s
* Description: Check if psr2 is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Driver requirement: i915
@@ -172,6 +265,14 @@
* Mega feature: PSR
* Test category: functionality test
*
+ * SUBTEST: fbc-psr2-%s-%s
+ * Description: Check if fbc with psr2 is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Driver requirement: i915
+ * Functionality: kms_core, plane, psr, psr2, fbc
+ * Mega feature: PSR, FBC
+ * Test category: functionality test
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -185,7 +286,7 @@
*/
/**
- * SUBTEST: psr2_primary_page_flip
+ * SUBTEST: psr2-primary-page-flip
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on primary planes
* Driver requirement: i915, xe
@@ -193,7 +294,15 @@
* Mega feature: PSR
* Test category: functionality test
*
- * SUBTEST: psr2_primary_%s
+ * SUBTEST: fbc-psr2-primary-page-flip
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on primary planes
+ * Driver requirement: i915, xe
+ * Functionality: plane, psr, psr2, fbc
+ * Mega feature: PSR, FBC
+ * Test category: functionality test
+ *
+ * SUBTEST: psr2-primary-%s
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on primary planes
* Driver requirement: i915, xe
@@ -201,6 +310,14 @@
* Mega feature: PSR
* Test category: functionality test
*
+ * SUBTEST: fbc-psr2-primary-%s
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on primary planes
+ * Driver requirement: i915, xe
+ * Functionality: kms_core, plane, psr, psr2, fbc
+ * Mega feature: PSR, FBC
+ * Test category: functionality test
+ *
* arg[1]:
*
* @blt: Blitter
@@ -208,7 +325,7 @@
*/
/**
- * SUBTEST: psr2_%s_%s
+ * SUBTEST: psr2-%s-%s
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Driver requirement: i915, xe
@@ -216,6 +333,14 @@
* Mega feature: PSR
* Test category: functionality test
*
+ * SUBTEST: fbc-psr2-%s-%s
+ * Description: Check if psr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Driver requirement: i915, xe
+ * Functionality: kms_core, plane, psr, psr2, fbc
+ * Mega feature: PSR, FBC
+ * Test category: functionality test
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -230,45 +355,75 @@
*/
/**
- * SUBTEST: pr_dpms
+ * SUBTEST: pr-dpms
* Description: Check if pr is detecting changes when rendering operation
* is performed with dpms enabled or disabled
* Driver requirement: i915, xe
* Functionality: dpms, pr
* Mega feature: Panel Replay
* Test category: functionality test
+ *
+ * SUBTEST: fbc-pr-dpms
+ * Description: Check if fbc with pr is detecting changes when rendering operation
+ * is performed with dpms enabled or disabled
+ * Driver requirement: i915, xe
+ * Functionality: dpms, pr, fbc
+ * Mega feature: Panel Replay, FBC
+ * Test category: functionality test
*/
/**
- * SUBTEST: pr_no_drrs
+ * SUBTEST: pr-no-drrs
* Description: Check if pr is detecting changes when drrs is disabled
* Driver requirement: i915, xe
* Functionality: drrs, pr
* Mega feature: Panel Replay
* Test category: functionality test
+ *
+ * SUBTEST: fbc-pr-no-drrs
+ * Description: Check if pr is detecting changes when drrs is disabled
+ * Driver requirement: i915, xe
+ * Functionality: drrs, pr, fbc
+ * Mega feature: Panel Replay, FBC
+ * Test category: functionality test
*/
/**
- * SUBTEST: pr_suspend
+ * SUBTEST: pr-suspend
* Description: Check if pr is detecting changes when plane operation is
* performed with suspend resume cycles
* Driver requirement: i915, xe
* Functionality: pr, suspend
* Mega feature: Panel Replay
* Test category: functionality test
+ *
+ * SUBTEST: fbc-pr-suspend
+ * Description: Check if fbc with pr is detecting changes when plane operation is
+ * performed with suspend resume cycles
+ * Driver requirement: i915, xe
+ * Functionality: pr, suspend, fbc
+ * Mega feature: Panel Replay, FBC
+ * Test category: functionality test
*/
/**
- * SUBTEST: pr_basic
+ * SUBTEST: pr-basic
* Description: Basic check for pr if it is detecting changes made in planes
* Driver requirement: i915, xe
* Functionality: pr
* Mega feature: Panel Replay
* Test category: functionality test
+ *
+ * SUBTEST: fbc-pr-basic
+ * Description: Basic check for fbc with pr if it is detecting changes made in planes
+ * Driver requirement: i915, xe
+ * Functionality: pr, fbc
+ * Mega feature: Panel Replay, FBC
+ * Test category: functionality test
*/
/**
- * SUBTEST: pr_%s_%s
+ * SUBTEST: pr-%s-%s
* Description: Check if pr is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Driver requirement: i915
@@ -276,6 +431,14 @@
* Mega feature: Panel Replay
* Test category: functionality test
*
+ * SUBTEST: fbc-pr-%s-%s
+ * Description: Check if fbc with pr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Driver requirement: i915
+ * Functionality: kms_core, plane, pr, fbc
+ * Mega feature: Panel Replay, FBC
+ * Test category: functionality test
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -289,17 +452,25 @@
*/
/**
- * SUBTEST: pr_primary_page_flip
+ * SUBTEST: pr-primary-page-flip
* Description: Check if pr is detecting memory mapping, rendering and plane
* operations performed on primary planes
* Driver requirement: i915, xe
* Functionality: plane, pr
* Mega feature: Panel Replay
* Test category: functionality test
+ *
+ * SUBTEST: fbc-pr-primary-page-flip
+ * Description: Check if fbc with pr is detecting memory mapping, rendering and plane
+ * operations performed on primary planes
+ * Driver requirement: i915, xe
+ * Functionality: plane, pr, fbc
+ * Mega feature: Panel Replay, FBC
+ * Test category: functionality test
*/
/**
- * SUBTEST: pr_primary_%s
+ * SUBTEST: pr-primary-%s
* Description: Check if pr is detecting memory mapping, rendering and plane
* operations performed on primary planes
* Driver requirement: i915, xe
@@ -307,6 +478,14 @@
* Mega feature: Panel Replay
* Test category: functionality test
*
+ * SUBTEST: fbc-pr-primary-%s
+ * Description: Check if fbc with pr is detecting memory mapping, rendering and plane
+ * operations performed on primary planes
+ * Driver requirement: i915, xe
+ * Functionality: kms_core, plane, pr, fbc
+ * Mega feature: Panel Replay, FBC
+ * Test category: functionality test
+ *
* arg[1]:
*
* @blt: Blitter
@@ -314,7 +493,7 @@
*/
/**
- * SUBTEST: pr_%s_%s
+ * SUBTEST: pr-%s-%s
* Description: Check if pr is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Driver requirement: i915, xe
@@ -322,6 +501,14 @@
* Mega feature: Panel Replay
* Test category: functionality test
*
+ * SUBTEST: fbc-pr-%s-%s
+ * Description: Check if fbc with pr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Driver requirement: i915, xe
+ * Functionality: kms_core, plane, pr, fbc
+ * Mega feature: Panel Replay, FBC
+ * Test category: functionality test
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -348,13 +535,13 @@ enum operations {
static const char *op_str(enum operations op)
{
static const char * const name[] = {
- [PAGE_FLIP] = "page_flip",
- [MMAP_GTT] = "mmap_gtt",
- [MMAP_CPU] = "mmap_cpu",
+ [PAGE_FLIP] = "page-flip",
+ [MMAP_GTT] = "mmap-gtt",
+ [MMAP_CPU] = "mmap-cpu",
[BLT] = "blt",
[RENDER] = "render",
- [PLANE_MOVE] = "plane_move",
- [PLANE_ONOFF] = "plane_onoff",
+ [PLANE_MOVE] = "plane-move",
+ [PLANE_ONOFF] = "plane-onoff",
};
return name[op];
@@ -366,6 +553,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 +564,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)
@@ -782,6 +971,11 @@ static void test_setup(data_t *data)
igt_require_f(data->output,
"No available output found\n");
+ if (data->fbc_flag)
+ igt_assert_f(intel_fbc_wait_until_enabled(data->drm_fd,
+ pipe),
+ "FBC still disabled");
+
pipe = get_pipe_for_output(&data->display, data->output);
igt_output_set_pipe(data->output, pipe);
igt_require_f(intel_pipe_output_combo_valid(&data->display),
@@ -819,14 +1013,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_"
+ "psr-",
+ "psr2-",
+ "pr-"
+ };
+ const char *append_fbc_subtest[2] = {
+ "",
+ "fbc-"
};
int modes[] = {PSR_MODE_1, PSR_MODE_2, PR_MODE};
+ int fbc_status[] = {FBC_DISABLED, FBC_ENABLED};
igt_output_t *output;
igt_fixture {
@@ -837,52 +1037,41 @@ 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");
- }
-
- 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);
- }
- }
+ 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;
}
- 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);
+ }
+
+ 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 (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("%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 +1079,90 @@ 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 +1170,21 @@ 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 = igt_get_render_copyfunc(data.devid) ?
+ RENDER : BLT;
+ 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 +1192,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 = igt_get_render_copyfunc(data.devid) ? RENDER : BLT;
- 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] 10+ messages in thread
* [igt-dev] [PATCH i-g-t 1/2] tests/intel/kms_psr: Add FBC support to PSR/PSR2/PR tests
2023-11-28 17:40 [igt-dev] [PATCH i-g-t 0/2] Add FBC support to PSR/PSR2 tests Jeevan B
@ 2023-11-28 17:40 ` Jeevan B
0 siblings, 0 replies; 10+ messages in thread
From: Jeevan B @ 2023-11-28 17:40 UTC (permalink / raw)
To: igt-dev
For LunarLake (intel_display_ver 20), FBC can be enabled along with
PSR/PSR2/PR, 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 | 446 ++++++++++++++++++++++++++++--------------
2 files changed, 308 insertions(+), 143 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 7fe6a2c30..bfa713b60 100644
--- a/tests/intel/kms_psr.c
+++ b/tests/intel/kms_psr.c
@@ -34,6 +34,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>
@@ -42,16 +43,24 @@
#include "xe/xe_query.h"
/**
- * SUBTEST: psr_basic
+ * SUBTEST: psr-basic
* Description: Basic check for psr if it is detecting changes made in planes
* Functionality: psr1
*
- * SUBTEST: psr_%s_%s
+ * SUBTEST: fbc-psr-basic
+ * Description: Basic check for psr if it is detecting changes made in planes
+ * Functionality: psr, fbc
+ *
+ * SUBTEST: psr-%s-%s
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on %arg[1]
- * Driver requirement: i915
* Functionality: kms_core, plane, psr1
*
+ * SUBTEST: fbc-psr-%s-%s
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1]
+ * Functionality: kms_core, plane, psr, fbc
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -65,16 +74,26 @@
*/
/**
- * SUBTEST: psr_sprite_plane_move
+ * SUBTEST: psr-sprite-plane-move
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on sprite planes
* Functionality: plane, psr1
*
- * SUBTEST: psr_%s_%s
+ * SUBTEST: fbc-psr-sprite-plane-move
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on sprite planes
+ * Functionality: plane, psr, fbc
+ *
+ * SUBTEST: psr-%s-%s
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Functionality: kms_core, plane, psr1
*
+ * SUBTEST: fbc-psr-%s-%s
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Functionality: kms_core, plane, psr, fbc
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -88,11 +107,16 @@
*/
/**
- * SUBTEST: psr_primary_%s
+ * SUBTEST: psr-primary-%s
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Functionality: kms_core, psr1
*
+ * SUBTEST: fbc-psr-primary-%s
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Functionality: kms_core, psr, fbc
+ *
* arg[1]:
*
* @blt: Blitter
@@ -100,44 +124,81 @@
*/
/**
- * SUBTEST: psr_dpms
+ * SUBTEST: psr-dpms
* Description: Check if psr is detecting changes when rendering operation is
* performed with dpms enabled or disabled
* Functionality: dpms, psr1
*
- * SUBTEST: psr_no_drrs
+ * SUBTEST: fbc-psr-dpms
+ * Description: Check if fbc with psr is detecting changes when rendering operation is
+ * performed with dpms enabled or disabled
+ * Functionality: dpms, psr, fbc
+ *
+ * SUBTEST: psr-no-drrs
* Description: Check if psr is detecting changes when drrs is disabled
* Functionality: drrs, psr1
*
- * SUBTEST: psr_suspend
+ * SUBTEST: fbc-psr-no-drrs
+ * Description: Check if fbc with psr is detecting changes when drrs is disabled
+ * Functionality: drrs, psr, fbc
+ *
+ * SUBTEST: psr-suspend
* Description: Check if psr is detecting changes when plane operation
* is performed with suspend resume cycles
* Functionality: psr1, suspend
*
- * SUBTEST: psr2_dpms
+ * SUBTEST: fbc-psr-suspend
+ * Description: Check if fbc with psr is detecting changes when plane operation
+ * is performed with suspend resume cycles
+ * Functionality: psr, suspend, fbc
+ *
+ * SUBTEST: psr2-dpms
* Description: Check if psr is detecting changes when rendering operation
* is performed with dpms enabled or disabled
* Functionality: dpms, psr2
*
- * SUBTEST: psr2_no_drrs
+ * SUBTEST: fbc-psr2-dpms
+ * Description: Check if fbc with psr is detecting changes when rendering operation
+ * is performed with dpms enabled or disabled
+ * Functionality: dpms, psr, psr2, fbc
+ *
+ * SUBTEST: psr2-no-drrs
* Description: Check if psr is detecting changes when drrs is disabled
* Functionality: drrs, psr2
*
- * SUBTEST: psr2_suspend
+ * SUBTEST: fbc-psr2-no-drrs
+ * Description: Check if fbc with psr is detecting changes when drrs is disabled
+ * Functionality: drrs, psr, psr2, fbc
+ *
+ * SUBTEST: psr2-suspend
* Description: Check if psr is detecting changes when plane operation is
* performed with suspend resume cycles
* Functionality: psr2, suspend
*
- * SUBTEST: psr2_basic
+ * SUBTEST: fbc-psr2-suspend
+ * Description: Check if fbc with psr is detecting changes when plane operation is
+ * performed with suspend resume cycles
+ * Functionality: psr, psr2, suspend, fbc
+ *
+ * SUBTEST: psr2-basic
* Description: Basic check for psr if it is detecting changes made in planes
* Functionality: psr2
*
- * SUBTEST: psr2_%s_%s
+ * SUBTEST: fbc-psr2-basic
+ * Description: Basic check for fbc with psr if it is detecting changes made in planes
+ * Functionality: psr, psr2, fbc
+ *
+ * SUBTEST: psr2-%s-%s
* Description: Check if psr2 is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Driver requirement: i915
* Functionality: kms_core, plane, psr2
*
+ * SUBTEST: fbc-psr2-%s-%s
+ * Description: Check if fbc with psr2 is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Functionality: kms_core, plane, psr, psr2, fbc
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -151,16 +212,26 @@
*/
/**
- * SUBTEST: psr2_primary_page_flip
+ * SUBTEST: psr2-primary-page-flip
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on primary planes
* Functionality: plane, psr2
*
- * SUBTEST: psr2_primary_%s
+ * SUBTEST: fbc-psr2-primary-page-flip
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on primary planes
+ * Functionality: plane, psr, psr2, fbc
+ *
+ * SUBTEST: psr2-primary-%s
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on primary planes
* Functionality: kms_core, plane, psr2
*
+ * SUBTEST: fbc-psr2-primary-%s
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on primary planes
+ * Functionality: kms_core, plane, psr, psr2, fbc
+ *
* arg[1]:
*
* @blt: Blitter
@@ -168,11 +239,16 @@
*/
/**
- * SUBTEST: psr2_%s_%s
+ * SUBTEST: psr2-%s-%s
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Functionality: kms_core, plane, psr2
*
+ * SUBTEST: fbc-psr2-%s-%s
+ * Description: Check if psr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Functionality: kms_core, plane, psr, psr2, fbc
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -187,37 +263,60 @@
*/
/**
- * SUBTEST: pr_dpms
+ * SUBTEST: pr-dpms
* Description: Check if pr is detecting changes when rendering operation
* is performed with dpms enabled or disabled
* Functionality: dpms, pr
* Mega feature: Panel Replay
*
- * SUBTEST: pr_no_drrs
+ * SUBTEST: fbc-pr-dpms
+ * Description: Check if fbc with pr is detecting changes when rendering operation
+ * is performed with dpms enabled or disabled
+ * Functionality: dpms, pr, fbc
+ *
+ * SUBTEST: pr-no-drrs
* Description: Check if pr is detecting changes when drrs is disabled
* Functionality: drrs, pr
- * Mega feature: Panel Replay
*
- * SUBTEST: pr_suspend
+ * SUBTEST: fbc-pr-no-drrs
+ * Description: Check if pr is detecting changes when drrs is disabled
+ * Functionality: drrs, pr, fbc
+ *
+ * SUBTEST: pr-suspend
* Description: Check if pr is detecting changes when plane operation is
* performed with suspend resume cycles
* Functionality: pr, suspend
- * Mega feature: Panel Replay
*
- * SUBTEST: pr_basic
+ * SUBTEST: fbc-pr-suspend
+ * Description: Check if fbc with pr is detecting changes when plane operation is
+ * performed with suspend resume cycles
+ * Functionality: pr, suspend, fbc
+ *
+ * SUBTEST: pr-basic
* Description: Basic check for pr if it is detecting changes made in planes
* Functionality: pr
- * Mega feature: Panel Replay
+ *
+ * SUBTEST: fbc-pr-basic
+ * Description: Basic check for fbc with pr if it is detecting changes made in planes
+ * Functionality: pr, fbc
*/
/**
- * SUBTEST: pr_%s_%s
+ * SUBTEST: pr-%s-%s
* Description: Check if pr is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Driver requirement: i915
* Functionality: kms_core, plane, pr
* Mega feature: Panel Replay
*
+ * SUBTEST: fbc-pr-%s-%s
+ * Description: Check if fbc with pr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Driver requirement: i915
+ * Functionality: kms_core, plane, pr, fbc
+ * Mega feature: Panel Replay, FBC
+ * Test category: functionality test
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -231,18 +330,30 @@
*/
/**
- * SUBTEST: pr_primary_page_flip
+ * SUBTEST: pr-primary-page-flip
* Description: Check if pr is detecting memory mapping, rendering and plane
* operations performed on primary planes
* Functionality: plane, pr
* Mega feature: Panel Replay
*
- * SUBTEST: pr_primary_%s
+ * SUBTEST: fbc-pr-primary-page-flip
+ * Description: Check if fbc with pr is detecting memory mapping, rendering and plane
+ * operations performed on primary planes
+ * Functionality: plane, pr, fbc
+ * Mega feature: Panel Replay, FBC
+ *
+ * SUBTEST: pr-primary-%s
* Description: Check if pr is detecting memory mapping, rendering and plane
* operations performed on primary planes
* Functionality: kms_core, plane, pr
* Mega feature: Panel Replay
*
+ * SUBTEST: fbc-pr-primary-%s
+ * Description: Check if fbc with pr is detecting memory mapping, rendering and plane
+ * operations performed on primary planes
+ * Functionality: kms_core, plane, pr, fbc
+ * Mega feature: Panel Replay, FBC
+ *
* arg[1]:
*
* @blt: Blitter
@@ -250,12 +361,18 @@
*/
/**
- * SUBTEST: pr_%s_%s
+ * SUBTEST: pr-%s-%s
* Description: Check if pr is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Functionality: kms_core, plane, pr
* Mega feature: Panel Replay
*
+ * SUBTEST: fbc-pr-%s-%s
+ * Description: Check if fbc with pr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Functionality: kms_core, plane, pr, fbc
+ * Mega feature: Panel Replay, FBC
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -270,20 +387,35 @@
*/
/**
- * SUBTEST: psr_cursor_plane_move
+ * SUBTEST: psr-cursor-plane-move
* Description: Check if psr is detecting the plane operations performed on
* cursor planes
* Functionality: psr1
*
- * SUBTEST: psr_primary_page_flip
+ * SUBTEST: fbc-psr-cursor-plane-move
+ * Description: Check if fbc with psr is detecting the plane operations performed on
+ * cursor planes
+ * Functionality: psr1, fbc
+ *
+ * SUBTEST: psr-primary-page-flip
* Description: Check if psr is detecting page-flipping operations performed
* on primary planes
* Functionality: psr1
*
- * SUBTEST: psr_sprite_plane_onoff
+ * SUBTEST: fbc-psr-primary-page-flip
+ * Description: Check if psr is detecting page-flipping operations performed
+ * on primary planes
+ * Functionality: psr1, fbc
+ *
+ * SUBTEST: psr-sprite-plane-onoff
* Description: Check if psr is detecting the plane operations performed on
* sprite planes
* Functionality: psr1
+ *
+ * SUBTEST: fbc-psr-sprite-plane-onoff
+ * Description: Check if psr is detecting the plane operations performed on
+ * sprite planes
+ * Functionality: psr1, fbc
*/
enum operations {
@@ -299,13 +431,13 @@ enum operations {
static const char *op_str(enum operations op)
{
static const char * const name[] = {
- [PAGE_FLIP] = "page_flip",
- [MMAP_GTT] = "mmap_gtt",
- [MMAP_CPU] = "mmap_cpu",
+ [PAGE_FLIP] = "page-flip",
+ [MMAP_GTT] = "mmap-gtt",
+ [MMAP_CPU] = "mmap-cpu",
[BLT] = "blt",
[RENDER] = "render",
- [PLANE_MOVE] = "plane_move",
- [PLANE_ONOFF] = "plane_onoff",
+ [PLANE_MOVE] = "plane-move",
+ [PLANE_ONOFF] = "plane-onoff",
};
return name[op];
@@ -317,6 +449,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;
@@ -327,6 +460,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)
@@ -707,6 +841,11 @@ static void test_setup(data_t *data)
igt_require_f(data->output,
"No available output found\n");
+ if (data->fbc_flag)
+ igt_assert_f(intel_fbc_wait_until_enabled(data->drm_fd,
+ pipe),
+ "FBC still disabled");
+
pipe = get_pipe_for_output(&data->display, data->output);
igt_output_set_pipe(data->output, pipe);
igt_require_f(intel_pipe_output_combo_valid(&data->display),
@@ -744,14 +883,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_"
+ "psr-",
+ "psr2-",
+ "pr-"
+ };
+ const char *append_fbc_subtest[2] = {
+ "",
+ "fbc-"
};
int modes[] = {PSR_MODE_1, PSR_MODE_2, PR_MODE};
+ int fbc_status[] = {FBC_DISABLED, FBC_ENABLED};
igt_output_t *output;
igt_fixture {
@@ -762,52 +907,40 @@ 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");
- }
-
- 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);
- }
- }
+ 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;
}
+ }
- 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);
+ 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 (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("%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))
@@ -815,24 +948,90 @@ 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))
@@ -840,22 +1039,21 @@ 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 = igt_get_render_copyfunc(data.devid) ?
+ RENDER : BLT;
+ 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))
@@ -863,56 +1061,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 = igt_get_render_copyfunc(data.devid) ? RENDER : BLT;
- 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] 10+ messages in thread
* [igt-dev] [PATCH i-g-t 0/2] Add FBC support to PSR/PSR2 tests
@ 2023-11-29 5:35 Jeevan B
2023-11-29 5:36 ` [igt-dev] [PATCH i-g-t 1/2] tests/intel/kms_psr: Add FBC support to PSR/PSR2/PR tests Jeevan B
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Jeevan B @ 2023-11-29 5:35 UTC (permalink / raw)
To: igt-dev
Signed-off-by: Jeevan B <jeevan.b@intel.com>
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 | 468 +++++++++++++++++++----------
tests/intel/kms_psr2_sf.c | 609 +++++++++++++++++++++-----------------
3 files changed, 657 insertions(+), 425 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 10+ messages in thread
* [igt-dev] [PATCH i-g-t 1/2] tests/intel/kms_psr: Add FBC support to PSR/PSR2/PR tests
2023-11-29 5:35 [igt-dev] [PATCH i-g-t 0/2] Add FBC support to PSR/PSR2 tests Jeevan B
@ 2023-11-29 5:36 ` Jeevan B
2023-11-29 5:36 ` [igt-dev] [PATCH i-g-t 2/2] tests/intel/kms_psr2_sf: Add FBC support to PSR2 tests Jeevan B
2023-11-29 6:39 ` [igt-dev] ✓ CI.xeBAT: success for Add FBC support to PSR/PSR2 tests (rev8) Patchwork
2 siblings, 0 replies; 10+ messages in thread
From: Jeevan B @ 2023-11-29 5:36 UTC (permalink / raw)
To: igt-dev
For LunarLake (intel_display_ver 20), FBC can be enabled along with
PSR/PSR2/PR, 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 | 468 ++++++++++++++++++++++++++++--------------
2 files changed, 319 insertions(+), 154 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 7fe6a2c30..ddb0f0141 100644
--- a/tests/intel/kms_psr.c
+++ b/tests/intel/kms_psr.c
@@ -34,6 +34,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>
@@ -42,16 +43,24 @@
#include "xe/xe_query.h"
/**
- * SUBTEST: psr_basic
+ * SUBTEST: psr-basic
* Description: Basic check for psr if it is detecting changes made in planes
* Functionality: psr1
*
- * SUBTEST: psr_%s_%s
+ * SUBTEST: fbc-psr-basic
+ * Description: Basic check for psr if it is detecting changes made in planes
+ * Functionality: psr, fbc
+ *
+ * SUBTEST: psr-%s-%s
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on %arg[1]
- * Driver requirement: i915
* Functionality: kms_core, plane, psr1
*
+ * SUBTEST: fbc-psr-%s-%s
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1]
+ * Functionality: kms_core, plane, psr, fbc
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -60,21 +69,31 @@
*
* arg[2]:
*
- * @mmap_cpu: MMAP CPU
- * @mmap_gtt: MMAP GTT
+ * @mmap-cpu: MMAP CPU
+ * @mmap-gtt: MMAP GTT
*/
/**
- * SUBTEST: psr_sprite_plane_move
+ * SUBTEST: psr-sprite-plane-move
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on sprite planes
* Functionality: plane, psr1
*
- * SUBTEST: psr_%s_%s
+ * SUBTEST: fbc-psr-sprite-plane-move
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on sprite planes
+ * Functionality: plane, psr, fbc
+ *
+ * SUBTEST: psr-%s-%s
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Functionality: kms_core, plane, psr1
*
+ * SUBTEST: fbc-psr-%s-%s
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Functionality: kms_core, plane, psr, fbc
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -84,15 +103,20 @@
*
* @blt: Blitter
* @render: Render
- * @plane_onoff: Plane On off
+ * @plane-onoff: Plane On off
*/
/**
- * SUBTEST: psr_primary_%s
+ * SUBTEST: psr-primary-%s
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Functionality: kms_core, psr1
*
+ * SUBTEST: fbc-psr-primary-%s
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Functionality: kms_core, psr, fbc
+ *
* arg[1]:
*
* @blt: Blitter
@@ -100,44 +124,81 @@
*/
/**
- * SUBTEST: psr_dpms
+ * SUBTEST: psr-dpms
* Description: Check if psr is detecting changes when rendering operation is
* performed with dpms enabled or disabled
* Functionality: dpms, psr1
*
- * SUBTEST: psr_no_drrs
+ * SUBTEST: fbc-psr-dpms
+ * Description: Check if fbc with psr is detecting changes when rendering operation is
+ * performed with dpms enabled or disabled
+ * Functionality: dpms, psr, fbc
+ *
+ * SUBTEST: psr-no-drrs
* Description: Check if psr is detecting changes when drrs is disabled
* Functionality: drrs, psr1
*
- * SUBTEST: psr_suspend
+ * SUBTEST: fbc-psr-no-drrs
+ * Description: Check if fbc with psr is detecting changes when drrs is disabled
+ * Functionality: drrs, psr, fbc
+ *
+ * SUBTEST: psr-suspend
* Description: Check if psr is detecting changes when plane operation
* is performed with suspend resume cycles
* Functionality: psr1, suspend
*
- * SUBTEST: psr2_dpms
+ * SUBTEST: fbc-psr-suspend
+ * Description: Check if fbc with psr is detecting changes when plane operation
+ * is performed with suspend resume cycles
+ * Functionality: psr, suspend, fbc
+ *
+ * SUBTEST: psr2-dpms
* Description: Check if psr is detecting changes when rendering operation
* is performed with dpms enabled or disabled
* Functionality: dpms, psr2
*
- * SUBTEST: psr2_no_drrs
+ * SUBTEST: fbc-psr2-dpms
+ * Description: Check if fbc with psr is detecting changes when rendering operation
+ * is performed with dpms enabled or disabled
+ * Functionality: dpms, psr, psr2, fbc
+ *
+ * SUBTEST: psr2-no-drrs
* Description: Check if psr is detecting changes when drrs is disabled
* Functionality: drrs, psr2
*
- * SUBTEST: psr2_suspend
+ * SUBTEST: fbc-psr2-no-drrs
+ * Description: Check if fbc with psr is detecting changes when drrs is disabled
+ * Functionality: drrs, psr, psr2, fbc
+ *
+ * SUBTEST: psr2-suspend
* Description: Check if psr is detecting changes when plane operation is
* performed with suspend resume cycles
* Functionality: psr2, suspend
*
- * SUBTEST: psr2_basic
+ * SUBTEST: fbc-psr2-suspend
+ * Description: Check if fbc with psr is detecting changes when plane operation is
+ * performed with suspend resume cycles
+ * Functionality: psr, psr2, suspend, fbc
+ *
+ * SUBTEST: psr2-basic
* Description: Basic check for psr if it is detecting changes made in planes
* Functionality: psr2
*
- * SUBTEST: psr2_%s_%s
+ * SUBTEST: fbc-psr2-basic
+ * Description: Basic check for fbc with psr if it is detecting changes made in planes
+ * Functionality: psr, psr2, fbc
+ *
+ * SUBTEST: psr2-%s-%s
* Description: Check if psr2 is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Driver requirement: i915
* Functionality: kms_core, plane, psr2
*
+ * SUBTEST: fbc-psr2-%s-%s
+ * Description: Check if fbc with psr2 is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Functionality: kms_core, plane, psr, psr2, fbc
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -146,21 +207,31 @@
*
* arg[2]:
*
- * @mmap_cpu: MMAP CPU
- * @mmap_gtt: MMAP GTT
+ * @mmap-cpu: MMAP CPU
+ * @mmap-gtt: MMAP GTT
*/
/**
- * SUBTEST: psr2_primary_page_flip
+ * SUBTEST: psr2-primary-page-flip
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on primary planes
* Functionality: plane, psr2
*
- * SUBTEST: psr2_primary_%s
+ * SUBTEST: fbc-psr2-primary-page-flip
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on primary planes
+ * Functionality: plane, psr, psr2, fbc
+ *
+ * SUBTEST: psr2-primary-%s
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on primary planes
* Functionality: kms_core, plane, psr2
*
+ * SUBTEST: fbc-psr2-primary-%s
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on primary planes
+ * Functionality: kms_core, plane, psr, psr2, fbc
+ *
* arg[1]:
*
* @blt: Blitter
@@ -168,11 +239,16 @@
*/
/**
- * SUBTEST: psr2_%s_%s
+ * SUBTEST: psr2-%s-%s
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Functionality: kms_core, plane, psr2
*
+ * SUBTEST: fbc-psr2-%s-%s
+ * Description: Check if psr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Functionality: kms_core, plane, psr, psr2, fbc
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -182,42 +258,65 @@
*
* @blt: Blitter
* @render: Render
- * @plane_onoff: Plane On off
- * @plane_move: Move plane position
+ * @plane-onoff: Plane On off
+ * @plane-move: Move plane position
*/
/**
- * SUBTEST: pr_dpms
+ * SUBTEST: pr-dpms
* Description: Check if pr is detecting changes when rendering operation
* is performed with dpms enabled or disabled
* Functionality: dpms, pr
* Mega feature: Panel Replay
*
- * SUBTEST: pr_no_drrs
+ * SUBTEST: fbc-pr-dpms
+ * Description: Check if fbc with pr is detecting changes when rendering operation
+ * is performed with dpms enabled or disabled
+ * Functionality: dpms, pr, fbc
+ *
+ * SUBTEST: pr-no-drrs
* Description: Check if pr is detecting changes when drrs is disabled
* Functionality: drrs, pr
- * Mega feature: Panel Replay
*
- * SUBTEST: pr_suspend
+ * SUBTEST: fbc-pr-no-drrs
+ * Description: Check if pr is detecting changes when drrs is disabled
+ * Functionality: drrs, pr, fbc
+ *
+ * SUBTEST: pr-suspend
* Description: Check if pr is detecting changes when plane operation is
* performed with suspend resume cycles
* Functionality: pr, suspend
- * Mega feature: Panel Replay
*
- * SUBTEST: pr_basic
+ * SUBTEST: fbc-pr-suspend
+ * Description: Check if fbc with pr is detecting changes when plane operation is
+ * performed with suspend resume cycles
+ * Functionality: pr, suspend, fbc
+ *
+ * SUBTEST: pr-basic
* Description: Basic check for pr if it is detecting changes made in planes
* Functionality: pr
- * Mega feature: Panel Replay
+ *
+ * SUBTEST: fbc-pr-basic
+ * Description: Basic check for fbc with pr if it is detecting changes made in planes
+ * Functionality: pr, fbc
*/
/**
- * SUBTEST: pr_%s_%s
+ * SUBTEST: pr-%s-%s
* Description: Check if pr is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Driver requirement: i915
* Functionality: kms_core, plane, pr
* Mega feature: Panel Replay
*
+ * SUBTEST: fbc-pr-%s-%s
+ * Description: Check if fbc with pr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Driver requirement: i915
+ * Functionality: kms_core, plane, pr, fbc
+ * Mega feature: Panel Replay, FBC
+ * Test category: functionality test
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -226,23 +325,35 @@
*
* arg[2]:
*
- * @mmap_cpu: MMAP CPU
- * @mmap_gtt: MMAP GTT
+ * @mmap-cpu: MMAP CPU
+ * @mmap-gtt: MMAP GTT
*/
/**
- * SUBTEST: pr_primary_page_flip
+ * SUBTEST: pr-primary-page-flip
* Description: Check if pr is detecting memory mapping, rendering and plane
* operations performed on primary planes
* Functionality: plane, pr
* Mega feature: Panel Replay
*
- * SUBTEST: pr_primary_%s
+ * SUBTEST: fbc-pr-primary-page-flip
+ * Description: Check if fbc with pr is detecting memory mapping, rendering and plane
+ * operations performed on primary planes
+ * Functionality: plane, pr, fbc
+ * Mega feature: Panel Replay, FBC
+ *
+ * SUBTEST: pr-primary-%s
* Description: Check if pr is detecting memory mapping, rendering and plane
* operations performed on primary planes
* Functionality: kms_core, plane, pr
* Mega feature: Panel Replay
*
+ * SUBTEST: fbc-pr-primary-%s
+ * Description: Check if fbc with pr is detecting memory mapping, rendering and plane
+ * operations performed on primary planes
+ * Functionality: kms_core, plane, pr, fbc
+ * Mega feature: Panel Replay, FBC
+ *
* arg[1]:
*
* @blt: Blitter
@@ -250,12 +361,18 @@
*/
/**
- * SUBTEST: pr_%s_%s
+ * SUBTEST: pr-%s-%s
* Description: Check if pr is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Functionality: kms_core, plane, pr
* Mega feature: Panel Replay
*
+ * SUBTEST: fbc-pr-%s-%s
+ * Description: Check if fbc with pr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Functionality: kms_core, plane, pr, fbc
+ * Mega feature: Panel Replay, FBC
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -265,25 +382,40 @@
*
* @blt: Blitter
* @render: Render
- * @plane_onoff: Plane On off
- * @plane_move: Move plane position
+ * @plane-onoff: Plane On off
+ * @plane-move: Move plane position
*/
/**
- * SUBTEST: psr_cursor_plane_move
+ * SUBTEST: psr-cursor-plane-move
* Description: Check if psr is detecting the plane operations performed on
* cursor planes
* Functionality: psr1
*
- * SUBTEST: psr_primary_page_flip
+ * SUBTEST: fbc-psr-cursor-plane-move
+ * Description: Check if fbc with psr is detecting the plane operations performed on
+ * cursor planes
+ * Functionality: psr1, fbc
+ *
+ * SUBTEST: psr-primary-page-flip
* Description: Check if psr is detecting page-flipping operations performed
* on primary planes
* Functionality: psr1
*
- * SUBTEST: psr_sprite_plane_onoff
+ * SUBTEST: fbc-psr-primary-page-flip
+ * Description: Check if psr is detecting page-flipping operations performed
+ * on primary planes
+ * Functionality: psr1, fbc
+ *
+ * SUBTEST: psr-sprite-plane-onoff
* Description: Check if psr is detecting the plane operations performed on
* sprite planes
* Functionality: psr1
+ *
+ * SUBTEST: fbc-psr-sprite-plane-onoff
+ * Description: Check if psr is detecting the plane operations performed on
+ * sprite planes
+ * Functionality: psr1, fbc
*/
enum operations {
@@ -299,13 +431,13 @@ enum operations {
static const char *op_str(enum operations op)
{
static const char * const name[] = {
- [PAGE_FLIP] = "page_flip",
- [MMAP_GTT] = "mmap_gtt",
- [MMAP_CPU] = "mmap_cpu",
+ [PAGE_FLIP] = "page-flip",
+ [MMAP_GTT] = "mmap-gtt",
+ [MMAP_CPU] = "mmap-cpu",
[BLT] = "blt",
[RENDER] = "render",
- [PLANE_MOVE] = "plane_move",
- [PLANE_ONOFF] = "plane_onoff",
+ [PLANE_MOVE] = "plane-move",
+ [PLANE_ONOFF] = "plane-onoff",
};
return name[op];
@@ -317,6 +449,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;
@@ -327,6 +460,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)
@@ -707,6 +841,11 @@ static void test_setup(data_t *data)
igt_require_f(data->output,
"No available output found\n");
+ if (data->fbc_flag)
+ igt_assert_f(intel_fbc_wait_until_enabled(data->drm_fd,
+ pipe),
+ "FBC still disabled");
+
pipe = get_pipe_for_output(&data->display, data->output);
igt_output_set_pipe(data->output, pipe);
igt_require_f(intel_pipe_output_combo_valid(&data->display),
@@ -744,14 +883,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_"
+ "psr-",
+ "psr2-",
+ "pr-"
+ };
+ const char *append_fbc_subtest[2] = {
+ "",
+ "fbc-"
};
int modes[] = {PSR_MODE_1, PSR_MODE_2, PR_MODE};
+ int fbc_status[] = {FBC_DISABLED, FBC_ENABLED};
igt_output_t *output;
igt_fixture {
@@ -762,52 +907,40 @@ 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");
- }
-
- 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);
- }
- }
+ 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;
}
+ }
- 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);
+ 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 (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("%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))
@@ -815,24 +948,90 @@ 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))
@@ -840,22 +1039,21 @@ 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 = igt_get_render_copyfunc(data.devid) ?
+ RENDER : BLT;
+ 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))
@@ -863,56 +1061,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 = igt_get_render_copyfunc(data.devid) ? RENDER : BLT;
- 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] 10+ messages in thread
* [igt-dev] [PATCH i-g-t 2/2] tests/intel/kms_psr2_sf: Add FBC support to PSR2 tests
2023-11-29 5:35 [igt-dev] [PATCH i-g-t 0/2] Add FBC support to PSR/PSR2 tests Jeevan B
2023-11-29 5:36 ` [igt-dev] [PATCH i-g-t 1/2] tests/intel/kms_psr: Add FBC support to PSR/PSR2/PR tests Jeevan B
@ 2023-11-29 5:36 ` Jeevan B
2023-11-29 6:39 ` [igt-dev] ✓ CI.xeBAT: success for Add FBC support to PSR/PSR2 tests (rev8) Patchwork
2 siblings, 0 replies; 10+ messages in thread
From: Jeevan B @ 2023-11-29 5:36 UTC (permalink / raw)
To: igt-dev
For LunarLake (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 | 609 +++++++++++++++++++++-----------------
1 file changed, 338 insertions(+), 271 deletions(-)
diff --git a/tests/intel/kms_psr2_sf.c b/tests/intel/kms_psr2_sf.c
index 27faa93d9..c4393a6ba 100644
--- a/tests/intel/kms_psr2_sf.c
+++ b/tests/intel/kms_psr2_sf.c
@@ -37,6 +37,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>
@@ -47,6 +48,10 @@
* Description: Test that selective fetch works on moving %arg[1] plane %arg[2]
* visible area (no update)
*
+ * 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)
+ *
* arg[1]:
*
* @cursor: Cursor
@@ -63,24 +68,46 @@
* SUBTEST: cursor-plane-update-sf
* Description: Test that selective fetch works on cursor plane
*
+ * SUBTEST: fbc-cursor-plane-update-continuous-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
+ * Description: Test that fbc with selective fetch works on overlay plane
+ *
* SUBTEST: overlay-plane-update-sf-dmg-area
* Description: Test that selective fetch works on overlay plane
*
+ * SUBTEST: fbc-overlay-plane-update-continuous-sf-dmg-area
+ * Description: Test that fbc with selective fetch works on overlay plane
+ *
* SUBTEST: overlay-primary-update-sf-dmg-area
* Description: Test that selective fetch works on primary plane with blended
* overlay plane
*
+ * SUBTEST: fbc-overlay-primary-update-sf-dmg-area
+ * Description: Test that fbc with selective fetch works on primary plane with blended
+ * overlay plane
+ *
* SUBTEST: plane-move-sf-dmg-area
* Description: Test that selective fetch works on moving overlay plane
*
+ * SUBTEST: fbc-plane-move-sf-dmg-area
+ * Description: Test that fbc with selective fetch works on moving overlay plane
+ *
* 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
+ * 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"
@@ -132,9 +159,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;
@@ -840,6 +869,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) {
@@ -942,10 +976,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;
@@ -961,6 +1000,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),
@@ -995,54 +1039,119 @@ 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;
+
+ /* 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;
- 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);
+ }
+ }
+ }
+ }
+ }
+
+ /* 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;
- 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;
+ 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);
@@ -1050,28 +1159,25 @@ 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);
@@ -1079,130 +1185,137 @@ 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);
@@ -1210,103 +1323,88 @@ 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);
@@ -1317,37 +1415,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] 10+ messages in thread
* [igt-dev] ✓ CI.xeBAT: success for Add FBC support to PSR/PSR2 tests (rev8)
2023-11-29 5:35 [igt-dev] [PATCH i-g-t 0/2] Add FBC support to PSR/PSR2 tests Jeevan B
2023-11-29 5:36 ` [igt-dev] [PATCH i-g-t 1/2] tests/intel/kms_psr: Add FBC support to PSR/PSR2/PR tests Jeevan B
2023-11-29 5:36 ` [igt-dev] [PATCH i-g-t 2/2] tests/intel/kms_psr2_sf: Add FBC support to PSR2 tests Jeevan B
@ 2023-11-29 6:39 ` Patchwork
2 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2023-11-29 6:39 UTC (permalink / raw)
To: Jeevan B; +Cc: igt-dev
[-- Attachment #1: Type: text/plain, Size: 5019 bytes --]
== Series Details ==
Series: Add FBC support to PSR/PSR2 tests (rev8)
URL : https://patchwork.freedesktop.org/series/126689/
State : success
== Summary ==
CI Bug Log - changes from XEIGT_7609_BAT -> XEIGTPW_10286_BAT
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Participating hosts (4 -> 4)
------------------------------
No changes in participating hosts
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in XEIGTPW_10286_BAT:
### IGT changes ###
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* {igt@kms_psr@psr_cursor_plane_move}:
- bat-adlp-7: [PASS][1] -> [SKIP][2] +2 other tests skip
[1]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7609/bat-adlp-7/igt@kms_psr@psr_cursor_plane_move.html
[2]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10286/bat-adlp-7/igt@kms_psr@psr_cursor_plane_move.html
Known issues
------------
Here are the changes found in XEIGTPW_10286_BAT that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_addfb_basic@addfb25-y-tiled-small-legacy:
- bat-dg2-oem2: NOTRUN -> [SKIP][3] ([Intel XE#623])
[3]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10286/bat-dg2-oem2/igt@kms_addfb_basic@addfb25-y-tiled-small-legacy.html
* igt@kms_addfb_basic@basic-y-tiled-legacy:
- bat-dg2-oem2: NOTRUN -> [SKIP][4] ([Intel XE#388]) +2 other tests skip
[4]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10286/bat-dg2-oem2/igt@kms_addfb_basic@basic-y-tiled-legacy.html
* igt@kms_dsc@dsc-basic:
- bat-dg2-oem2: NOTRUN -> [SKIP][5] ([Intel XE#423])
[5]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10286/bat-dg2-oem2/igt@kms_dsc@dsc-basic.html
* igt@kms_force_connector_basic@prune-stale-modes:
- bat-dg2-oem2: NOTRUN -> [SKIP][6] ([i915#5274])
[6]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10286/bat-dg2-oem2/igt@kms_force_connector_basic@prune-stale-modes.html
* igt@kms_frontbuffer_tracking@basic:
- bat-dg2-oem2: NOTRUN -> [FAIL][7] ([Intel XE#608])
[7]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10286/bat-dg2-oem2/igt@kms_frontbuffer_tracking@basic.html
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-nv12:
- bat-dg2-oem2: NOTRUN -> [FAIL][8] ([Intel XE#400] / [Intel XE#616]) +2 other tests fail
[8]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10286/bat-dg2-oem2/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-nv12.html
* igt@xe_exec_fault_mode@many-basic:
- bat-dg2-oem2: NOTRUN -> [SKIP][9] ([Intel XE#288]) +17 other tests skip
[9]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10286/bat-dg2-oem2/igt@xe_exec_fault_mode@many-basic.html
* igt@xe_huc_copy@huc_copy:
- bat-dg2-oem2: NOTRUN -> [SKIP][10] ([Intel XE#255])
[10]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10286/bat-dg2-oem2/igt@xe_huc_copy@huc_copy.html
#### Possible fixes ####
* igt@xe_exec_compute_mode@twice-userptr:
- bat-dg2-oem2: [INCOMPLETE][11] ([Intel XE#948]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/intel-xe/IGT_7609/bat-dg2-oem2/igt@xe_exec_compute_mode@twice-userptr.html
[12]: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10286/bat-dg2-oem2/igt@xe_exec_compute_mode@twice-userptr.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[Intel XE#255]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/255
[Intel XE#288]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/288
[Intel XE#388]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/388
[Intel XE#400]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/400
[Intel XE#423]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/423
[Intel XE#608]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/608
[Intel XE#616]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/616
[Intel XE#623]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/623
[Intel XE#929]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/929
[Intel XE#948]: https://gitlab.freedesktop.org/drm/xe/kernel/issues/948
[i915#5274]: https://gitlab.freedesktop.org/drm/intel/issues/5274
Build changes
-------------
* IGT: IGT_7609 -> IGTPW_10286
* Linux: xe-527-b06c9f366cd09b888be061d23eecffed7139c09b -> xe-529-1b020536e1c9147006cfe4e771396e89afdb14f3
IGTPW_10286: 10286
IGT_7609: 72a759595100b8d167ca78cd2d62e9acd97e36bf @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
xe-527-b06c9f366cd09b888be061d23eecffed7139c09b: b06c9f366cd09b888be061d23eecffed7139c09b
xe-529-1b020536e1c9147006cfe4e771396e89afdb14f3: 1b020536e1c9147006cfe4e771396e89afdb14f3
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/intel-xe/IGTPW_10286/index.html
[-- Attachment #2: Type: text/html, Size: 5760 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* [igt-dev] [PATCH i-g-t 1/2] tests/intel/kms_psr: Add FBC support to PSR/PSR2/PR tests
2023-11-29 14:46 [igt-dev] [PATCH i-g-t 0/2] Add FBC support to PSR/PSR2 tests Jeevan B
@ 2023-11-29 14:46 ` Jeevan B
0 siblings, 0 replies; 10+ messages in thread
From: Jeevan B @ 2023-11-29 14:46 UTC (permalink / raw)
To: igt-dev
For LunarLake (intel_display_ver 20), FBC can be enabled along with
PSR/PSR2/PR, 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 | 464 ++++++++++++++++++++++++++++--------------
2 files changed, 316 insertions(+), 153 deletions(-)
diff --git a/lib/igt_psr.h b/lib/igt_psr.h
index a30330e6c..36711c0d4 100644
--- a/lib/igt_psr.h
+++ b/lib/igt_psr.h
@@ -40,6 +40,11 @@ enum psr_mode {
PSR_DISABLED,
};
+enum fbc_mode {
+ FBC_DISABLED,
+ FBC_ENABLED,
+};
+
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 7fe6a2c30..9d54c5b4d 100644
--- a/tests/intel/kms_psr.c
+++ b/tests/intel/kms_psr.c
@@ -34,6 +34,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>
@@ -42,16 +43,24 @@
#include "xe/xe_query.h"
/**
- * SUBTEST: psr_basic
+ * SUBTEST: psr-basic
* Description: Basic check for psr if it is detecting changes made in planes
* Functionality: psr1
*
- * SUBTEST: psr_%s_%s
+ * SUBTEST: fbc-psr-basic
+ * Description: Basic check for psr if it is detecting changes made in planes
+ * Functionality: psr, fbc
+ *
+ * SUBTEST: psr-%s-%s
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on %arg[1]
- * Driver requirement: i915
* Functionality: kms_core, plane, psr1
*
+ * SUBTEST: fbc-psr-%s-%s
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1]
+ * Functionality: kms_core, plane, psr, fbc
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -60,21 +69,31 @@
*
* arg[2]:
*
- * @mmap_cpu: MMAP CPU
- * @mmap_gtt: MMAP GTT
+ * @mmap-cpu: MMAP CPU
+ * @mmap-gtt: MMAP GTT
*/
/**
- * SUBTEST: psr_sprite_plane_move
+ * SUBTEST: psr-sprite-plane-move
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on sprite planes
* Functionality: plane, psr1
*
- * SUBTEST: psr_%s_%s
+ * SUBTEST: fbc-psr-sprite-plane-move
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on sprite planes
+ * Functionality: plane, psr, fbc
+ *
+ * SUBTEST: psr-%s-%s
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Functionality: kms_core, plane, psr1
*
+ * SUBTEST: fbc-psr-%s-%s
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Functionality: kms_core, plane, psr, fbc
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -84,15 +103,20 @@
*
* @blt: Blitter
* @render: Render
- * @plane_onoff: Plane On off
+ * @plane-onoff: Plane On off
*/
/**
- * SUBTEST: psr_primary_%s
+ * SUBTEST: psr-primary-%s
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Functionality: kms_core, psr1
*
+ * SUBTEST: fbc-psr-primary-%s
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Functionality: kms_core, psr, fbc
+ *
* arg[1]:
*
* @blt: Blitter
@@ -100,44 +124,81 @@
*/
/**
- * SUBTEST: psr_dpms
+ * SUBTEST: psr-dpms
* Description: Check if psr is detecting changes when rendering operation is
* performed with dpms enabled or disabled
* Functionality: dpms, psr1
*
- * SUBTEST: psr_no_drrs
+ * SUBTEST: fbc-psr-dpms
+ * Description: Check if fbc with psr is detecting changes when rendering operation is
+ * performed with dpms enabled or disabled
+ * Functionality: dpms, psr, fbc
+ *
+ * SUBTEST: psr-no-drrs
* Description: Check if psr is detecting changes when drrs is disabled
* Functionality: drrs, psr1
*
- * SUBTEST: psr_suspend
+ * SUBTEST: fbc-psr-no-drrs
+ * Description: Check if fbc with psr is detecting changes when drrs is disabled
+ * Functionality: drrs, psr, fbc
+ *
+ * SUBTEST: psr-suspend
* Description: Check if psr is detecting changes when plane operation
* is performed with suspend resume cycles
* Functionality: psr1, suspend
*
- * SUBTEST: psr2_dpms
+ * SUBTEST: fbc-psr-suspend
+ * Description: Check if fbc with psr is detecting changes when plane operation
+ * is performed with suspend resume cycles
+ * Functionality: psr, suspend, fbc
+ *
+ * SUBTEST: psr2-dpms
* Description: Check if psr is detecting changes when rendering operation
* is performed with dpms enabled or disabled
* Functionality: dpms, psr2
*
- * SUBTEST: psr2_no_drrs
+ * SUBTEST: fbc-psr2-dpms
+ * Description: Check if fbc with psr is detecting changes when rendering operation
+ * is performed with dpms enabled or disabled
+ * Functionality: dpms, psr, psr2, fbc
+ *
+ * SUBTEST: psr2-no-drrs
* Description: Check if psr is detecting changes when drrs is disabled
* Functionality: drrs, psr2
*
- * SUBTEST: psr2_suspend
+ * SUBTEST: fbc-psr2-no-drrs
+ * Description: Check if fbc with psr is detecting changes when drrs is disabled
+ * Functionality: drrs, psr, psr2, fbc
+ *
+ * SUBTEST: psr2-suspend
* Description: Check if psr is detecting changes when plane operation is
* performed with suspend resume cycles
* Functionality: psr2, suspend
*
- * SUBTEST: psr2_basic
+ * SUBTEST: fbc-psr2-suspend
+ * Description: Check if fbc with psr is detecting changes when plane operation is
+ * performed with suspend resume cycles
+ * Functionality: psr, psr2, suspend, fbc
+ *
+ * SUBTEST: psr2-basic
* Description: Basic check for psr if it is detecting changes made in planes
* Functionality: psr2
*
- * SUBTEST: psr2_%s_%s
+ * SUBTEST: fbc-psr2-basic
+ * Description: Basic check for fbc with psr if it is detecting changes made in planes
+ * Functionality: psr, psr2, fbc
+ *
+ * SUBTEST: psr2-%s-%s
* Description: Check if psr2 is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Driver requirement: i915
* Functionality: kms_core, plane, psr2
*
+ * SUBTEST: fbc-psr2-%s-%s
+ * Description: Check if fbc with psr2 is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Functionality: kms_core, plane, psr, psr2, fbc
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -146,21 +207,31 @@
*
* arg[2]:
*
- * @mmap_cpu: MMAP CPU
- * @mmap_gtt: MMAP GTT
+ * @mmap-cpu: MMAP CPU
+ * @mmap-gtt: MMAP GTT
*/
/**
- * SUBTEST: psr2_primary_page_flip
+ * SUBTEST: psr2-primary-page-flip
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on primary planes
* Functionality: plane, psr2
*
- * SUBTEST: psr2_primary_%s
+ * SUBTEST: fbc-psr2-primary-page-flip
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on primary planes
+ * Functionality: plane, psr, psr2, fbc
+ *
+ * SUBTEST: psr2-primary-%s
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on primary planes
* Functionality: kms_core, plane, psr2
*
+ * SUBTEST: fbc-psr2-primary-%s
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on primary planes
+ * Functionality: kms_core, plane, psr, psr2, fbc
+ *
* arg[1]:
*
* @blt: Blitter
@@ -168,11 +239,16 @@
*/
/**
- * SUBTEST: psr2_%s_%s
+ * SUBTEST: psr2-%s-%s
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Functionality: kms_core, plane, psr2
*
+ * SUBTEST: fbc-psr2-%s-%s
+ * Description: Check if psr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Functionality: kms_core, plane, psr, psr2, fbc
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -182,42 +258,65 @@
*
* @blt: Blitter
* @render: Render
- * @plane_onoff: Plane On off
- * @plane_move: Move plane position
+ * @plane-onoff: Plane On off
+ * @plane-move: Move plane position
*/
/**
- * SUBTEST: pr_dpms
+ * SUBTEST: pr-dpms
* Description: Check if pr is detecting changes when rendering operation
* is performed with dpms enabled or disabled
* Functionality: dpms, pr
* Mega feature: Panel Replay
*
- * SUBTEST: pr_no_drrs
+ * SUBTEST: fbc-pr-dpms
+ * Description: Check if fbc with pr is detecting changes when rendering operation
+ * is performed with dpms enabled or disabled
+ * Functionality: dpms, pr, fbc
+ *
+ * SUBTEST: pr-no-drrs
* Description: Check if pr is detecting changes when drrs is disabled
* Functionality: drrs, pr
- * Mega feature: Panel Replay
*
- * SUBTEST: pr_suspend
+ * SUBTEST: fbc-pr-no-drrs
+ * Description: Check if pr is detecting changes when drrs is disabled
+ * Functionality: drrs, pr, fbc
+ *
+ * SUBTEST: pr-suspend
* Description: Check if pr is detecting changes when plane operation is
* performed with suspend resume cycles
* Functionality: pr, suspend
- * Mega feature: Panel Replay
*
- * SUBTEST: pr_basic
+ * SUBTEST: fbc-pr-suspend
+ * Description: Check if fbc with pr is detecting changes when plane operation is
+ * performed with suspend resume cycles
+ * Functionality: pr, suspend, fbc
+ *
+ * SUBTEST: pr-basic
* Description: Basic check for pr if it is detecting changes made in planes
* Functionality: pr
- * Mega feature: Panel Replay
+ *
+ * SUBTEST: fbc-pr-basic
+ * Description: Basic check for fbc with pr if it is detecting changes made in planes
+ * Functionality: pr, fbc
*/
/**
- * SUBTEST: pr_%s_%s
+ * SUBTEST: pr-%s-%s
* Description: Check if pr is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Driver requirement: i915
* Functionality: kms_core, plane, pr
* Mega feature: Panel Replay
*
+ * SUBTEST: fbc-pr-%s-%s
+ * Description: Check if fbc with pr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Driver requirement: i915
+ * Functionality: kms_core, plane, pr, fbc
+ * Mega feature: Panel Replay, FBC
+ * Test category: functionality test
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -226,23 +325,35 @@
*
* arg[2]:
*
- * @mmap_cpu: MMAP CPU
- * @mmap_gtt: MMAP GTT
+ * @mmap-cpu: MMAP CPU
+ * @mmap-gtt: MMAP GTT
*/
/**
- * SUBTEST: pr_primary_page_flip
+ * SUBTEST: pr-primary-page-flip
* Description: Check if pr is detecting memory mapping, rendering and plane
* operations performed on primary planes
* Functionality: plane, pr
* Mega feature: Panel Replay
*
- * SUBTEST: pr_primary_%s
+ * SUBTEST: fbc-pr-primary-page-flip
+ * Description: Check if fbc with pr is detecting memory mapping, rendering and plane
+ * operations performed on primary planes
+ * Functionality: plane, pr, fbc
+ * Mega feature: Panel Replay, FBC
+ *
+ * SUBTEST: pr-primary-%s
* Description: Check if pr is detecting memory mapping, rendering and plane
* operations performed on primary planes
* Functionality: kms_core, plane, pr
* Mega feature: Panel Replay
*
+ * SUBTEST: fbc-pr-primary-%s
+ * Description: Check if fbc with pr is detecting memory mapping, rendering and plane
+ * operations performed on primary planes
+ * Functionality: kms_core, plane, pr, fbc
+ * Mega feature: Panel Replay, FBC
+ *
* arg[1]:
*
* @blt: Blitter
@@ -250,12 +361,18 @@
*/
/**
- * SUBTEST: pr_%s_%s
+ * SUBTEST: pr-%s-%s
* Description: Check if pr is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Functionality: kms_core, plane, pr
* Mega feature: Panel Replay
*
+ * SUBTEST: fbc-pr-%s-%s
+ * Description: Check if fbc with pr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Functionality: kms_core, plane, pr, fbc
+ * Mega feature: Panel Replay, FBC
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -265,25 +382,40 @@
*
* @blt: Blitter
* @render: Render
- * @plane_onoff: Plane On off
- * @plane_move: Move plane position
+ * @plane-onoff: Plane On off
+ * @plane-move: Move plane position
*/
/**
- * SUBTEST: psr_cursor_plane_move
+ * SUBTEST: psr-cursor-plane-move
* Description: Check if psr is detecting the plane operations performed on
* cursor planes
* Functionality: psr1
*
- * SUBTEST: psr_primary_page_flip
+ * SUBTEST: fbc-psr-cursor-plane-move
+ * Description: Check if fbc with psr is detecting the plane operations performed on
+ * cursor planes
+ * Functionality: psr1, fbc
+ *
+ * SUBTEST: psr-primary-page-flip
* Description: Check if psr is detecting page-flipping operations performed
* on primary planes
* Functionality: psr1
*
- * SUBTEST: psr_sprite_plane_onoff
+ * SUBTEST: fbc-psr-primary-page-flip
+ * Description: Check if psr is detecting page-flipping operations performed
+ * on primary planes
+ * Functionality: psr1, fbc
+ *
+ * SUBTEST: psr-sprite-plane-onoff
* Description: Check if psr is detecting the plane operations performed on
* sprite planes
* Functionality: psr1
+ *
+ * SUBTEST: fbc-psr-sprite-plane-onoff
+ * Description: Check if psr is detecting the plane operations performed on
+ * sprite planes
+ * Functionality: psr1, fbc
*/
enum operations {
@@ -299,13 +431,13 @@ enum operations {
static const char *op_str(enum operations op)
{
static const char * const name[] = {
- [PAGE_FLIP] = "page_flip",
- [MMAP_GTT] = "mmap_gtt",
- [MMAP_CPU] = "mmap_cpu",
+ [PAGE_FLIP] = "page-flip",
+ [MMAP_GTT] = "mmap-gtt",
+ [MMAP_CPU] = "mmap-cpu",
[BLT] = "blt",
[RENDER] = "render",
- [PLANE_MOVE] = "plane_move",
- [PLANE_ONOFF] = "plane_onoff",
+ [PLANE_MOVE] = "plane-move",
+ [PLANE_ONOFF] = "plane-onoff",
};
return name[op];
@@ -317,6 +449,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;
@@ -327,6 +460,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)
@@ -707,6 +841,11 @@ static void test_setup(data_t *data)
igt_require_f(data->output,
"No available output found\n");
+ if (data->fbc_flag == true && data->op_fbc_mode == FBC_ENABLED)
+ igt_assert_f(intel_fbc_wait_until_enabled(data->drm_fd,
+ pipe),
+ "FBC still disabled");
+
pipe = get_pipe_for_output(&data->display, data->output);
igt_output_set_pipe(data->output, pipe);
igt_require_f(intel_pipe_output_combo_valid(&data->display),
@@ -744,14 +883,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_"
+ "psr-",
+ "psr2-",
+ "pr-"
+ };
+ const char *append_fbc_subtest[2] = {
+ "",
+ "fbc-"
};
int modes[] = {PSR_MODE_1, PSR_MODE_2, PR_MODE};
+ int fbc_status[] = {FBC_DISABLED, FBC_ENABLED};
igt_output_t *output;
igt_fixture {
@@ -762,52 +907,38 @@ 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];
+ 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))
@@ -815,24 +946,90 @@ 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))
@@ -840,22 +1037,21 @@ 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 = igt_get_render_copyfunc(data.devid) ?
+ RENDER : BLT;
+ 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))
@@ -863,56 +1059,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 = igt_get_render_copyfunc(data.devid) ? RENDER : BLT;
- 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] 10+ messages in thread
* [igt-dev] [PATCH i-g-t 1/2] tests/intel/kms_psr: Add FBC support to PSR/PSR2/PR tests
2023-11-30 7:23 [igt-dev] [PATCH i-g-t 0/2] Add FBC support to PSR/PSR2 tests Jeevan B
@ 2023-11-30 7:23 ` Jeevan B
0 siblings, 0 replies; 10+ messages in thread
From: Jeevan B @ 2023-11-30 7:23 UTC (permalink / raw)
To: igt-dev
For LunarLake (intel_display_ver 20), FBC can be enabled along with
PSR/PSR2/PR, 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 | 459 ++++++++++++++++++++++++++++--------------
2 files changed, 315 insertions(+), 149 deletions(-)
diff --git a/lib/igt_psr.h b/lib/igt_psr.h
index a30330e6c..36711c0d4 100644
--- a/lib/igt_psr.h
+++ b/lib/igt_psr.h
@@ -40,6 +40,11 @@ enum psr_mode {
PSR_DISABLED,
};
+enum fbc_mode {
+ FBC_DISABLED,
+ FBC_ENABLED,
+};
+
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 05bdd7b98..961200a78 100644
--- a/tests/intel/kms_psr.c
+++ b/tests/intel/kms_psr.c
@@ -35,6 +35,7 @@
#include "igt_sysfs.h"
#include "igt_psr.h"
#include "intel_pat.h"
+#include "i915/intel_fbc.h"
#include <errno.h>
#include <stdbool.h>
#include <stdio.h>
@@ -43,16 +44,25 @@
#include "xe/xe_query.h"
/**
- * SUBTEST: psr_basic
+ * SUBTEST: psr-basic
* Description: Basic check for psr if it is detecting changes made in planes
* Functionality: psr1
*
- * SUBTEST: psr_%s_%s
+ * SUBTEST: fbc-psr-basic
+ * Description: Basic check for psr if it is detecting changes made in planes
+ * Functionality: psr, fbc
+ *
+ * SUBTEST: psr-%s-%s
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on %arg[1]
* Driver requirement: i915
* Functionality: kms_core, plane, psr1
*
+ * SUBTEST: fbc-psr-%s-%s
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1]
+ * Functionality: kms_core, plane, psr, fbc
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -61,21 +71,31 @@
*
* arg[2]:
*
- * @mmap_cpu: MMAP CPU
- * @mmap_gtt: MMAP GTT
+ * @mmap-cpu: MMAP CPU
+ * @mmap-gtt: MMAP GTT
*/
/**
- * SUBTEST: psr_sprite_plane_move
+ * SUBTEST: psr-sprite-plane-move
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on sprite planes
* Functionality: plane, psr1
*
- * SUBTEST: psr_%s_%s
+ * SUBTEST: fbc-psr-sprite-plane-move
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on sprite planes
+ * Functionality: plane, psr, fbc
+ *
+ * SUBTEST: psr-%s-%s
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Functionality: kms_core, plane, psr1
*
+ * SUBTEST: fbc-psr-%s-%s
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Functionality: kms_core, plane, psr, fbc
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -85,15 +105,20 @@
*
* @blt: Blitter
* @render: Render
- * @plane_onoff: Plane On off
+ * @plane-onoff: Plane On off
*/
/**
- * SUBTEST: psr_primary_%s
+ * SUBTEST: psr-primary-%s
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Functionality: kms_core, psr1
*
+ * SUBTEST: fbc-psr-primary-%s
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Functionality: kms_core, psr, fbc
+ *
* arg[1]:
*
* @blt: Blitter
@@ -101,44 +126,81 @@
*/
/**
- * SUBTEST: psr_dpms
+ * SUBTEST: psr-dpms
* Description: Check if psr is detecting changes when rendering operation is
* performed with dpms enabled or disabled
* Functionality: dpms, psr1
*
- * SUBTEST: psr_no_drrs
+ * SUBTEST: fbc-psr-dpms
+ * Description: Check if fbc with psr is detecting changes when rendering operation is
+ * performed with dpms enabled or disabled
+ * Functionality: dpms, psr, fbc
+ *
+ * SUBTEST: psr-no-drrs
* Description: Check if psr is detecting changes when drrs is disabled
* Functionality: drrs, psr1
*
- * SUBTEST: psr_suspend
+ * SUBTEST: fbc-psr-no-drrs
+ * Description: Check if fbc with psr is detecting changes when drrs is disabled
+ * Functionality: drrs, psr, fbc
+ *
+ * SUBTEST: psr-suspend
* Description: Check if psr is detecting changes when plane operation
* is performed with suspend resume cycles
* Functionality: psr1, suspend
*
- * SUBTEST: psr2_dpms
+ * SUBTEST: fbc-psr-suspend
+ * Description: Check if fbc with psr is detecting changes when plane operation
+ * is performed with suspend resume cycles
+ * Functionality: psr, suspend, fbc
+ *
+ * SUBTEST: psr2-dpms
* Description: Check if psr is detecting changes when rendering operation
* is performed with dpms enabled or disabled
* Functionality: dpms, psr2
*
- * SUBTEST: psr2_no_drrs
+ * SUBTEST: fbc-psr2-dpms
+ * Description: Check if fbc with psr is detecting changes when rendering operation
+ * is performed with dpms enabled or disabled
+ * Functionality: dpms, psr, psr2, fbc
+ *
+ * SUBTEST: psr2-no-drrs
* Description: Check if psr is detecting changes when drrs is disabled
* Functionality: drrs, psr2
*
- * SUBTEST: psr2_suspend
+ * SUBTEST: fbc-psr2-no-drrs
+ * Description: Check if fbc with psr is detecting changes when drrs is disabled
+ * Functionality: drrs, psr, psr2, fbc
+ *
+ * SUBTEST: psr2-suspend
* Description: Check if psr is detecting changes when plane operation is
* performed with suspend resume cycles
* Functionality: psr2, suspend
*
- * SUBTEST: psr2_basic
+ * SUBTEST: fbc-psr2-suspend
+ * Description: Check if fbc with psr is detecting changes when plane operation is
+ * performed with suspend resume cycles
+ * Functionality: psr, psr2, suspend, fbc
+ *
+ * SUBTEST: psr2-basic
* Description: Basic check for psr if it is detecting changes made in planes
* Functionality: psr2
*
- * SUBTEST: psr2_%s_%s
+ * SUBTEST: fbc-psr2-basic
+ * Description: Basic check for fbc with psr if it is detecting changes made in planes
+ * Functionality: psr, psr2, fbc
+ *
+ * SUBTEST: psr2-%s-%s
* Description: Check if psr2 is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Driver requirement: i915
* Functionality: kms_core, plane, psr2
*
+ * SUBTEST: fbc-psr2-%s-%s
+ * Description: Check if fbc with psr2 is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Functionality: kms_core, plane, psr, psr2, fbc
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -147,21 +209,31 @@
*
* arg[2]:
*
- * @mmap_cpu: MMAP CPU
- * @mmap_gtt: MMAP GTT
+ * @mmap-cpu: MMAP CPU
+ * @mmap-gtt: MMAP GTT
*/
/**
- * SUBTEST: psr2_primary_page_flip
+ * SUBTEST: psr2-primary-page-flip
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on primary planes
* Functionality: plane, psr2
*
- * SUBTEST: psr2_primary_%s
+ * SUBTEST: fbc-psr2-primary-page-flip
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on primary planes
+ * Functionality: plane, psr, psr2, fbc
+ *
+ * SUBTEST: psr2-primary-%s
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on primary planes
* Functionality: kms_core, plane, psr2
*
+ * SUBTEST: fbc-psr2-primary-%s
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on primary planes
+ * Functionality: kms_core, plane, psr, psr2, fbc
+ *
* arg[1]:
*
* @blt: Blitter
@@ -169,11 +241,16 @@
*/
/**
- * SUBTEST: psr2_%s_%s
+ * SUBTEST: psr2-%s-%s
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Functionality: kms_core, plane, psr2
*
+ * SUBTEST: fbc-psr2-%s-%s
+ * Description: Check if psr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Functionality: kms_core, plane, psr, psr2, fbc
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -183,42 +260,67 @@
*
* @blt: Blitter
* @render: Render
- * @plane_onoff: Plane On off
- * @plane_move: Move plane position
+ * @plane-onoff: Plane On off
+ * @plane-move: Move plane position
*/
/**
- * SUBTEST: pr_dpms
+ * SUBTEST: pr-dpms
* Description: Check if pr is detecting changes when rendering operation
* is performed with dpms enabled or disabled
* Functionality: dpms, pr
* Mega feature: Panel Replay
*
- * SUBTEST: pr_no_drrs
+ * SUBTEST: fbc-pr-dpms
+ * Description: Check if fbc with pr is detecting changes when rendering operation
+ * is performed with dpms enabled or disabled
+ * Functionality: dpms, pr, fbc
+ *
+ * SUBTEST: pr-no-drrs
* Description: Check if pr is detecting changes when drrs is disabled
* Functionality: drrs, pr
* Mega feature: Panel Replay
*
- * SUBTEST: pr_suspend
+ * SUBTEST: fbc-pr-no-drrs
+ * Description: Check if pr is detecting changes when drrs is disabled
+ * Functionality: drrs, pr, fbc
+ *
+ * SUBTEST: pr-suspend
* Description: Check if pr is detecting changes when plane operation is
* performed with suspend resume cycles
* Functionality: pr, suspend
* Mega feature: Panel Replay
*
- * SUBTEST: pr_basic
+ * SUBTEST: fbc-pr-suspend
+ * Description: Check if fbc with pr is detecting changes when plane operation is
+ * performed with suspend resume cycles
+ * Functionality: pr, suspend, fbc
+ *
+ * SUBTEST: pr-basic
* Description: Basic check for pr if it is detecting changes made in planes
* Functionality: pr
* Mega feature: Panel Replay
+ *
+ * SUBTEST: fbc-pr-basic
+ * Description: Basic check for fbc with pr if it is detecting changes made in planes
+ * Functionality: pr, fbc
*/
/**
- * SUBTEST: pr_%s_%s
+ * SUBTEST: pr-%s-%s
* Description: Check if pr is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Driver requirement: i915
* Functionality: kms_core, plane, pr
* Mega feature: Panel Replay
*
+ * SUBTEST: fbc-pr-%s-%s
+ * Description: Check if fbc with pr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Driver requirement: i915
+ * Functionality: kms_core, plane, pr, fbc
+ * Mega feature: Panel Replay, FBC
+ * Test category: functionality test
* arg[1]:
*
* @cursor: Cursor plane
@@ -227,23 +329,35 @@
*
* arg[2]:
*
- * @mmap_cpu: MMAP CPU
- * @mmap_gtt: MMAP GTT
+ * @mmap-cpu: MMAP CPU
+ * @mmap-gtt: MMAP GTT
*/
/**
- * SUBTEST: pr_primary_page_flip
+ * SUBTEST: pr-primary-page-flip
* Description: Check if pr is detecting memory mapping, rendering and plane
* operations performed on primary planes
* Functionality: plane, pr
* Mega feature: Panel Replay
*
- * SUBTEST: pr_primary_%s
+ * SUBTEST: fbc-pr-primary-page-flip
+ * Description: Check if fbc with pr is detecting memory mapping, rendering and plane
+ * operations performed on primary planes
+ * Functionality: plane, pr, fbc
+ * Mega feature: Panel Replay, FBC
+ *
+ * SUBTEST: pr-primary-%s
* Description: Check if pr is detecting memory mapping, rendering and plane
* operations performed on primary planes
* Functionality: kms_core, plane, pr
* Mega feature: Panel Replay
*
+ * SUBTEST: fbc-pr-primary-%s
+ * Description: Check if fbc with pr is detecting memory mapping, rendering and plane
+ * operations performed on primary planes
+ * Functionality: kms_core, plane, pr, fbc
+ * Mega feature: Panel Replay, FBC
+ *
* arg[1]:
*
* @blt: Blitter
@@ -251,12 +365,18 @@
*/
/**
- * SUBTEST: pr_%s_%s
+ * SUBTEST: pr-%s-%s
* Description: Check if pr is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Functionality: kms_core, plane, pr
* Mega feature: Panel Replay
*
+ * SUBTEST: fbc-pr-%s-%s
+ * Description: Check if fbc with pr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Functionality: kms_core, plane, pr, fbc
+ * Mega feature: Panel Replay, FBC
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -266,25 +386,40 @@
*
* @blt: Blitter
* @render: Render
- * @plane_onoff: Plane On off
- * @plane_move: Move plane position
+ * @plane-onoff: Plane On off
+ * @plane-move: Move plane position
*/
/**
- * SUBTEST: psr_cursor_plane_move
+ * SUBTEST: psr-cursor-plane-move
* Description: Check if psr is detecting the plane operations performed on
* cursor planes
* Functionality: psr1
*
- * SUBTEST: psr_primary_page_flip
+ * SUBTEST: fbc-psr-cursor-plane-move
+ * Description: Check if fbc with psr is detecting the plane operations performed on
+ * cursor planes
+ * Functionality: psr1, fbc
+ *
+ * SUBTEST: psr-primary-page-flip
* Description: Check if psr is detecting page-flipping operations performed
* on primary planes
* Functionality: psr1
*
- * SUBTEST: psr_sprite_plane_onoff
+ * SUBTEST: fbc-psr-primary-page-flip
+ * Description: Check if psr is detecting page-flipping operations performed
+ * on primary planes
+ * Functionality: psr1, fbc
+ *
+ * SUBTEST: psr-sprite-plane-onoff
* Description: Check if psr is detecting the plane operations performed on
* sprite planes
* Functionality: psr1
+ *
+ * SUBTEST: fbc-psr-sprite-plane-onoff
+ * Description: Check if psr is detecting the plane operations performed on
+ * sprite planes
+ * Functionality: psr1, fbc
*/
enum operations {
@@ -300,13 +435,13 @@ enum operations {
static const char *op_str(enum operations op)
{
static const char * const name[] = {
- [PAGE_FLIP] = "page_flip",
- [MMAP_GTT] = "mmap_gtt",
- [MMAP_CPU] = "mmap_cpu",
+ [PAGE_FLIP] = "page-flip",
+ [MMAP_GTT] = "mmap-gtt",
+ [MMAP_CPU] = "mmap-cpu",
[BLT] = "blt",
[RENDER] = "render",
- [PLANE_MOVE] = "plane_move",
- [PLANE_ONOFF] = "plane_onoff",
+ [PLANE_MOVE] = "plane-move",
+ [PLANE_ONOFF] = "plane-onoff",
};
return name[op];
@@ -318,6 +453,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;
@@ -328,6 +464,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)
@@ -729,6 +866,11 @@ static void test_setup(data_t *data)
psr_entered = true;
break;
}
+
+ if (data->fbc_flag == true && data->op_fbc_mode == FBC_ENABLED)
+ igt_assert_f(intel_fbc_wait_until_enabled(data->drm_fd,
+ pipe),
+ "FBC still disabled");
}
igt_assert(psr_entered);
@@ -746,14 +888,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_"
+ "psr-",
+ "psr2-",
+ "pr-"
+ };
+ const char *append_fbc_subtest[2] = {
+ "",
+ "fbc-"
};
int modes[] = {PSR_MODE_1, PSR_MODE_2, PR_MODE};
+ int fbc_status[] = {FBC_DISABLED, FBC_ENABLED};
igt_output_t *output;
igt_fixture {
@@ -764,52 +912,38 @@ 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];
+ 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))
@@ -817,24 +951,91 @@ 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))
@@ -842,22 +1043,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 = igt_get_render_copyfunc(data.devid) ? RENDER : BLT;
+ 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))
@@ -865,56 +1064,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 = igt_get_render_copyfunc(data.devid) ? RENDER : BLT;
- 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] 10+ messages in thread
* [igt-dev] [PATCH i-g-t 1/2] tests/intel/kms_psr: Add FBC support to PSR/PSR2/PR tests
2023-11-30 9:45 [igt-dev] [PATCH i-g-t 0/2] Add FBC support to PSR/PSR2 tests Jeevan B
@ 2023-11-30 9:45 ` Jeevan B
2023-11-30 11:15 ` Govindapillai, Vinod
0 siblings, 1 reply; 10+ messages in thread
From: Jeevan B @ 2023-11-30 9:45 UTC (permalink / raw)
To: igt-dev
For LunarLake (intel_display_ver 20), FBC can be enabled along with
PSR/PSR2/PR, 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 | 459 ++++++++++++++++++++++++++++--------------
2 files changed, 315 insertions(+), 149 deletions(-)
diff --git a/lib/igt_psr.h b/lib/igt_psr.h
index a30330e6c..36711c0d4 100644
--- a/lib/igt_psr.h
+++ b/lib/igt_psr.h
@@ -40,6 +40,11 @@ enum psr_mode {
PSR_DISABLED,
};
+enum fbc_mode {
+ FBC_DISABLED,
+ FBC_ENABLED,
+};
+
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 05bdd7b98..4401d52b6 100644
--- a/tests/intel/kms_psr.c
+++ b/tests/intel/kms_psr.c
@@ -35,6 +35,7 @@
#include "igt_sysfs.h"
#include "igt_psr.h"
#include "intel_pat.h"
+#include "i915/intel_fbc.h"
#include <errno.h>
#include <stdbool.h>
#include <stdio.h>
@@ -43,16 +44,25 @@
#include "xe/xe_query.h"
/**
- * SUBTEST: psr_basic
+ * SUBTEST: psr-basic
* Description: Basic check for psr if it is detecting changes made in planes
* Functionality: psr1
*
- * SUBTEST: psr_%s_%s
+ * SUBTEST: fbc-psr-basic
+ * Description: Basic check for psr if it is detecting changes made in planes
+ * Functionality: psr, fbc
+ *
+ * SUBTEST: psr-%s-%s
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on %arg[1]
* Driver requirement: i915
* Functionality: kms_core, plane, psr1
*
+ * SUBTEST: fbc-psr-%s-%s
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1]
+ * Functionality: kms_core, plane, psr, fbc
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -61,21 +71,31 @@
*
* arg[2]:
*
- * @mmap_cpu: MMAP CPU
- * @mmap_gtt: MMAP GTT
+ * @mmap-cpu: MMAP CPU
+ * @mmap-gtt: MMAP GTT
*/
/**
- * SUBTEST: psr_sprite_plane_move
+ * SUBTEST: psr-sprite-plane-move
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on sprite planes
* Functionality: plane, psr1
*
- * SUBTEST: psr_%s_%s
+ * SUBTEST: fbc-psr-sprite-plane-move
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on sprite planes
+ * Functionality: plane, psr, fbc
+ *
+ * SUBTEST: psr-%s-%s
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Functionality: kms_core, plane, psr1
*
+ * SUBTEST: fbc-psr-%s-%s
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Functionality: kms_core, plane, psr, fbc
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -85,15 +105,20 @@
*
* @blt: Blitter
* @render: Render
- * @plane_onoff: Plane On off
+ * @plane-onoff: Plane On off
*/
/**
- * SUBTEST: psr_primary_%s
+ * SUBTEST: psr-primary-%s
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Functionality: kms_core, psr1
*
+ * SUBTEST: fbc-psr-primary-%s
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Functionality: kms_core, psr, fbc
+ *
* arg[1]:
*
* @blt: Blitter
@@ -101,44 +126,81 @@
*/
/**
- * SUBTEST: psr_dpms
+ * SUBTEST: psr-dpms
* Description: Check if psr is detecting changes when rendering operation is
* performed with dpms enabled or disabled
* Functionality: dpms, psr1
*
- * SUBTEST: psr_no_drrs
+ * SUBTEST: fbc-psr-dpms
+ * Description: Check if fbc with psr is detecting changes when rendering operation is
+ * performed with dpms enabled or disabled
+ * Functionality: dpms, psr, fbc
+ *
+ * SUBTEST: psr-no-drrs
* Description: Check if psr is detecting changes when drrs is disabled
* Functionality: drrs, psr1
*
- * SUBTEST: psr_suspend
+ * SUBTEST: fbc-psr-no-drrs
+ * Description: Check if fbc with psr is detecting changes when drrs is disabled
+ * Functionality: drrs, psr, fbc
+ *
+ * SUBTEST: psr-suspend
* Description: Check if psr is detecting changes when plane operation
* is performed with suspend resume cycles
* Functionality: psr1, suspend
*
- * SUBTEST: psr2_dpms
+ * SUBTEST: fbc-psr-suspend
+ * Description: Check if fbc with psr is detecting changes when plane operation
+ * is performed with suspend resume cycles
+ * Functionality: psr, suspend, fbc
+ *
+ * SUBTEST: psr2-dpms
* Description: Check if psr is detecting changes when rendering operation
* is performed with dpms enabled or disabled
* Functionality: dpms, psr2
*
- * SUBTEST: psr2_no_drrs
+ * SUBTEST: fbc-psr2-dpms
+ * Description: Check if fbc with psr is detecting changes when rendering operation
+ * is performed with dpms enabled or disabled
+ * Functionality: dpms, psr, psr2, fbc
+ *
+ * SUBTEST: psr2-no-drrs
* Description: Check if psr is detecting changes when drrs is disabled
* Functionality: drrs, psr2
*
- * SUBTEST: psr2_suspend
+ * SUBTEST: fbc-psr2-no-drrs
+ * Description: Check if fbc with psr is detecting changes when drrs is disabled
+ * Functionality: drrs, psr, psr2, fbc
+ *
+ * SUBTEST: psr2-suspend
* Description: Check if psr is detecting changes when plane operation is
* performed with suspend resume cycles
* Functionality: psr2, suspend
*
- * SUBTEST: psr2_basic
+ * SUBTEST: fbc-psr2-suspend
+ * Description: Check if fbc with psr is detecting changes when plane operation is
+ * performed with suspend resume cycles
+ * Functionality: psr, psr2, suspend, fbc
+ *
+ * SUBTEST: psr2-basic
* Description: Basic check for psr if it is detecting changes made in planes
* Functionality: psr2
*
- * SUBTEST: psr2_%s_%s
+ * SUBTEST: fbc-psr2-basic
+ * Description: Basic check for fbc with psr if it is detecting changes made in planes
+ * Functionality: psr, psr2, fbc
+ *
+ * SUBTEST: psr2-%s-%s
* Description: Check if psr2 is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Driver requirement: i915
* Functionality: kms_core, plane, psr2
*
+ * SUBTEST: fbc-psr2-%s-%s
+ * Description: Check if fbc with psr2 is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Functionality: kms_core, plane, psr, psr2, fbc
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -147,21 +209,31 @@
*
* arg[2]:
*
- * @mmap_cpu: MMAP CPU
- * @mmap_gtt: MMAP GTT
+ * @mmap-cpu: MMAP CPU
+ * @mmap-gtt: MMAP GTT
*/
/**
- * SUBTEST: psr2_primary_page_flip
+ * SUBTEST: psr2-primary-page-flip
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on primary planes
* Functionality: plane, psr2
*
- * SUBTEST: psr2_primary_%s
+ * SUBTEST: fbc-psr2-primary-page-flip
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on primary planes
+ * Functionality: plane, psr, psr2, fbc
+ *
+ * SUBTEST: psr2-primary-%s
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on primary planes
* Functionality: kms_core, plane, psr2
*
+ * SUBTEST: fbc-psr2-primary-%s
+ * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
+ * operations performed on primary planes
+ * Functionality: kms_core, plane, psr, psr2, fbc
+ *
* arg[1]:
*
* @blt: Blitter
@@ -169,11 +241,16 @@
*/
/**
- * SUBTEST: psr2_%s_%s
+ * SUBTEST: psr2-%s-%s
* Description: Check if psr is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Functionality: kms_core, plane, psr2
*
+ * SUBTEST: fbc-psr2-%s-%s
+ * Description: Check if psr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Functionality: kms_core, plane, psr, psr2, fbc
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -183,42 +260,67 @@
*
* @blt: Blitter
* @render: Render
- * @plane_onoff: Plane On off
- * @plane_move: Move plane position
+ * @plane-onoff: Plane On off
+ * @plane-move: Move plane position
*/
/**
- * SUBTEST: pr_dpms
+ * SUBTEST: pr-dpms
* Description: Check if pr is detecting changes when rendering operation
* is performed with dpms enabled or disabled
* Functionality: dpms, pr
* Mega feature: Panel Replay
*
- * SUBTEST: pr_no_drrs
+ * SUBTEST: fbc-pr-dpms
+ * Description: Check if fbc with pr is detecting changes when rendering operation
+ * is performed with dpms enabled or disabled
+ * Functionality: dpms, pr, fbc
+ *
+ * SUBTEST: pr-no-drrs
* Description: Check if pr is detecting changes when drrs is disabled
* Functionality: drrs, pr
* Mega feature: Panel Replay
*
- * SUBTEST: pr_suspend
+ * SUBTEST: fbc-pr-no-drrs
+ * Description: Check if pr is detecting changes when drrs is disabled
+ * Functionality: drrs, pr, fbc
+ *
+ * SUBTEST: pr-suspend
* Description: Check if pr is detecting changes when plane operation is
* performed with suspend resume cycles
* Functionality: pr, suspend
* Mega feature: Panel Replay
*
- * SUBTEST: pr_basic
+ * SUBTEST: fbc-pr-suspend
+ * Description: Check if fbc with pr is detecting changes when plane operation is
+ * performed with suspend resume cycles
+ * Functionality: pr, suspend, fbc
+ *
+ * SUBTEST: pr-basic
* Description: Basic check for pr if it is detecting changes made in planes
* Functionality: pr
* Mega feature: Panel Replay
+ *
+ * SUBTEST: fbc-pr-basic
+ * Description: Basic check for fbc with pr if it is detecting changes made in planes
+ * Functionality: pr, fbc
*/
/**
- * SUBTEST: pr_%s_%s
+ * SUBTEST: pr-%s-%s
* Description: Check if pr is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Driver requirement: i915
* Functionality: kms_core, plane, pr
* Mega feature: Panel Replay
*
+ * SUBTEST: fbc-pr-%s-%s
+ * Description: Check if fbc with pr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Driver requirement: i915
+ * Functionality: kms_core, plane, pr, fbc
+ * Mega feature: Panel Replay, FBC
+ * Test category: functionality test
* arg[1]:
*
* @cursor: Cursor plane
@@ -227,23 +329,35 @@
*
* arg[2]:
*
- * @mmap_cpu: MMAP CPU
- * @mmap_gtt: MMAP GTT
+ * @mmap-cpu: MMAP CPU
+ * @mmap-gtt: MMAP GTT
*/
/**
- * SUBTEST: pr_primary_page_flip
+ * SUBTEST: pr-primary-page-flip
* Description: Check if pr is detecting memory mapping, rendering and plane
* operations performed on primary planes
* Functionality: plane, pr
* Mega feature: Panel Replay
*
- * SUBTEST: pr_primary_%s
+ * SUBTEST: fbc-pr-primary-page-flip
+ * Description: Check if fbc with pr is detecting memory mapping, rendering and plane
+ * operations performed on primary planes
+ * Functionality: plane, pr, fbc
+ * Mega feature: Panel Replay, FBC
+ *
+ * SUBTEST: pr-primary-%s
* Description: Check if pr is detecting memory mapping, rendering and plane
* operations performed on primary planes
* Functionality: kms_core, plane, pr
* Mega feature: Panel Replay
*
+ * SUBTEST: fbc-pr-primary-%s
+ * Description: Check if fbc with pr is detecting memory mapping, rendering and plane
+ * operations performed on primary planes
+ * Functionality: kms_core, plane, pr, fbc
+ * Mega feature: Panel Replay, FBC
+ *
* arg[1]:
*
* @blt: Blitter
@@ -251,12 +365,18 @@
*/
/**
- * SUBTEST: pr_%s_%s
+ * SUBTEST: pr-%s-%s
* Description: Check if pr is detecting memory mapping, rendering and plane
* operations performed on %arg[1] planes
* Functionality: kms_core, plane, pr
* Mega feature: Panel Replay
*
+ * SUBTEST: fbc-pr-%s-%s
+ * Description: Check if fbc with pr is detecting memory mapping, rendering and plane
+ * operations performed on %arg[1] planes
+ * Functionality: kms_core, plane, pr, fbc
+ * Mega feature: Panel Replay, FBC
+ *
* arg[1]:
*
* @cursor: Cursor plane
@@ -266,25 +386,40 @@
*
* @blt: Blitter
* @render: Render
- * @plane_onoff: Plane On off
- * @plane_move: Move plane position
+ * @plane-onoff: Plane On off
+ * @plane-move: Move plane position
*/
/**
- * SUBTEST: psr_cursor_plane_move
+ * SUBTEST: psr-cursor-plane-move
* Description: Check if psr is detecting the plane operations performed on
* cursor planes
* Functionality: psr1
*
- * SUBTEST: psr_primary_page_flip
+ * SUBTEST: fbc-psr-cursor-plane-move
+ * Description: Check if fbc with psr is detecting the plane operations performed on
+ * cursor planes
+ * Functionality: psr1, fbc
+ *
+ * SUBTEST: psr-primary-page-flip
* Description: Check if psr is detecting page-flipping operations performed
* on primary planes
* Functionality: psr1
*
- * SUBTEST: psr_sprite_plane_onoff
+ * SUBTEST: fbc-psr-primary-page-flip
+ * Description: Check if psr is detecting page-flipping operations performed
+ * on primary planes
+ * Functionality: psr1, fbc
+ *
+ * SUBTEST: psr-sprite-plane-onoff
* Description: Check if psr is detecting the plane operations performed on
* sprite planes
* Functionality: psr1
+ *
+ * SUBTEST: fbc-psr-sprite-plane-onoff
+ * Description: Check if psr is detecting the plane operations performed on
+ * sprite planes
+ * Functionality: psr1, fbc
*/
enum operations {
@@ -300,13 +435,13 @@ enum operations {
static const char *op_str(enum operations op)
{
static const char * const name[] = {
- [PAGE_FLIP] = "page_flip",
- [MMAP_GTT] = "mmap_gtt",
- [MMAP_CPU] = "mmap_cpu",
+ [PAGE_FLIP] = "page-flip",
+ [MMAP_GTT] = "mmap-gtt",
+ [MMAP_CPU] = "mmap-cpu",
[BLT] = "blt",
[RENDER] = "render",
- [PLANE_MOVE] = "plane_move",
- [PLANE_ONOFF] = "plane_onoff",
+ [PLANE_MOVE] = "plane-move",
+ [PLANE_ONOFF] = "plane-onoff",
};
return name[op];
@@ -318,6 +453,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;
@@ -328,6 +464,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)
@@ -725,10 +862,15 @@ static void test_setup(data_t *data)
psr_enable_if_enabled(data);
setup_test_plane(data, data->test_plane_id);
+ if (data->fbc_flag == true && data->op_fbc_mode == FBC_ENABLED)
+ igt_assert_f(intel_fbc_wait_until_enabled(data->drm_fd,
+ pipe),
+ "FBC still disabled");
if (psr_wait_entry_if_enabled(data)) {
psr_entered = true;
break;
}
+
}
igt_assert(psr_entered);
@@ -746,14 +888,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_"
+ "psr-",
+ "psr2-",
+ "pr-"
+ };
+ const char *append_fbc_subtest[2] = {
+ "",
+ "fbc-"
};
int modes[] = {PSR_MODE_1, PSR_MODE_2, PR_MODE};
+ int fbc_status[] = {FBC_DISABLED, FBC_ENABLED};
igt_output_t *output;
igt_fixture {
@@ -764,52 +912,38 @@ 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];
+ 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))
@@ -817,24 +951,91 @@ 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))
@@ -842,22 +1043,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 = igt_get_render_copyfunc(data.devid) ? RENDER : BLT;
+ 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))
@@ -865,56 +1064,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 = igt_get_render_copyfunc(data.devid) ? RENDER : BLT;
- 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] 10+ messages in thread
* Re: [igt-dev] [PATCH i-g-t 1/2] tests/intel/kms_psr: Add FBC support to PSR/PSR2/PR tests
2023-11-30 9:45 ` [igt-dev] [PATCH i-g-t 1/2] tests/intel/kms_psr: Add FBC support to PSR/PSR2/PR tests Jeevan B
@ 2023-11-30 11:15 ` Govindapillai, Vinod
0 siblings, 0 replies; 10+ messages in thread
From: Govindapillai, Vinod @ 2023-11-30 11:15 UTC (permalink / raw)
To: igt-dev@lists.freedesktop.org, B, Jeevan
Hi jeevan,
Thanks for the patches.. some comments inline..
Otherwise, logic wise combining FBC with existing PSR tests seems ok to me.
So with addressing those comments,
Reviewed-by: Vinod Govindapillai <vinod.govindapillai@intel.com>
On Thu, 2023-11-30 at 15:15 +0530, Jeevan B wrote:
> For LunarLake (intel_display_ver 20), FBC can be enabled along with
> PSR/PSR2/PR, 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 | 459 ++++++++++++++++++++++++++++--------------
> 2 files changed, 315 insertions(+), 149 deletions(-)
>
> diff --git a/lib/igt_psr.h b/lib/igt_psr.h
> index a30330e6c..36711c0d4 100644
> --- a/lib/igt_psr.h
> +++ b/lib/igt_psr.h
> @@ -40,6 +40,11 @@ enum psr_mode {
> PSR_DISABLED,
> };
>
> +enum fbc_mode {
> + FBC_DISABLED,
> + FBC_ENABLED,
> +};
> +
> 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 05bdd7b98..4401d52b6 100644
> --- a/tests/intel/kms_psr.c
> +++ b/tests/intel/kms_psr.c
> @@ -35,6 +35,7 @@
> #include "igt_sysfs.h"
> #include "igt_psr.h"
> #include "intel_pat.h"
> +#include "i915/intel_fbc.h"
> #include <errno.h>
> #include <stdbool.h>
> #include <stdio.h>
> @@ -43,16 +44,25 @@
> #include "xe/xe_query.h"
>
> /**
> - * SUBTEST: psr_basic
> + * SUBTEST: psr-basic
> * Description: Basic check for psr if it is detecting changes made in planes
> * Functionality: psr1
> *
> - * SUBTEST: psr_%s_%s
> + * SUBTEST: fbc-psr-basic
> + * Description: Basic check for psr if it is detecting changes made in planes
> + * Functionality: psr, fbc
> + *
> + * SUBTEST: psr-%s-%s
> * Description: Check if psr is detecting memory mapping, rendering and plane
> * operations performed on %arg[1]
> * Driver requirement: i915
> * Functionality: kms_core, plane, psr1
> *
> + * SUBTEST: fbc-psr-%s-%s
> + * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
> + * operations performed on %arg[1]
> + * Functionality: kms_core, plane, psr, fbc
> + *
> * arg[1]:
> *
> * @cursor: Cursor plane
> @@ -61,21 +71,31 @@
> *
> * arg[2]:
> *
> - * @mmap_cpu: MMAP CPU
> - * @mmap_gtt: MMAP GTT
> + * @mmap-cpu: MMAP CPU
> + * @mmap-gtt: MMAP GTT
> */
>
> /**
> - * SUBTEST: psr_sprite_plane_move
> + * SUBTEST: psr-sprite-plane-move
> * Description: Check if psr is detecting memory mapping, rendering and plane
> * operations performed on sprite planes
> * Functionality: plane, psr1
> *
> - * SUBTEST: psr_%s_%s
> + * SUBTEST: fbc-psr-sprite-plane-move
> + * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
> + * operations performed on sprite planes
> + * Functionality: plane, psr, fbc
> + *
> + * SUBTEST: psr-%s-%s
> * Description: Check if psr is detecting memory mapping, rendering and plane
> * operations performed on %arg[1] planes
> * Functionality: kms_core, plane, psr1
> *
> + * SUBTEST: fbc-psr-%s-%s
> + * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
> + * operations performed on %arg[1] planes
> + * Functionality: kms_core, plane, psr, fbc
> + *
> * arg[1]:
> *
> * @cursor: Cursor plane
> @@ -85,15 +105,20 @@
> *
> * @blt: Blitter
> * @render: Render
> - * @plane_onoff: Plane On off
> + * @plane-onoff: Plane On off
> */
>
> /**
> - * SUBTEST: psr_primary_%s
> + * SUBTEST: psr-primary-%s
> * Description: Check if psr is detecting memory mapping, rendering and plane
> * operations performed on %arg[1] planes
> * Functionality: kms_core, psr1
> *
> + * SUBTEST: fbc-psr-primary-%s
> + * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
> + * operations performed on %arg[1] planes
> + * Functionality: kms_core, psr, fbc
> + *
> * arg[1]:
> *
> * @blt: Blitter
> @@ -101,44 +126,81 @@
> */
>
> /**
> - * SUBTEST: psr_dpms
> + * SUBTEST: psr-dpms
> * Description: Check if psr is detecting changes when rendering operation is
> * performed with dpms enabled or disabled
> * Functionality: dpms, psr1
> *
> - * SUBTEST: psr_no_drrs
> + * SUBTEST: fbc-psr-dpms
> + * Description: Check if fbc with psr is detecting changes when rendering operation is
> + * performed with dpms enabled or disabled
> + * Functionality: dpms, psr, fbc
> + *
> + * SUBTEST: psr-no-drrs
> * Description: Check if psr is detecting changes when drrs is disabled
> * Functionality: drrs, psr1
> *
> - * SUBTEST: psr_suspend
> + * SUBTEST: fbc-psr-no-drrs
> + * Description: Check if fbc with psr is detecting changes when drrs is disabled
> + * Functionality: drrs, psr, fbc
> + *
> + * SUBTEST: psr-suspend
> * Description: Check if psr is detecting changes when plane operation
> * is performed with suspend resume cycles
> * Functionality: psr1, suspend
> *
> - * SUBTEST: psr2_dpms
> + * SUBTEST: fbc-psr-suspend
> + * Description: Check if fbc with psr is detecting changes when plane operation
> + * is performed with suspend resume cycles
> + * Functionality: psr, suspend, fbc
> + *
> + * SUBTEST: psr2-dpms
> * Description: Check if psr is detecting changes when rendering operation
> * is performed with dpms enabled or disabled
> * Functionality: dpms, psr2
> *
> - * SUBTEST: psr2_no_drrs
> + * SUBTEST: fbc-psr2-dpms
> + * Description: Check if fbc with psr is detecting changes when rendering operation
> + * is performed with dpms enabled or disabled
> + * Functionality: dpms, psr, psr2, fbc
> + *
> + * SUBTEST: psr2-no-drrs
> * Description: Check if psr is detecting changes when drrs is disabled
> * Functionality: drrs, psr2
> *
> - * SUBTEST: psr2_suspend
> + * SUBTEST: fbc-psr2-no-drrs
> + * Description: Check if fbc with psr is detecting changes when drrs is disabled
> + * Functionality: drrs, psr, psr2, fbc
> + *
> + * SUBTEST: psr2-suspend
> * Description: Check if psr is detecting changes when plane operation is
> * performed with suspend resume cycles
> * Functionality: psr2, suspend
> *
> - * SUBTEST: psr2_basic
> + * SUBTEST: fbc-psr2-suspend
> + * Description: Check if fbc with psr is detecting changes when plane operation is
> + * performed with suspend resume cycles
> + * Functionality: psr, psr2, suspend, fbc
> + *
> + * SUBTEST: psr2-basic
> * Description: Basic check for psr if it is detecting changes made in planes
> * Functionality: psr2
> *
> - * SUBTEST: psr2_%s_%s
> + * SUBTEST: fbc-psr2-basic
> + * Description: Basic check for fbc with psr if it is detecting changes made in planes
> + * Functionality: psr, psr2, fbc
> + *
> + * SUBTEST: psr2-%s-%s
> * Description: Check if psr2 is detecting memory mapping, rendering and plane
> * operations performed on %arg[1] planes
> * Driver requirement: i915
> * Functionality: kms_core, plane, psr2
> *
> + * SUBTEST: fbc-psr2-%s-%s
> + * Description: Check if fbc with psr2 is detecting memory mapping, rendering and plane
> + * operations performed on %arg[1] planes
> + * Functionality: kms_core, plane, psr, psr2, fbc
> + *
> * arg[1]:
> *
> * @cursor: Cursor plane
> @@ -147,21 +209,31 @@
> *
> * arg[2]:
> *
> - * @mmap_cpu: MMAP CPU
> - * @mmap_gtt: MMAP GTT
> + * @mmap-cpu: MMAP CPU
> + * @mmap-gtt: MMAP GTT
> */
>
> /**
> - * SUBTEST: psr2_primary_page_flip
> + * SUBTEST: psr2-primary-page-flip
> * Description: Check if psr is detecting memory mapping, rendering and plane
> * operations performed on primary planes
> * Functionality: plane, psr2
> *
> - * SUBTEST: psr2_primary_%s
> + * SUBTEST: fbc-psr2-primary-page-flip
> + * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
> + * operations performed on primary planes
> + * Functionality: plane, psr, psr2, fbc
> + *
> + * SUBTEST: psr2-primary-%s
> * Description: Check if psr is detecting memory mapping, rendering and plane
> * operations performed on primary planes
> * Functionality: kms_core, plane, psr2
> *
> + * SUBTEST: fbc-psr2-primary-%s
> + * Description: Check if fbc with psr is detecting memory mapping, rendering and plane
> + * operations performed on primary planes
> + * Functionality: kms_core, plane, psr, psr2, fbc
> + *
> * arg[1]:
> *
> * @blt: Blitter
> @@ -169,11 +241,16 @@
> */
>
> /**
> - * SUBTEST: psr2_%s_%s
> + * SUBTEST: psr2-%s-%s
> * Description: Check if psr is detecting memory mapping, rendering and plane
> * operations performed on %arg[1] planes
> * Functionality: kms_core, plane, psr2
> *
> + * SUBTEST: fbc-psr2-%s-%s
> + * Description: Check if psr is detecting memory mapping, rendering and plane
> + * operations performed on %arg[1] planes
> + * Functionality: kms_core, plane, psr, psr2, fbc
> + *
> * arg[1]:
> *
> * @cursor: Cursor plane
> @@ -183,42 +260,67 @@
> *
> * @blt: Blitter
> * @render: Render
> - * @plane_onoff: Plane On off
> - * @plane_move: Move plane position
> + * @plane-onoff: Plane On off
> + * @plane-move: Move plane position
> */
>
> /**
> - * SUBTEST: pr_dpms
> + * SUBTEST: pr-dpms
> * Description: Check if pr is detecting changes when rendering operation
> * is performed with dpms enabled or disabled
> * Functionality: dpms, pr
> * Mega feature: Panel Replay
> *
> - * SUBTEST: pr_no_drrs
> + * SUBTEST: fbc-pr-dpms
> + * Description: Check if fbc with pr is detecting changes when rendering operation
> + * is performed with dpms enabled or disabled
> + * Functionality: dpms, pr, fbc
> + *
> + * SUBTEST: pr-no-drrs
> * Description: Check if pr is detecting changes when drrs is disabled
> * Functionality: drrs, pr
> * Mega feature: Panel Replay
> *
> - * SUBTEST: pr_suspend
> + * SUBTEST: fbc-pr-no-drrs
> + * Description: Check if pr is detecting changes when drrs is disabled
> + * Functionality: drrs, pr, fbc
> + *
> + * SUBTEST: pr-suspend
> * Description: Check if pr is detecting changes when plane operation is
> * performed with suspend resume cycles
> * Functionality: pr, suspend
> * Mega feature: Panel Replay
> *
> - * SUBTEST: pr_basic
> + * SUBTEST: fbc-pr-suspend
> + * Description: Check if fbc with pr is detecting changes when plane operation is
> + * performed with suspend resume cycles
> + * Functionality: pr, suspend, fbc
> + *
> + * SUBTEST: pr-basic
> * Description: Basic check for pr if it is detecting changes made in planes
> * Functionality: pr
> * Mega feature: Panel Replay
> + *
> + * SUBTEST: fbc-pr-basic
> + * Description: Basic check for fbc with pr if it is detecting changes made in planes
> + * Functionality: pr, fbc
> */
>
> /**
> - * SUBTEST: pr_%s_%s
> + * SUBTEST: pr-%s-%s
> * Description: Check if pr is detecting memory mapping, rendering and plane
> * operations performed on %arg[1] planes
> * Driver requirement: i915
> * Functionality: kms_core, plane, pr
> * Mega feature: Panel Replay
> *
> + * SUBTEST: fbc-pr-%s-%s
> + * Description: Check if fbc with pr is detecting memory mapping, rendering and plane
> + * operations performed on %arg[1] planes
> + * Driver requirement: i915
> + * Functionality: kms_core, plane, pr, fbc
> + * Mega feature: Panel Replay, FBC
> + * Test category: functionality test
> * arg[1]:
> *
> * @cursor: Cursor plane
> @@ -227,23 +329,35 @@
> *
> * arg[2]:
> *
> - * @mmap_cpu: MMAP CPU
> - * @mmap_gtt: MMAP GTT
> + * @mmap-cpu: MMAP CPU
> + * @mmap-gtt: MMAP GTT
> */
>
> /**
> - * SUBTEST: pr_primary_page_flip
> + * SUBTEST: pr-primary-page-flip
> * Description: Check if pr is detecting memory mapping, rendering and plane
> * operations performed on primary planes
> * Functionality: plane, pr
> * Mega feature: Panel Replay
> *
> - * SUBTEST: pr_primary_%s
> + * SUBTEST: fbc-pr-primary-page-flip
> + * Description: Check if fbc with pr is detecting memory mapping, rendering and plane
> + * operations performed on primary planes
> + * Functionality: plane, pr, fbc
> + * Mega feature: Panel Replay, FBC
> + *
> + * SUBTEST: pr-primary-%s
> * Description: Check if pr is detecting memory mapping, rendering and plane
> * operations performed on primary planes
> * Functionality: kms_core, plane, pr
> * Mega feature: Panel Replay
> *
> + * SUBTEST: fbc-pr-primary-%s
> + * Description: Check if fbc with pr is detecting memory mapping, rendering and plane
> + * operations performed on primary planes
> + * Functionality: kms_core, plane, pr, fbc
> + * Mega feature: Panel Replay, FBC
> + *
> * arg[1]:
> *
> * @blt: Blitter
> @@ -251,12 +365,18 @@
> */
>
> /**
> - * SUBTEST: pr_%s_%s
> + * SUBTEST: pr-%s-%s
> * Description: Check if pr is detecting memory mapping, rendering and plane
> * operations performed on %arg[1] planes
> * Functionality: kms_core, plane, pr
> * Mega feature: Panel Replay
> *
> + * SUBTEST: fbc-pr-%s-%s
> + * Description: Check if fbc with pr is detecting memory mapping, rendering and plane
> + * operations performed on %arg[1] planes
> + * Functionality: kms_core, plane, pr, fbc
> + * Mega feature: Panel Replay, FBC
> + *
> * arg[1]:
> *
> * @cursor: Cursor plane
> @@ -266,25 +386,40 @@
> *
> * @blt: Blitter
> * @render: Render
> - * @plane_onoff: Plane On off
> - * @plane_move: Move plane position
> + * @plane-onoff: Plane On off
> + * @plane-move: Move plane position
> */
>
> /**
> - * SUBTEST: psr_cursor_plane_move
> + * SUBTEST: psr-cursor-plane-move
> * Description: Check if psr is detecting the plane operations performed on
> * cursor planes
> * Functionality: psr1
> *
> - * SUBTEST: psr_primary_page_flip
> + * SUBTEST: fbc-psr-cursor-plane-move
> + * Description: Check if fbc with psr is detecting the plane operations performed on
> + * cursor planes
> + * Functionality: psr1, fbc
> + *
> + * SUBTEST: psr-primary-page-flip
> * Description: Check if psr is detecting page-flipping operations performed
> * on primary planes
> * Functionality: psr1
> *
> - * SUBTEST: psr_sprite_plane_onoff
> + * SUBTEST: fbc-psr-primary-page-flip
> + * Description: Check if psr is detecting page-flipping operations performed
> + * on primary planes
> + * Functionality: psr1, fbc
> + *
> + * SUBTEST: psr-sprite-plane-onoff
> * Description: Check if psr is detecting the plane operations performed on
> * sprite planes
> * Functionality: psr1
> + *
> + * SUBTEST: fbc-psr-sprite-plane-onoff
> + * Description: Check if psr is detecting the plane operations performed on
> + * sprite planes
> + * Functionality: psr1, fbc
> */
>
> enum operations {
> @@ -300,13 +435,13 @@ enum operations {
> static const char *op_str(enum operations op)
> {
> static const char * const name[] = {
> - [PAGE_FLIP] = "page_flip",
> - [MMAP_GTT] = "mmap_gtt",
> - [MMAP_CPU] = "mmap_cpu",
> + [PAGE_FLIP] = "page-flip",
> + [MMAP_GTT] = "mmap-gtt",
> + [MMAP_CPU] = "mmap-cpu",
> [BLT] = "blt",
> [RENDER] = "render",
> - [PLANE_MOVE] = "plane_move",
> - [PLANE_ONOFF] = "plane_onoff",
> + [PLANE_MOVE] = "plane-move",
> + [PLANE_ONOFF] = "plane-onoff",
> };
>
> return name[op];
> @@ -318,6 +453,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;
> @@ -328,6 +464,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)
> @@ -725,10 +862,15 @@ static void test_setup(data_t *data)
>
> psr_enable_if_enabled(data);
> setup_test_plane(data, data->test_plane_id);
> + if (data->fbc_flag == true && data->op_fbc_mode == FBC_ENABLED)
> + igt_assert_f(intel_fbc_wait_until_enabled(data->drm_fd,
> + pipe),
> + "FBC still disabled");
May be move this after the next statement, to ensure that FBC is enabled after the PSR?
> if (psr_wait_entry_if_enabled(data)) {
> psr_entered = true;
> break;
> }
> +
> }
>
> igt_assert(psr_entered);
> @@ -746,14 +888,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_"
> + "psr-",
> + "psr2-",
> + "pr-"
> + };
> + const char *append_fbc_subtest[2] = {
> + "",
> + "fbc-"
> };
> int modes[] = {PSR_MODE_1, PSR_MODE_2, PR_MODE};
> + int fbc_status[] = {FBC_DISABLED, FBC_ENABLED};
> igt_output_t *output;
>
> igt_fixture {
> @@ -764,52 +912,38 @@ 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];
> + 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))
> @@ -817,24 +951,91 @@ 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));
I think this is not related to this patch?
> 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))
> @@ -842,22 +1043,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 = igt_get_render_copyfunc(data.devid) ?
> RENDER : BLT;
> + 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))
> @@ -865,56 +1064,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 = igt_get_render_copyfunc(data.devid) ? RENDER :
> BLT;
> - 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 {
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2023-11-30 11:15 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-29 5:35 [igt-dev] [PATCH i-g-t 0/2] Add FBC support to PSR/PSR2 tests Jeevan B
2023-11-29 5:36 ` [igt-dev] [PATCH i-g-t 1/2] tests/intel/kms_psr: Add FBC support to PSR/PSR2/PR tests Jeevan B
2023-11-29 5:36 ` [igt-dev] [PATCH i-g-t 2/2] tests/intel/kms_psr2_sf: Add FBC support to PSR2 tests Jeevan B
2023-11-29 6:39 ` [igt-dev] ✓ CI.xeBAT: success for Add FBC support to PSR/PSR2 tests (rev8) Patchwork
-- strict thread matches above, loose matches on Subject: below --
2023-11-30 9:45 [igt-dev] [PATCH i-g-t 0/2] Add FBC support to PSR/PSR2 tests Jeevan B
2023-11-30 9:45 ` [igt-dev] [PATCH i-g-t 1/2] tests/intel/kms_psr: Add FBC support to PSR/PSR2/PR tests Jeevan B
2023-11-30 11:15 ` Govindapillai, Vinod
2023-11-30 7:23 [igt-dev] [PATCH i-g-t 0/2] Add FBC support to PSR/PSR2 tests Jeevan B
2023-11-30 7:23 ` [igt-dev] [PATCH i-g-t 1/2] tests/intel/kms_psr: Add FBC support to PSR/PSR2/PR tests Jeevan B
2023-11-29 14:46 [igt-dev] [PATCH i-g-t 0/2] Add FBC support to PSR/PSR2 tests Jeevan B
2023-11-29 14:46 ` [igt-dev] [PATCH i-g-t 1/2] tests/intel/kms_psr: Add FBC support to PSR/PSR2/PR tests Jeevan B
2023-11-28 17:40 [igt-dev] [PATCH i-g-t 0/2] Add FBC support to PSR/PSR2 tests Jeevan B
2023-11-28 17:40 ` [igt-dev] [PATCH i-g-t 1/2] tests/intel/kms_psr: Add FBC support to PSR/PSR2/PR tests Jeevan B
2023-11-28 11:37 [igt-dev] [PATCH i-g-t 0/2] Add FBC support to PSR/PSR2 tests Jeevan B
2023-11-28 11:37 ` [igt-dev] [PATCH i-g-t 1/2] tests/intel/kms_psr: Add FBC support to PSR/PSR2/PR tests Jeevan B
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox