Run PSR2 and PR tests on panel supporting both
cover Run PSR2 and PR tests on panel supporting both
Currently we are running only PR tests on panel supporting PSR2 and PR. Running PSR2 tests as wel on such panel would provide us valuable information. This patch set is addressing that.
Also some other improvements is made and code is simplified:
- drop some complexity from fixture for detection of working PSR
- instead of "not run" "fail" on setup where PSR is broken already before kms_psr2_sf testcase is executed.
- drop et_flag from data_t and detect need for Early Transport check on fly.
Jouni Högander (3):
tests/intel/kms_psr2_sf: Drop Early Transport flag from data_t
kms_psr2_sf: Check pipe and output validity for Selective Fetch test tests/kms_psr2_sf: Allow testing of both PSR2 and Panel Replay if
supported
tests/intel/kms_psr2_sf.c | 241 +++++++++++++------------------------- 1 file changed, 79 insertions(+), 162 deletions(-)
Signature · 1 line
2.43.0
PATCH 1/3 tests/intel/kms_psr2_sf: Drop Early Transport flag from data_t
Implement helper to detect need for Early Transport check and use that to figure out if Early Transport check is needed. Drop et_flag from data_t.
--- tests/intel/kms_psr2_sf.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-)
tests/intel/kms_psr2_sf.c +17 -9
@@ -223,7 +223,6 @@ typedef struct {igt_plane_t *test_plane;bool big_fb_test;bool fbc_flag; -bool et_flag;cairo_t *cr;uint32_t screen_changes;int cur_x, cur_y;
@@ -236,27 +235,38 @@ typedef struct { } coexist_feature; } data_t; +static bool is_et_check_needed (data_t *data) +{ +switch (data->psr_mode) { +case PR_MODE_SEL_FETCH : +case PR_MODE_SEL_FETCH_ET : +return true; +case PSR_MODE_2 : +case PSR_MODE_2_SEL_FETCH : +case PSR_MODE_2_ET : +return psr_sink_support (data->drm_fd, data->debugfs_fd, +PSR_MODE_2_ET , data->output); +default : +igt_assert (false); + } +} +static bool set_sel_fetch_mode_for_output (data_t *data) {bool supported = false; - data->et_flag = false; -if (psr_sink_support (data->drm_fd, data->debugfs_fd,PR_MODE_SEL_FETCH_ET , data->output)) { supported = true; data->psr_mode =PR_MODE_SEL_FETCH ; - data->et_flag = true; }else if (psr_sink_support (data->drm_fd, data->debugfs_fd,PR_MODE_SEL_FETCH , data->output)) { supported = true; data->psr_mode =PR_MODE_SEL_FETCH ; - data->et_flag = true; }else if (psr_sink_support (data->drm_fd, data->debugfs_fd,PSR_MODE_2_ET , data->output)) { supported = true; data->psr_mode =PSR_MODE_2 ; - data->et_flag = true; }else if (psr_sink_support (data->drm_fd, data->debugfs_fd,PSR_MODE_2 , data->output)) { supported = true;
@@ -978,9 +988,7 @@ static void run(data_t *data) data->pipe), "FBC still disabled\n"); -/* TODO: Enable this check if other connectors support Early Transport */ -if (data->et_flag && data->output !=NULL && - data->output->config.connector->connector_type == DRM_MODE_CONNECTOR_eDP) +if (is_et_check_needed (data))igt_assert_f (early_transport_check (data->debugfs_fd),"Early Transport Disabled\n" );
Signature · 1 line
2.43.0
PATCH 2/3 kms_psr2_sf: Check pipe and output validity for Selective Fetch test
In reply to Jouni HöganderThere are some restrictions in pipe usage for PSR2/PR Selective Fetch. Implement helper to checks these restrictions and use it to figure out if pipe/PSR/PR combo in data_t is valid. Also check if used output supports PSR/PR.
--- tests/intel/kms_psr2_sf.c | 134 ++++++++++++++++++++++---------------- 1 file changed, 78 insertions(+), 56 deletions(-)
tests/intel/kms_psr2_sf.c +78 -56
@@ -1084,18 +1084,37 @@ static bool check_pr_psr2_sel_fetch_support(data_t *data)return status; } +static bool sel_fetch_pipe_combo_valid (data_t *data) +{ +if (intel_display_ver (intel_get_drm_devid (data->drm_fd)) <14 && + !IS_ALDERLAKE_S (intel_get_drm_devid (data->drm_fd)) && data->pipe !=PIPE_A ) +return false; + +if (data->output->config.connector->connector_type == DRM_MODE_CONNECTOR_eDP && + data->pipe !=PIPE_A && data->pipe !=PIPE_B ) +return false; + +return true; +} +static bool -pipe_output_combo_valid (igt_display_t *display, -enum pipe pipe,igt_output_t *output) +pipe_output_combo_valid (data_t *data) { -bool ret = true; +bool ret =psr_sink_support (data->drm_fd, data->debugfs_fd, + data->psr_mode, data->output); +if (!ret) +return ret; + + ret =sel_fetch_pipe_combo_valid (data); +if (!ret) +return ret; -igt_display_reset (display); +igt_display_reset (&data->display); -igt_output_set_pipe (output, pipe); -if (!intel_pipe_output_combo_valid (display)) +igt_output_set_pipe (data->output, data->pipe); +if (!intel_pipe_output_combo_valid (&data->display)) ret = false; -igt_output_set_pipe (output,PIPE_NONE ); +igt_output_set_pipe (data->output,PIPE_NONE );return ret; }
@@ -1264,11 +1283,12 @@ igt_main append_psr_subtest[z], op_str(data.op)) {for (i =0 ; i < n_pipes; i++) { -if (!pipe_output_combo_valid (&data.display, - pipes[i], outputs[i])) -continue ; data.pipe = pipes[i]; data.output = outputs[i]; + +if (!pipe_output_combo_valid (&data)) +continue ; +igt_assert_f (set_sel_fetch_mode_for_output (&data),"Selective fetch is not supported\n" );
@@ -1290,11 +1310,12 @@ igt_main append_psr_subtest[z], op_str(data.op)) {for (i =0 ; i < n_pipes; i++) { -if (!pipe_output_combo_valid (&data.display, - pipes[i], outputs[i])) -continue ; data.pipe = pipes[i]; data.output = outputs[i]; + +if (!pipe_output_combo_valid (&data)) +continue ; +igt_assert_f (set_sel_fetch_mode_for_output (&data),"Selective fetch is not supported\n" );if (!check_psr_mode_supported (&data, psr_status[z]))
@@ -1315,12 +1336,12 @@ igt_main append_psr_subtest[z], op_str(data.op)) {for (i =0 ; i < n_pipes; i++) { -if (!pipe_output_combo_valid (&data.display, - pipes[i], - outputs[i])) -continue ; data.pipe = pipes[i]; data.output = outputs[i]; + +if (!pipe_output_combo_valid (&data)) +continue ; +igt_assert_f (set_sel_fetch_mode_for_output (&data),"Selective fetch is not supported\n" );if (!check_psr_mode_supported (&data, psr_status[z]))
@@ -1337,12 +1358,12 @@ igt_mainigt_subtest_with_dynamic_f ("%s%scursor-%s-sf" , append_fbc_subtest[y], append_psr_subtest[z], op_str(data.op)) {for (i =0 ; i < n_pipes; i++) { -if (!pipe_output_combo_valid (&data.display, - pipes[i], - outputs[i])) -continue ; data.pipe = pipes[i]; data.output = outputs[i]; + +if (!pipe_output_combo_valid (&data)) +continue ; +igt_assert_f (set_sel_fetch_mode_for_output (&data),"Selective fetch is not supported\n" );if (!check_psr_mode_supported (&data, psr_status[z]))
@@ -1359,12 +1380,12 @@ igt_mainigt_subtest_with_dynamic_f ("%s%scursor-%s-sf" , append_fbc_subtest[y], append_psr_subtest[z], op_str(data.op)) {for (i =0 ; i < n_pipes; i++) { -if (!pipe_output_combo_valid (&data.display, - pipes[i], - outputs[i])) -continue ; data.pipe = pipes[i]; data.output = outputs[i]; + +if (!pipe_output_combo_valid (&data)) +continue ; +igt_assert_f (set_sel_fetch_mode_for_output (&data),"Selective fetch is not supported\n" );if (!check_psr_mode_supported (&data, psr_status[z]))
@@ -1381,12 +1402,12 @@ igt_mainigt_subtest_with_dynamic_f ("%s%scursor-%s-sf" , append_fbc_subtest[y], append_psr_subtest[z], op_str(data.op)) {for (i =0 ; i < n_pipes; i++) { -if (!pipe_output_combo_valid (&data.display, - pipes[i], - outputs[i])) -continue ; data.pipe = pipes[i]; data.output = outputs[i]; + +if (!pipe_output_combo_valid (&data)) +continue ; +igt_assert_f (set_sel_fetch_mode_for_output (&data),"Selective fetch is not supported\n" );if (!check_psr_mode_supported (&data, psr_status[z]))
@@ -1403,12 +1424,12 @@ igt_mainigt_subtest_with_dynamic_f ("%s%scursor-%s-sf" , append_fbc_subtest[y], append_psr_subtest[z], op_str(data.op)) {for (i =0 ; i < n_pipes; i++) { -if (!pipe_output_combo_valid (&data.display, - pipes[i], - outputs[i])) -continue ; data.pipe = pipes[i]; data.output = outputs[i]; + +if (!pipe_output_combo_valid (&data)) +continue ; +igt_assert_f (set_sel_fetch_mode_for_output (&data),"Selective fetch is not supported\n" );if (!check_psr_mode_supported (&data, psr_status[z]))
@@ -1426,12 +1447,12 @@ igt_mainigt_subtest_with_dynamic_f ("%s%s%s-sf-dmg-area" , append_fbc_subtest[y], append_psr_subtest[z], op_str(data.op)) {for (i =0 ; i < n_pipes; i++) { -if (!pipe_output_combo_valid (&data.display, - pipes[i], - outputs[i])) -continue ; data.pipe = pipes[i]; data.output = outputs[i]; + +if (!pipe_output_combo_valid (&data)) +continue ; +igt_assert_f (set_sel_fetch_mode_for_output (&data),"Selective fetch is not supported\n" );if (!check_psr_mode_supported (&data, psr_status[z]))
@@ -1447,12 +1468,12 @@ igt_mainigt_subtest_with_dynamic_f ("%s%soverlay-%s-sf" , append_fbc_subtest[y], append_psr_subtest[z], op_str(data.op)) {for (i =0 ; i < n_pipes; i++) { -if (!pipe_output_combo_valid (&data.display, - pipes[i], - outputs[i])) -continue ; data.pipe = pipes[i]; data.output = outputs[i]; + +if (!pipe_output_combo_valid (&data)) +continue ; +igt_assert_f (set_sel_fetch_mode_for_output (&data),"Selective fetch is not supported\n" );if (!check_psr_mode_supported (&data, psr_status[z]))
@@ -1469,12 +1490,12 @@ igt_mainigt_subtest_with_dynamic_f ("%s%soverlay-%s-sf" , append_fbc_subtest[y], append_psr_subtest[z], op_str(data.op)) {for (i =0 ; i < n_pipes; i++) { -if (!pipe_output_combo_valid (&data.display, - pipes[i], - outputs[i])) -continue ; data.pipe = pipes[i]; data.output = outputs[i]; + +if (!pipe_output_combo_valid (&data)) +continue ; +igt_assert_f (set_sel_fetch_mode_for_output (&data),"Selective fetch is not supported\n" );if (!check_psr_mode_supported (&data, psr_status[z]))
@@ -1491,11 +1512,12 @@ igt_mainigt_subtest_with_dynamic_f ("%s%soverlay-%s-sf" , append_fbc_subtest[y], append_psr_subtest[z], op_str(data.op)) {for (i =0 ; i < n_pipes; i++) { -if (!pipe_output_combo_valid (&data.display, pipes[i], - outputs[i])) -continue ; data.pipe = pipes[i]; data.output = outputs[i]; + +if (!pipe_output_combo_valid (&data)) +continue ; +igt_assert_f (set_sel_fetch_mode_for_output (&data),"Selective fetch is not supported\n" );if (!check_psr_mode_supported (&data, psr_status[z]))
@@ -1513,12 +1535,12 @@ igt_mainigt_subtest_with_dynamic_f ("%s%s%s-sf-dmg-area" , append_fbc_subtest[y], append_psr_subtest[z], op_str(data.op)) {for (i =0 ; i < n_pipes; i++) { -if (!pipe_output_combo_valid (&data.display, - pipes[i], - outputs[i])) -continue ; data.pipe = pipes[i]; data.output = outputs[i]; + +if (!pipe_output_combo_valid (&data)) +continue ; +igt_assert_f (set_sel_fetch_mode_for_output (&data),"Selective fetch is not supported\n" );if (!check_psr_mode_supported (&data, psr_status[z]))
@@ -1538,12 +1560,12 @@ igt_mainigt_subtest_with_dynamic_f ("%s%soverlay-%s-sf" , append_fbc_subtest[y], append_psr_subtest[z], op_str(data.op)) {for (i =0 ; i < n_pipes; i++) { -if (!pipe_output_combo_valid (&data.display, - pipes[i], - outputs[i])) -continue ; data.pipe = pipes[i]; data.output = outputs[i]; + +if (!pipe_output_combo_valid (&data)) +continue ; +igt_assert_f (set_sel_fetch_mode_for_output (&data),"Selective fetch is not supported\n" );if (!check_psr_mode_supported (&data, psr_status[z]))
Signature · 1 line
2.43.0
PATCH 3/3 tests/kms_psr2_sf: Allow testing of both PSR2 and Panel Replay if supported
In reply to Jouni HöganderCurrently kms_psr2_sf is testing only Panel Replay even if PSR2 is supported. Allow testing both PSR2 and Panel Replay when supported.
Also drop some complexity from fixture for detection of working PSR. Earlier working PSR support was detected in fixture by enabling PSR and then ensuring PSR entry happens. Now we are relying on pipe_output_combo_valid. Earlier approach was problematic as PSR Might be broken due to some earlier test which was run. This caused kms_psr2_sf to not run any tests on that sink/pipe setup. Now these are supposed to be visible as failing testcases.
--- tests/intel/kms_psr2_sf.c | 153 +++++--------------------------------- 1 file changed, 20 insertions(+), 133 deletions(-)
tests/intel/kms_psr2_sf.c +20 -133
@@ -251,36 +251,6 @@ static bool is_et_check_needed(data_t *data) } } -static bool set_sel_fetch_mode_for_output (data_t *data) -{ -bool supported = false; - -if (psr_sink_support (data->drm_fd, data->debugfs_fd, -PR_MODE_SEL_FETCH_ET , data->output)) { - supported = true; - data->psr_mode =PR_MODE_SEL_FETCH ; - }else if (psr_sink_support (data->drm_fd, data->debugfs_fd, -PR_MODE_SEL_FETCH , data->output)) { - supported = true; - data->psr_mode =PR_MODE_SEL_FETCH ; - }else if (psr_sink_support (data->drm_fd, data->debugfs_fd, -PSR_MODE_2_ET , data->output)) { - supported = true; - data->psr_mode =PSR_MODE_2 ; - }else if (psr_sink_support (data->drm_fd, data->debugfs_fd, -PSR_MODE_2 , data->output)) { - supported = true; - data->psr_mode =PSR_MODE_2 ; - }else -igt_info ("selective fetch not supported on output %s\n" , data->output->name); - -if (supported) - supported =psr_enable (data->drm_fd, data->debugfs_fd, data->psr_mode, - data->output); - -return supported; -} -static const char *op_str (enum operations op) {static const char *const name[] = {
@@ -429,6 +399,9 @@ static void prepare(data_t *data)igt_plane_t *primary, *sprite =NULL , *cursor =NULL ;int fb_w, fb_h, x, y, view_w, view_h; +psr_enable (data->drm_fd, data->debugfs_fd, data->psr_mode, + data->output); + data->mode =igt_output_get_mode (output);if (data->coexist_feature &FEATURE_DSC ) {
@@ -1065,25 +1038,6 @@ static void cleanup(data_t *data)igt_remove_fb (data->drm_fd, &data->fb_test); } -static bool check_pr_psr2_sel_fetch_support (data_t *data) -{ -bool status = false; - -/* Check sink supports PR/PSR2 selective fetch */ -if (!set_sel_fetch_mode_for_output (data)) -return false; - -/* Check if selective fetch can be enabled */ -if (!selective_fetch_check (data->debugfs_fd, data->output)) -igt_assert ("Selective fetch is not enabled even though panel should support it\n" ); - -prepare (data); -/* We enter into DEEP_SLEEP for both PSR2 and PR sel fetch */ - status =psr_wait_entry (data->debugfs_fd, data->psr_mode, data->output); -cleanup (data); -return status; -} -static bool sel_fetch_pipe_combo_valid (data_t *data) { if (intel_display_ver(intel_get_drm_devid(data->drm_fd)) < 14 &&
@@ -1119,14 +1073,6 @@ pipe_output_combo_valid(data_t *data)return ret; } -static bool check_psr_mode_supported (data_t *data,int psr_stat) -{ -if (data->psr_mode == psr_stat) -return true; -else -return false; -} -static void run_dynamic_test_damage_areas (data_t data,int i,int coexist_features[]) {for (int j =FEATURE_NONE ; j <FEATURE_COUNT ; j++) {
@@ -1247,18 +1193,25 @@ igt_main data.big_fb_width, data.big_fb_height);for_each_pipe_with_valid_output (&data.display, data.pipe, data.output) { - coexist_features[n_pipes] =0 ; - output_supports_pr_psr2_sel_fetch =check_pr_psr2_sel_fetch_support (&data); -if (output_supports_pr_psr2_sel_fetch) { - pipes[n_pipes] = data.pipe; - outputs[n_pipes] = data.output; +for (i =0 ; i <ARRAY_SIZE (psr_status); i++) { + data.psr_mode = psr_status[i]; + output_supports_pr_psr2_sel_fetch =pipe_output_combo_valid (&data); +if (output_supports_pr_psr2_sel_fetch) +break ; + } -if (is_dsc_supported_by_sink (data.drm_fd, data.output)) - coexist_features[n_pipes] |=FEATURE_DSC ; +if (!output_supports_pr_psr2_sel_fetch) +continue ; - n_pipes++; - } - pr_psr2_sel_fetch_supported |= output_supports_pr_psr2_sel_fetch; + pipes[n_pipes] = data.pipe; + outputs[n_pipes] = data.output; + + coexist_features[n_pipes] =0 ; +if (is_dsc_supported_by_sink (data.drm_fd, data.output)) + coexist_features[n_pipes] |=FEATURE_DSC ; + + n_pipes++; + pr_psr2_sel_fetch_supported = true; }igt_require_f (pr_psr2_sel_fetch_supported,"No output supports selective fetch\n" );
@@ -1289,12 +1242,6 @@ igt_mainif (!pipe_output_combo_valid (&data))continue ; -igt_assert_f (set_sel_fetch_mode_for_output (&data), -"Selective fetch is not supported\n" ); - -if (!check_psr_mode_supported (&data, psr_status[z])) -continue ; - data.test_plane_id =DRM_PLANE_TYPE_PRIMARY ;run_dynamic_test_damage_areas (data, i, coexist_features); }
@@ -1316,11 +1263,6 @@ igt_mainif (!pipe_output_combo_valid (&data))continue ; -igt_assert_f (set_sel_fetch_mode_for_output (&data), -"Selective fetch is not supported\n" ); -if (!check_psr_mode_supported (&data, psr_status[z])) -continue ; - data.test_plane_id =DRM_PLANE_TYPE_PRIMARY ;run_dynamic_test_damage_areas (data, i, coexist_features);
@@ -1342,11 +1284,6 @@ igt_mainif (!pipe_output_combo_valid (&data))continue ; -igt_assert_f (set_sel_fetch_mode_for_output (&data), -"Selective fetch is not supported\n" ); -if (!check_psr_mode_supported (&data, psr_status[z])) -continue ; - data.test_plane_id =DRM_PLANE_TYPE_OVERLAY ;run_dynamic_test_damage_areas (data, i, coexist_features); }
@@ -1364,11 +1301,6 @@ igt_mainif (!pipe_output_combo_valid (&data))continue ; -igt_assert_f (set_sel_fetch_mode_for_output (&data), -"Selective fetch is not supported\n" ); -if (!check_psr_mode_supported (&data, psr_status[z])) -continue ; - data.test_plane_id =DRM_PLANE_TYPE_CURSOR ;run_dynamic_test (data, i, coexist_features); }
@@ -1386,11 +1318,6 @@ igt_mainif (!pipe_output_combo_valid (&data))continue ; -igt_assert_f (set_sel_fetch_mode_for_output (&data), -"Selective fetch is not supported\n" ); -if (!check_psr_mode_supported (&data, psr_status[z])) -continue ; - data.test_plane_id =DRM_PLANE_TYPE_CURSOR ;run_dynamic_test (data, i, coexist_features); }
@@ -1408,11 +1335,6 @@ igt_mainif (!pipe_output_combo_valid (&data))continue ; -igt_assert_f (set_sel_fetch_mode_for_output (&data), -"Selective fetch is not supported\n" ); -if (!check_psr_mode_supported (&data, psr_status[z])) -continue ; - data.test_plane_id =DRM_PLANE_TYPE_CURSOR ;run_dynamic_test (data, i, coexist_features); }
@@ -1430,11 +1352,6 @@ igt_mainif (!pipe_output_combo_valid (&data))continue ; -igt_assert_f (set_sel_fetch_mode_for_output (&data), -"Selective fetch is not supported\n" ); -if (!check_psr_mode_supported (&data, psr_status[z])) -continue ; - data.test_plane_id =DRM_PLANE_TYPE_CURSOR ;run_dynamic_test (data, i, coexist_features); }
@@ -1453,11 +1370,6 @@ igt_mainif (!pipe_output_combo_valid (&data))continue ; -igt_assert_f (set_sel_fetch_mode_for_output (&data), -"Selective fetch is not supported\n" ); -if (!check_psr_mode_supported (&data, psr_status[z])) -continue ; -run_plane_move (data, i, coexist_features); } }
@@ -1474,11 +1386,6 @@ igt_mainif (!pipe_output_combo_valid (&data))continue ; -igt_assert_f (set_sel_fetch_mode_for_output (&data), -"Selective fetch is not supported\n" ); -if (!check_psr_mode_supported (&data, psr_status[z])) -continue ; - data.test_plane_id =DRM_PLANE_TYPE_OVERLAY ;run_dynamic_test (data, i, coexist_features); }
@@ -1496,11 +1403,6 @@ igt_mainif (!pipe_output_combo_valid (&data))continue ; -igt_assert_f (set_sel_fetch_mode_for_output (&data), -"Selective fetch is not supported\n" ); -if (!check_psr_mode_supported (&data, psr_status[z])) -continue ; - data.test_plane_id =DRM_PLANE_TYPE_OVERLAY ;run_dynamic_test (data, i, coexist_features); }
@@ -1518,11 +1420,6 @@ igt_mainif (!pipe_output_combo_valid (&data))continue ; -igt_assert_f (set_sel_fetch_mode_for_output (&data), -"Selective fetch is not supported\n" ); -if (!check_psr_mode_supported (&data, psr_status[z])) -continue ; - data.test_plane_id =DRM_PLANE_TYPE_OVERLAY ;run_dynamic_test (data, i, coexist_features); }
@@ -1541,11 +1438,6 @@ igt_mainif (!pipe_output_combo_valid (&data))continue ; -igt_assert_f (set_sel_fetch_mode_for_output (&data), -"Selective fetch is not supported\n" ); -if (!check_psr_mode_supported (&data, psr_status[z])) -continue ; - data.test_plane_id =DRM_PLANE_TYPE_PRIMARY ;run_dynamic_test_damage_areas (data, i, coexist_features); }
@@ -1566,11 +1458,6 @@ igt_mainif (!pipe_output_combo_valid (&data))continue ; -igt_assert_f (set_sel_fetch_mode_for_output (&data), -"Selective fetch is not supported\n" ); -if (!check_psr_mode_supported (&data, psr_status[z])) -continue ; -run_plane_update_continuous (data, i, coexist_features); } }
Signature · 1 line
2.43.0
Patchwork
CI✗ Fi.CI.BUILD: failure for Run PSR2 and PR tests on panel supporting both
In reply to Jouni Högander== Series Details ==
== Series Details ==
Series: Run PSR2 and PR tests on panel supporting both
URL : https://patchwork.freedesktop.org/series/161016/
State : failure
== Summary ==
Applying: tests/intel/kms_psr2_sf: Drop Early Transport flag from data_t Using index info to reconstruct a base tree...
M tests/intel/kms_psr2_sf.c
Falling back to patching base and 3-way merge...
Auto-merging tests/intel/kms_psr2_sf.c
Applying: kms_psr2_sf: Check pipe and output validity for Selective Fetch test Using index info to reconstruct a base tree...
M tests/intel/kms_psr2_sf.c
Falling back to patching base and 3-way merge...
Auto-merging tests/intel/kms_psr2_sf.c
CONFLICT (content): Merge conflict in tests/intel/kms_psr2_sf.c
Patch failed at 0002 kms_psr2_sf: Check pipe and output validity for Selective Fetch test When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".