[igt-dev] [PATCH] tests/kms_plane_scaling: Free leaking fbs

[igt-dev] [PATCH] tests/kms_plane_scaling: Free leaking fbs

[Drew Davenport]

When kms_plane_scaling is run without specifying a subtest, the last
several subtests fail due to "Too mange scaling requests". However, each
subtest would pass when run individually (i.e. with --run-subtest). This
seems to be related to fbs allocated for the invalid-num-scalers test
not being released.

Auditing the rest of the test cases shows that the fbs created in
test_scaler_with_multi_pipe_plane are not being released either, so
ensure those are released as well.

Signed-off-by: Drew Davenport <ddavenport@chromium.org>

---

 tests/kms_plane_scaling.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/kms_plane_scaling.c b/tests/kms_plane_scaling.c
index 4c621cce..be3c8dca 100644
--- a/tests/kms_plane_scaling.c
+++ b/tests/kms_plane_scaling.c
@@ -366,6 +366,7 @@ static void check_scaling_pipe_plane_rot(data_t *d, igt_plane_t *plane,
 
 	igt_plane_set_fb(plane, NULL);
 	igt_plane_set_position(plane, 0, 0);
+	igt_remove_fb(display->drm_fd, &d->fb[0]);
 
 	igt_skip_on_f(commit_ret == -ERANGE || commit_ret == -EINVAL,
 		      "Unsupported scaling factor with fb size %dx%d\n",
@@ -814,6 +815,11 @@ static void test_scaler_with_multi_pipe_plane(data_t *d)
 	igt_plane_set_fb(plane[2], NULL);
 	igt_plane_set_fb(plane[3], NULL);
 
+	igt_remove_fb(display->drm_fd, &d->fb[0]);
+	igt_remove_fb(display->drm_fd, &d->fb[1]);
+	igt_remove_fb(display->drm_fd, &d->fb[2]);
+	igt_remove_fb(display->drm_fd, &d->fb[3]);
+
 	igt_skip_on_f(ret1 == -ERANGE || ret1 == -EINVAL ||
 		      ret2 == -ERANGE || ret1 == -EINVAL,
 		      "Scaling op is not supported by driver\n");
-- 
2.39.0.314.g84b9a713c41-goog

[igt-dev] ✗ Fi.CI.BUILD: failure for tests/kms_plane_scaling: Free leaking fbs

[Patchwork]

== Series Details ==

Series: tests/kms_plane_scaling: Free leaking fbs
URL   : https://patchwork.freedesktop.org/series/112822/
State : failure

== Summary ==

Applying: tests/kms_plane_scaling: Free leaking fbs
Using index info to reconstruct a base tree...
M	tests/kms_plane_scaling.c
Falling back to patching base and 3-way merge...
Auto-merging tests/kms_plane_scaling.c
CONFLICT (content): Merge conflict in tests/kms_plane_scaling.c
Patch failed at 0001 tests/kms_plane_scaling: Free leaking fbs
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".

Re: [igt-dev] [PATCH] tests/kms_plane_scaling: Free leaking fbs

[Drew Davenport]

It looks like this is already fixed by another recent change. Sorry for
the noise, and please disregard.

Drew