<!DOCTYPE html><html><head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
</head>
<body>
<p>Hello Jouni,<br>
</p>
<div class="moz-cite-prefix">On 2/19/2024 2:03 PM, Hogander, Jouni
wrote:<br>
</div>
<blockquote type="cite" cite="mid:225179de6cf4afe93bb499790b63cd1cf4fbc3e6.camel@intel.com">
<pre class="moz-quote-pre" wrap="">On Mon, 2024-02-19 at 13:37 +0530, Joshi, Kunal1 wrote:
</pre>
<blockquote type="cite">
<pre class="moz-quote-pre" wrap="">Hello Jouni,
On 2/19/2024 1:15 PM, Hogander, Jouni wrote:
</pre>
<blockquote type="cite">
<pre class="moz-quote-pre" wrap="">On Sun, 2024-02-18 at 14:47 +0530, Kunal Joshi wrote:
</pre>
<blockquote type="cite">
<pre class="moz-quote-pre" wrap="">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.
Cc: Jouni Högander <a class="moz-txt-link-rfc2396E" href="mailto:jouni.hogander@intel.com"><jouni.hogander@intel.com></a>
Cc: Animesh Manna <a class="moz-txt-link-rfc2396E" href="mailto:animesh.manna@intel.com"><animesh.manna@intel.com></a>
Cc: Arun R Murthy <a class="moz-txt-link-rfc2396E" href="mailto:arun.r.murthy@intel.com"><arun.r.murthy@intel.com></a>
Signed-off-by: Kunal Joshi <a class="moz-txt-link-rfc2396E" href="mailto:kunal1.joshi@intel.com"><kunal1.joshi@intel.com></a>
---
lib/igt_psr.c | 76 ++++++++++++++-----
-----
--
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, 65 insertions(+), 69 deletions(-)
diff --git a/lib/igt_psr.c b/lib/igt_psr.c
index ac214fcfc..cad8cce05 100644
--- a/lib/igt_psr.c
+++ b/lib/igt_psr.c
@@ -27,6 +27,10 @@
#include "igt_sysfs.h"
#include <errno.h>
+#define SET_DEBUGFS_PATH(output, path) \
+ sprintf(path, "%s%s%s", output ? output->name : "",
output ?
"/" : "", \
+ output ? "i915_psr_status" :
"i915_edp_psr_status")
+
bool psr_disabled_check(int debugfs_fd)
{
char buf[PSR_STATUS_MAX_LEN];
@@ -37,11 +41,13 @@ bool psr_disabled_check(int debugfs_fd)
return strstr(buf, "PSR mode: disabled\n");
}
-bool psr2_selective_fetch_check(int debugfs_fd)
+bool psr2_selective_fetch_check(int debugfs_fd, igt_output_t
*output)
{
char buf[PSR_STATUS_MAX_LEN];
+ char debugfs_file[128] = {0};
- igt_debugfs_simple_read(debugfs_fd,
"i915_edp_psr_status",
buf,
+ SET_DEBUGFS_PATH(output, debugfs_file);
+ igt_debugfs_simple_read(debugfs_fd, debugfs_file, buf,
sizeof(buf));
return strstr(buf, "PSR2 selective fetch: enabled");
@@ -54,11 +60,7 @@ static bool psr_active_check(int debugfs_fd,
enum
psr_mode mode, igt_output_t *o
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-
</pre>
<blockquote type="cite">
<pre class="moz-quote-pre" wrap="">name);
</pre>
</blockquote>
<pre class="moz-quote-pre" wrap="">- else
- sprintf(debugfs_file, "%s",
"i915_edp_psr_status");
-
+ SET_DEBUGFS_PATH(output, debugfs_file);
ret = igt_debugfs_simple_read(debugfs_fd, debugfs_file,
buf, sizeof(buf));
if (ret < 0) {
@@ -90,13 +92,18 @@ 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.
+ */
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 +112,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 +120,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 +141,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 +186,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 +200,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)
@@ -211,11 +218,7 @@ bool psr_sink_support(int device, int
debugfs_fd, enum psr_mode mode, igt_output
char buf[PSR_STATUS_MAX_LEN];
int ret;
- if (output)
- sprintf(debugfs_file, "%s/i915_psr_status",
output-
</pre>
<blockquote type="cite">
<pre class="moz-quote-pre" wrap="">name);
</pre>
</blockquote>
<pre class="moz-quote-pre" wrap="">- else
- sprintf(debugfs_file, "%s",
"i915_edp_psr_status");
-
+ SET_DEBUGFS_PATH(output, debugfs_file);
ret = igt_debugfs_simple_read(debugfs_fd, debugfs_file,
buf,
sizeof(buf));
if (ret < 1)
@@ -305,7 +308,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;
@@ -314,7 +317,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 = psr2_selective_fetch_check(debugfs_fd, output);
close(debugfs_fd);
return ret;
@@ -331,7 +334,7 @@ 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_psr2_sel_fetch_to_psr1(int drm_fd, igt_output_t
*output)
{
int debugfs_fd;
bool ret = false;
@@ -340,8 +343,8 @@ bool i915_psr2_sel_fetch_to_psr1(int 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 (psr2_selective_fetch_check(debugfs_fd, output)) {
+ psr_set(drm_fd, debugfs_fd, PSR_MODE_1, output);
ret = true;
}
@@ -355,12 +358,12 @@ 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_psr2_sel_fetch_restore(int drm_fd, igt_output_t
*output)
{
int debugfs_fd;
debugfs_fd = igt_debugfs_dir(drm_fd);
- psr_set(drm_fd, debugfs_fd, PSR_MODE_2_SEL_FETCH);
+ psr_set(drm_fd, debugfs_fd, PSR_MODE_2_SEL_FETCH,
output);
close(debugfs_fd);
}
@@ -369,16 +372,17 @@ 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};
int ret;
-
- ret = igt_debugfs_simple_read(debugfs_fd,
"i915_edp_psr_status", buf,
+ SET_DEBUGFS_PATH(output, debugfs_file);
+ 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..372bef2b2 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 psr2_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_psr2_sel_fetch_to_psr1(int drm_fd, igt_output_t
*output);
+void i915_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 26b82e50a..c2411c824 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-
</pre>
<blockquote type="cite">
<pre class="moz-quote-pre" wrap="">op_psr_mode);
</pre>
</blockquote>
<pre class="moz-quote-pre" wrap="">+ psr_enable(data->drm_fd, data->debugfs_fd, data-
</pre>
<blockquote type="cite">
<pre class="moz-quote-pre" wrap="">op_psr_mode,
</pre>
</blockquote>
<pre class="moz-quote-pre" wrap="">NULL);
igt_require_f(psr_wait_entry(data->debugfs_fd, data-
</pre>
<blockquote type="cite">
<pre class="moz-quote-pre" wrap="">op_psr_mode, NULL),
</pre>
</blockquote>
<pre class="moz-quote-pre" wrap=""> "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_enable
d(dat
a.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-
</pre>
<blockquote type="cite">
<pre class="moz-quote-pre" wrap="">op_psr_mode);
</pre>
</blockquote>
<pre class="moz-quote-pre" wrap="">+ return psr_enable(data->drm_fd, data->debugfs_fd, data-
</pre>
<blockquote type="cite">
<pre class="moz-quote-pre" wrap="">op_psr_mode, data->output);
</pre>
</blockquote>
<pre class="moz-quote-pre" wrap=""> }
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-
</pre>
<blockquote type="cite">
<pre class="moz-quote-pre" wrap="">output);
</pre>
</blockquote>
<pre class="moz-quote-pre" wrap=""> }
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");
-
</pre>
</blockquote>
<pre class="moz-quote-pre" wrap="">I started to think it might actually not make sense to remove this.
Currently kms_psr2_sf is skipped if psr debugfs interface doesn't
exist. I.e. PSR is not supported by the platform. This is with
reasonable info "PSR not available". After your change it will
assert
below as debugfs entry can't be opened.
BR,
Jouni Högander
</pre>
</blockquote>
<pre class="moz-quote-pre" wrap="">
Thanks for catching this,
How about having a check before looping on all output to check if we
have psr_debug interface present?
</pre>
</blockquote>
<pre class="moz-quote-pre" wrap="">
I think that is ok as well. But you can drop this change completely as
well.
BR,
Jouni Högander</pre>
</blockquote>
<p>I think we need to remove this check as we check specifically for
<span style="white-space: pre-wrap">PSR_MODE_2_SEL_FETCH
Even though it doesn't matter but for readability purpose. Let me know if you think otherwise.
Thanks and Regards
Kunal Joshi
</span></p>
<blockquote type="cite" cite="mid:225179de6cf4afe93bb499790b63cd1cf4fbc3e6.camel@intel.com">
<pre class="moz-quote-pre" wrap="">
</pre>
<blockquote type="cite">
<pre class="moz-quote-pre" wrap="">
Thanks and Regards
Kunal Joshi
</pre>
<blockquote type="cite">
<blockquote type="cite">
<pre class="moz-quote-pre" wrap=""> 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.deb
ugfs_f
d),
- "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-
</pre>
<blockquote type="cite">
<pre class="moz-quote-pre" wrap="">initial_state, NULL));
</pre>
</blockquote>
<pre class="moz-quote-pre" wrap=""> }
@@ -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-
</pre>
<blockquote type="cite">
<pre class="moz-quote-pre" wrap="">initial_state);
</pre>
</blockquote>
<pre class="moz-quote-pre" wrap="">+ igt_assert(psr_get_mode(data->debugfs_fd, NULL) == data-
</pre>
<blockquote type="cite">
<pre class="moz-quote-pre" wrap="">initial_state);
</pre>
</blockquote>
<pre class="moz-quote-pre" wrap=""> }
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-
</pre>
<blockquote type="cite">
<pre class="moz-quote-pre" wrap="">drm_fd),
</pre>
</blockquote>
<pre class="moz-quote-pre" wrap="">+ igt_skip_on_f(i915_psr2_selective_fetch_check(data-
</pre>
<blockquote type="cite">
<pre class="moz-quote-pre" wrap="">drm_fd,
</pre>
</blockquote>
<pre class="moz-quote-pre" wrap="">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(dat
a.drm_
fd),
+ igt_skip_on_f(i915_psr2_selective_fetch_check(dat
a.dr
m_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..a430f735a 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_psr2_sel_fetch_to_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_psr2_sel_fetch_restore(display.drm_f
d,
NULL);
igt_display_fini(&display);
drm_close_driver(display.drm_fd);
}
</pre>
</blockquote>
</blockquote>
</blockquote>
<pre class="moz-quote-pre" wrap="">
</pre>
</blockquote>
</body>
</html>