[PATCH i-g-t 2/3] lib/igt_psr: modify library to support multiple PSR/PR outputs
Kunal Joshi
kunal1.joshi at intel.com
Wed Feb 7 13:53:18 UTC 2024
We can have multiple panels connected to the system so PSR information
should be exposed per output. changes provide support for multiple
PSR/PR to be tested simultaneously.
For review purpose here is the breakdown of changes
may not be part of commit
- Added new function get_debugfs_file to get debugfs file for each output
- Added new function get_psr_mode_for_output to get PSR mode for each output
- Added igt_output_t param to all necessary functions so that we can get/set
PSR related debugfs file for that particular output
- param is currently passed as NULL for rest of the test other than
kms_psr2_sf and kms_psr, maybe taken care in future patches
- Currently we don't have separate psr_debug debugfs file for each output.
so, we are using i915_edp_psr_debug file for all outputs.
later we need to add support for separate psr_debug file for each output.
Cc: Jouni Högander <jouni.hogander at intel.com>
Cc: Animesh Manna <animesh.manna at intel.com>
Cc: Arun R Murthy <arun.r.murthy at intel.com>
Signed-off-by: Kunal Joshi <kunal1.joshi at intel.com>
---
lib/igt_psr.c | 120 +++++++++++++++++--------
lib/igt_psr.h | 14 +--
tests/intel/kms_dirtyfb.c | 4 +-
tests/intel/kms_fbcon_fbt.c | 4 +-
tests/intel/kms_frontbuffer_tracking.c | 4 +-
tests/intel/kms_pm_dc.c | 6 +-
tests/intel/kms_psr.c | 4 +-
tests/intel/kms_psr2_sf.c | 8 --
tests/intel/kms_psr2_su.c | 2 +-
tests/intel/kms_psr_stress_test.c | 4 +-
tests/kms_async_flips.c | 4 +-
tests/kms_cursor_legacy.c | 4 +-
12 files changed, 109 insertions(+), 69 deletions(-)
diff --git a/lib/igt_psr.c b/lib/igt_psr.c
index 8acab2231..6ec755004 100644
--- a/lib/igt_psr.c
+++ b/lib/igt_psr.c
@@ -27,6 +27,35 @@
#include "igt_sysfs.h"
#include <errno.h>
+enum psr_debugfs_file {
+ PSR_STATUS,
+ PSR_DEBUG,
+ PSR_MAX
+};
+
+static const char *get_debugfs_file(igt_output_t *output, enum psr_debugfs_file file)
+{
+ static char debugfs_file[128] = {0};
+
+ switch (file) {
+ case PSR_STATUS:
+ if (output)
+ sprintf(debugfs_file, "%s/i915_psr_status", output->name);
+ else
+ sprintf(debugfs_file, "i915_edp_psr_status");
+ break;
+ case PSR_DEBUG:
+ if (output)
+ sprintf(debugfs_file, "%s/i915_psr_debug", output->name);
+ else
+ sprintf(debugfs_file, "i915_edp_psr_debug");
+ break;
+ default:
+ igt_assert_f(false, "Invalid psr debugfs file\n");
+ }
+ return debugfs_file;
+}
+
bool psr_disabled_check(int debugfs_fd)
{
char buf[PSR_STATUS_MAX_LEN];
@@ -37,11 +66,15 @@ bool psr_disabled_check(int debugfs_fd)
return strstr(buf, "PSR mode: disabled\n");
}
-bool psr2_selective_fetch_check(int debugfs_fd)
+bool selective_fetch_check(int debugfs_fd, igt_output_t *output)
{
char buf[PSR_STATUS_MAX_LEN];
+ char debugfs_file[128] = {0};
+ const char *file_path = get_debugfs_file(output, PSR_STATUS);
- igt_debugfs_simple_read(debugfs_fd, "i915_edp_psr_status", buf,
+ sprintf(debugfs_file, "%s", file_path);
+
+ igt_debugfs_simple_read(debugfs_fd, debugfs_file, buf,
sizeof(buf));
return strstr(buf, "PSR2 selective fetch: enabled");
@@ -51,14 +84,11 @@ static bool psr_active_check(int debugfs_fd, enum psr_mode mode, igt_output_t *o
{
char debugfs_file[128] = {0};
char buf[PSR_STATUS_MAX_LEN];
+ const char *file_path = get_debugfs_file(output, PSR_STATUS);
const char *state = (mode == PSR_MODE_1 || mode == PR_MODE) ? "SRDENT" : "DEEP_SLEEP";
int ret;
- if (output)
- sprintf(debugfs_file, "%s/i915_psr_status", output->name);
- else
- sprintf(debugfs_file, "%s", "i915_edp_psr_status");
-
+ sprintf(debugfs_file, "%s", file_path);
ret = igt_debugfs_simple_read(debugfs_fd, debugfs_file,
buf, sizeof(buf));
if (ret < 0) {
@@ -90,13 +120,20 @@ bool psr_long_wait_update(int debugfs_fd, enum psr_mode mode, igt_output_t *outp
return igt_wait(!psr_active_check(debugfs_fd, mode, output), 500, 10);
}
-static ssize_t psr_write(int debugfs_fd, const char *buf)
+static ssize_t psr_write(int debugfs_fd, const char *buf, igt_output_t *output)
{
+ /*
+ * FIXME: Currently we don't have separate psr_debug file for each output.
+ * so, we are using i915_edp_psr_debug file for all outputs.
+ * Later we need to add support for separate psr_debug file for each output.
+ *
+ * use get_debugfs_file(output, PSR_DEBUG) instead of "i915_edp_psr_debug"
+ */
return igt_sysfs_write(debugfs_fd, "i915_edp_psr_debug", buf,
- strlen(buf));
+ strlen(buf));
}
-static int has_psr_debugfs(int debugfs_fd)
+static int has_psr_debugfs(int debugfs_fd, igt_output_t *output)
{
int ret;
@@ -105,7 +142,7 @@ static int has_psr_debugfs(int debugfs_fd)
* Legacy mode will return OK here, debugfs api will return -EINVAL.
* -ENODEV is returned when PSR is unavailable.
*/
- ret = psr_write(debugfs_fd, "0xf");
+ ret = psr_write(debugfs_fd, "0xf", output);
if (ret == -EINVAL) {
errno = 0;
return 0;
@@ -113,7 +150,7 @@ static int has_psr_debugfs(int debugfs_fd)
return ret;
/* legacy debugfs api, we enabled irqs by writing, disable them. */
- psr_write(debugfs_fd, "0");
+ psr_write(debugfs_fd, "0", output);
return -EINVAL;
}
@@ -134,14 +171,14 @@ static int psr_restore_debugfs_fd = -1;
static void restore_psr_debugfs(int sig)
{
- psr_write(psr_restore_debugfs_fd, "0");
+ psr_write(psr_restore_debugfs_fd, "0", NULL);
}
-static bool psr_set(int device, int debugfs_fd, int mode)
+static bool psr_set(int device, int debugfs_fd, int mode, igt_output_t *output)
{
int ret;
- ret = has_psr_debugfs(debugfs_fd);
+ ret = has_psr_debugfs(debugfs_fd, output);
if (ret == -ENODEV) {
igt_skip("PSR not available\n");
return false;
@@ -179,7 +216,7 @@ static bool psr_set(int device, int debugfs_fd, int mode)
debug_val = "0x1";
}
- ret = psr_write(debugfs_fd, debug_val);
+ ret = psr_write(debugfs_fd, debug_val, output);
igt_require_f(ret > 0, "PSR2 SF feature not available\n");
}
@@ -193,15 +230,15 @@ static bool psr_set(int device, int debugfs_fd, int mode)
return ret;
}
-bool psr_enable(int device, int debugfs_fd, enum psr_mode mode)
+bool psr_enable(int device, int debugfs_fd, enum psr_mode mode, igt_output_t *output)
{
- return psr_set(device, debugfs_fd, mode);
+ return psr_set(device, debugfs_fd, mode, output);
}
-bool psr_disable(int device, int debugfs_fd)
+bool psr_disable(int device, int debugfs_fd, igt_output_t *output)
{
/* Any mode different than PSR_MODE_1/2 will disable PSR */
- return psr_set(device, debugfs_fd, -1);
+ return psr_set(device, debugfs_fd, -1, output);
}
bool psr_sink_support(int device, int debugfs_fd, enum psr_mode mode, igt_output_t *output)
@@ -209,13 +246,10 @@ bool psr_sink_support(int device, int debugfs_fd, enum psr_mode mode, igt_output
char *line;
char debugfs_file[128] = {0};
char buf[PSR_STATUS_MAX_LEN];
+ const char *file_path = get_debugfs_file(output, PSR_STATUS);
int ret;
- if (output)
- sprintf(debugfs_file, "%s/i915_psr_status", output->name);
- else
- sprintf(debugfs_file, "%s", "i915_edp_psr_status");
-
+ sprintf(debugfs_file, "%s", file_path);
ret = igt_debugfs_simple_read(debugfs_fd, debugfs_file, buf,
sizeof(buf));
if (ret < 1)
@@ -307,7 +341,7 @@ void psr_print_debugfs(int debugfs_fd)
igt_info("%s", buf);
}
-bool i915_psr2_selective_fetch_check(int drm_fd)
+bool i915_psr2_selective_fetch_check(int drm_fd, igt_output_t *output)
{
int debugfs_fd;
bool ret;
@@ -316,7 +350,7 @@ bool i915_psr2_selective_fetch_check(int drm_fd)
return false;
debugfs_fd = igt_debugfs_dir(drm_fd);
- ret = psr2_selective_fetch_check(debugfs_fd);
+ ret = selective_fetch_check(debugfs_fd, output);
close(debugfs_fd);
return ret;
@@ -333,17 +367,24 @@ bool i915_psr2_selective_fetch_check(int drm_fd)
* Returns:
* True if PSR mode changed to PSR1, false otherwise.
*/
-bool i915_psr2_sel_fetch_to_psr1(int drm_fd)
+bool i915_pr_psr2_sel_fetch_to_pr_psr1(int drm_fd, igt_output_t *output)
{
int debugfs_fd;
bool ret = false;
+ enum psr_mode mode;
if (!is_intel_device(drm_fd))
return ret;
debugfs_fd = igt_debugfs_dir(drm_fd);
- if (psr2_selective_fetch_check(debugfs_fd)) {
- psr_set(drm_fd, debugfs_fd, PSR_MODE_1);
+ if (selective_fetch_check(debugfs_fd, output)) {
+ mode = psr_get_mode(debugfs_fd, output);
+ if (mode == PR_MODE_SEL_FETCH)
+ psr_set(drm_fd, debugfs_fd, PR_MODE, output);
+ else if (mode == PSR_MODE_2_SEL_FETCH)
+ psr_set(drm_fd, debugfs_fd, PSR_MODE_1, output);
+ else
+ igt_assert("switch not possible from current psr mode\n");
ret = true;
}
@@ -357,12 +398,17 @@ bool i915_psr2_sel_fetch_to_psr1(int drm_fd)
* Restore PSR2 selective fetch after tests were executed, this function should
* only be called if i915_psr2_sel_fetch_to_psr1() returned true.
*/
-void i915_psr2_sel_fetch_restore(int drm_fd)
+void i915_pr_psr2_sel_fetch_restore(int drm_fd, igt_output_t *output)
{
int debugfs_fd;
+ enum psr_mode mode;
debugfs_fd = igt_debugfs_dir(drm_fd);
- psr_set(drm_fd, debugfs_fd, PSR_MODE_2_SEL_FETCH);
+ mode = psr_get_mode(debugfs_fd, output);
+ if (mode == PR_MODE)
+ psr_set(drm_fd, debugfs_fd, PR_MODE_SEL_FETCH, output);
+ else
+ psr_set(drm_fd, debugfs_fd, PSR_MODE_2_SEL_FETCH, output);
close(debugfs_fd);
}
@@ -371,16 +417,18 @@ void i915_psr2_sel_fetch_restore(int drm_fd)
*
* Return the current PSR mode.
*/
-enum psr_mode psr_get_mode(int debugfs_fd)
+enum psr_mode psr_get_mode(int debugfs_fd, igt_output_t *output)
{
char buf[PSR_STATUS_MAX_LEN];
+ char debugfs_file[128] = {0};
+ const char *file_path = get_debugfs_file(output, PSR_STATUS);
int ret;
-
- ret = igt_debugfs_simple_read(debugfs_fd, "i915_edp_psr_status", buf,
+ sprintf(debugfs_file, "%s", file_path);
+ ret = igt_debugfs_simple_read(debugfs_fd, debugfs_file, buf,
sizeof(buf));
if (ret < 0) {
- igt_info("Could not read i915_edp_psr_status: %s\n",
+ igt_info("Could not read psr status: %s\n",
strerror(-ret));
return PSR_DISABLED;
}
diff --git a/lib/igt_psr.h b/lib/igt_psr.h
index 82a4e8c5e..36ba7f068 100644
--- a/lib/igt_psr.h
+++ b/lib/igt_psr.h
@@ -46,21 +46,21 @@ enum fbc_mode {
};
bool psr_disabled_check(int debugfs_fd);
-bool psr2_selective_fetch_check(int debugfs_fd);
+bool selective_fetch_check(int debugfs_fd, igt_output_t *output);
bool psr_wait_entry(int debugfs_fd, enum psr_mode mode, igt_output_t *output);
bool psr_wait_update(int debugfs_fd, enum psr_mode mode, igt_output_t *output);
bool psr_long_wait_update(int debugfs_fd, enum psr_mode mode, igt_output_t *output);
-bool psr_enable(int device, int debugfs_fd, enum psr_mode);
-bool psr_disable(int device, int debugfs_fd);
+bool psr_enable(int device, int debugfs_fd, enum psr_mode, igt_output_t *output);
+bool psr_disable(int device, int debugfs_fd, igt_output_t *output);
bool psr_sink_support(int device, int debugfs_fd, enum psr_mode mode, igt_output_t *output);
bool psr2_wait_su(int debugfs_fd, uint16_t *num_su_blocks);
void psr_print_debugfs(int debugfs_fd);
-enum psr_mode psr_get_mode(int debugfs_fd);
+enum psr_mode psr_get_mode(int debugfs_fd, igt_output_t *output);
-bool i915_psr2_selective_fetch_check(int drm_fd);
+bool i915_psr2_selective_fetch_check(int drm_fd, igt_output_t *output);
-bool i915_psr2_sel_fetch_to_psr1(int drm_fd);
-void i915_psr2_sel_fetch_restore(int drm_fd);
+bool i915_pr_psr2_sel_fetch_to_pr_psr1(int drm_fd, igt_output_t *output);
+void i915_pr_psr2_sel_fetch_restore(int drm_fd, igt_output_t *output);
bool is_psr_enable_possible(int drm_fd, enum psr_mode mode);
#endif
diff --git a/tests/intel/kms_dirtyfb.c b/tests/intel/kms_dirtyfb.c
index 7bf49cb15..22ca83305 100644
--- a/tests/intel/kms_dirtyfb.c
+++ b/tests/intel/kms_dirtyfb.c
@@ -127,7 +127,7 @@ static void enable_feature(data_t *data)
intel_fbc_enable(data->drm_fd);
break;
case FEATURE_PSR:
- psr_enable(data->drm_fd, data->debugfs_fd, PSR_MODE_1);
+ psr_enable(data->drm_fd, data->debugfs_fd, PSR_MODE_1, NULL);
break;
case FEATURE_DRRS:
intel_drrs_enable(data->drm_fd, data->pipe);
@@ -167,7 +167,7 @@ static void check_feature(data_t *data)
static void disable_features(data_t *data)
{
intel_fbc_disable(data->drm_fd);
- psr_disable(data->drm_fd, data->debugfs_fd);
+ psr_disable(data->drm_fd, data->debugfs_fd, NULL);
intel_drrs_disable(data->drm_fd, data->pipe);
}
diff --git a/tests/intel/kms_fbcon_fbt.c b/tests/intel/kms_fbcon_fbt.c
index 90484dccf..71e42f19c 100644
--- a/tests/intel/kms_fbcon_fbt.c
+++ b/tests/intel/kms_fbcon_fbt.c
@@ -277,7 +277,7 @@ static void disable_features(int device, int debugfs_fd)
{
igt_set_module_param_int(device, "enable_fbc", 0);
if (psr_sink_support(device, debugfs_fd, PSR_MODE_1, NULL))
- psr_disable(device, debugfs_fd);
+ psr_disable(device, debugfs_fd, NULL);
}
static inline void fbc_modparam_enable(int device, int debugfs_fd)
@@ -287,7 +287,7 @@ static inline void fbc_modparam_enable(int device, int debugfs_fd)
static inline void psr_debugfs_enable(int device, int debugfs_fd)
{
- psr_enable(device, debugfs_fd, PSR_MODE_1);
+ psr_enable(device, debugfs_fd, PSR_MODE_1, NULL);
}
static void fbc_skips_on_fbcon(int debugfs_fd)
diff --git a/tests/intel/kms_frontbuffer_tracking.c b/tests/intel/kms_frontbuffer_tracking.c
index 912cca3f8..023843161 100644
--- a/tests/intel/kms_frontbuffer_tracking.c
+++ b/tests/intel/kms_frontbuffer_tracking.c
@@ -2234,7 +2234,7 @@ static bool disable_features(const struct test_mode *t)
intel_fbc_disable(drm.fd);
intel_drrs_disable(drm.fd, prim_mode_params.pipe);
- return psr.can_test ? psr_disable(drm.fd, drm.debugfs) : false;
+ return psr.can_test ? psr_disable(drm.fd, drm.debugfs, NULL) : false;
}
static void *busy_thread_func(void *data)
@@ -2867,7 +2867,7 @@ static bool enable_features_for_test(const struct test_mode *t)
if (t->feature & FEATURE_FBC)
intel_fbc_enable(drm.fd);
if (t->feature & FEATURE_PSR)
- ret = psr_enable(drm.fd, drm.debugfs, PSR_MODE_1);
+ ret = psr_enable(drm.fd, drm.debugfs, PSR_MODE_1, NULL);
if (t->feature & FEATURE_DRRS)
intel_drrs_enable(drm.fd, prim_mode_params.pipe);
diff --git a/tests/intel/kms_pm_dc.c b/tests/intel/kms_pm_dc.c
index 0d5824e67..7deebf83d 100644
--- a/tests/intel/kms_pm_dc.c
+++ b/tests/intel/kms_pm_dc.c
@@ -362,7 +362,7 @@ static void require_dc_counter(int debugfs_fd, int dc_flag)
static void setup_dc3co(data_t *data)
{
data->op_psr_mode = PSR_MODE_2;
- psr_enable(data->drm_fd, data->debugfs_fd, data->op_psr_mode);
+ psr_enable(data->drm_fd, data->debugfs_fd, data->op_psr_mode, NULL);
igt_require_f(psr_wait_entry(data->debugfs_fd, data->op_psr_mode, NULL),
"PSR2 is not enabled\n");
}
@@ -665,7 +665,7 @@ igt_main
igt_require(psr_sink_support(data.drm_fd, data.debugfs_fd,
PSR_MODE_1, NULL));
data.op_psr_mode = PSR_MODE_1;
- psr_enable(data.drm_fd, data.debugfs_fd, data.op_psr_mode);
+ psr_enable(data.drm_fd, data.debugfs_fd, data.op_psr_mode, NULL);
test_dc_state_psr(&data, CHECK_DC5);
}
@@ -675,7 +675,7 @@ igt_main
igt_require(psr_sink_support(data.drm_fd, data.debugfs_fd,
PSR_MODE_1, NULL));
data.op_psr_mode = PSR_MODE_1;
- psr_enable(data.drm_fd, data.debugfs_fd, data.op_psr_mode);
+ psr_enable(data.drm_fd, data.debugfs_fd, data.op_psr_mode, NULL);
igt_require_f(igt_pm_pc8_plus_residencies_enabled(data.msr_fd),
"PC8+ residencies not supported\n");
if (intel_display_ver(data.devid) >= 14)
diff --git a/tests/intel/kms_psr.c b/tests/intel/kms_psr.c
index 521d4c708..3822b3081 100644
--- a/tests/intel/kms_psr.c
+++ b/tests/intel/kms_psr.c
@@ -519,7 +519,7 @@ static bool psr_enable_if_enabled(data_t *data)
igt_skip("enable_psr modparam doesn't allow psr mode %d\n",
data->op_psr_mode);
- return psr_enable(data->drm_fd, data->debugfs_fd, data->op_psr_mode);
+ return psr_enable(data->drm_fd, data->debugfs_fd, data->op_psr_mode, data->output);
}
static inline void manual(const char *expected)
@@ -658,6 +658,7 @@ static void test_cleanup(data_t *data)
igt_remove_fb(data->drm_fd, &data->fb_green);
igt_remove_fb(data->drm_fd, &data->fb_white);
+ psr_disable(data->drm_fd, data->debugfs_fd, data->output);
}
static void setup_test_plane(data_t *data, int test_plane)
@@ -976,7 +977,6 @@ igt_main
}
igt_fixture {
- psr_disable(data.drm_fd, data.debugfs_fd);
close(data.debugfs_fd);
buf_ops_destroy(data.bops);
diff --git a/tests/intel/kms_psr2_sf.c b/tests/intel/kms_psr2_sf.c
index ecf9ad77f..8e6a9e02c 100644
--- a/tests/intel/kms_psr2_sf.c
+++ b/tests/intel/kms_psr2_sf.c
@@ -1012,11 +1012,6 @@ igt_main
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),
- "Error enabling PSR2\n");
-
data.damage_area_count = MAX_DAMAGE_AREAS;
data.primary_format = DRM_FORMAT_XRGB8888;
@@ -1026,9 +1021,6 @@ igt_main
igt_info("Big framebuffer size %dx%d\n",
data.big_fb_width, data.big_fb_height);
- igt_require_f(psr2_selective_fetch_check(data.debugfs_fd),
- "PSR2 selective fetch not enabled\n");
-
for_each_pipe_with_valid_output(&data.display, data.pipe, data.output) {
coexist_features[n_pipes] = 0;
if (check_psr2_support(&data)) {
diff --git a/tests/intel/kms_psr2_su.c b/tests/intel/kms_psr2_su.c
index 936b5beb3..437ee36f6 100644
--- a/tests/intel/kms_psr2_su.c
+++ b/tests/intel/kms_psr2_su.c
@@ -338,7 +338,7 @@ igt_main
/* Test if PSR2 can be enabled */
igt_require_f(psr_enable(data.drm_fd,
- data.debugfs_fd, PSR_MODE_2),
+ data.debugfs_fd, PSR_MODE_2, NULL),
"Error enabling PSR2\n");
data.op = FRONTBUFFER;
data.format = DRM_FORMAT_XRGB8888;
diff --git a/tests/intel/kms_psr_stress_test.c b/tests/intel/kms_psr_stress_test.c
index 7aea8e8a5..bca3bd513 100644
--- a/tests/intel/kms_psr_stress_test.c
+++ b/tests/intel/kms_psr_stress_test.c
@@ -230,7 +230,7 @@ static void prepare(data_t *data)
r = timerfd_settime(data->completed_timerfd, 0, &interval, NULL);
igt_require_f(r != -1, "Error setting completed_timerfd\n");
- data->initial_state = psr_get_mode(data->debugfs_fd);
+ data->initial_state = psr_get_mode(data->debugfs_fd, NULL);
igt_require(data->initial_state != PSR_DISABLED);
igt_require(psr_wait_entry(data->debugfs_fd, data->initial_state, NULL));
}
@@ -343,7 +343,7 @@ static void run(data_t *data)
}
/* Check if after all this stress the PSR is still in the same state */
- igt_assert(psr_get_mode(data->debugfs_fd) == data->initial_state);
+ igt_assert(psr_get_mode(data->debugfs_fd, NULL) == data->initial_state);
}
igt_main
diff --git a/tests/kms_async_flips.c b/tests/kms_async_flips.c
index a0349fa03..2895168f7 100644
--- a/tests/kms_async_flips.c
+++ b/tests/kms_async_flips.c
@@ -391,7 +391,7 @@ static void test_cursor(data_t *data)
* necessary, causing the async flip to fail because async flip is not
* supported in cursor plane.
*/
- igt_skip_on_f(i915_psr2_selective_fetch_check(data->drm_fd),
+ igt_skip_on_f(i915_psr2_selective_fetch_check(data->drm_fd, NULL),
"PSR2 sel fetch causes cursor to be added to primary plane " \
"pages flips and async flip is not supported in cursor\n");
@@ -704,7 +704,7 @@ igt_main
* necessary, causing the async flip to fail because async flip is not
* supported in cursor plane.
*/
- igt_skip_on_f(i915_psr2_selective_fetch_check(data.drm_fd),
+ igt_skip_on_f(i915_psr2_selective_fetch_check(data.drm_fd, NULL),
"PSR2 sel fetch causes cursor to be added to primary plane " \
"pages flips and async flip is not supported in cursor\n");
diff --git a/tests/kms_cursor_legacy.c b/tests/kms_cursor_legacy.c
index 0017659d4..91e5e9b07 100644
--- a/tests/kms_cursor_legacy.c
+++ b/tests/kms_cursor_legacy.c
@@ -1849,7 +1849,7 @@ igt_main
* page flip with cursor legacy APIS when Intel's PSR2 selective
* fetch is enabled, so switching PSR1 for this whole test.
*/
- intel_psr2_restore = i915_psr2_sel_fetch_to_psr1(display.drm_fd);
+ intel_psr2_restore = i915_pr_psr2_sel_fetch_to_pr_psr1(display.drm_fd, NULL);
}
igt_describe("Test checks how many cursor updates we can fit between vblanks "
@@ -2074,7 +2074,7 @@ igt_main
igt_fixture {
if (intel_psr2_restore)
- i915_psr2_sel_fetch_restore(display.drm_fd);
+ i915_pr_psr2_sel_fetch_restore(display.drm_fd, NULL);
igt_display_fini(&display);
drm_close_driver(display.drm_fd);
}
--
2.25.1
More information about the igt-dev
mailing list