From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: igt-dev@lists.freedesktop.org
Subject: [igt-dev] [PATCH i-g-t 3/3] tests/kms_rmfb: Use COMMIT_UNIVERSAL for overlay/cursor planes
Date: Fri, 29 Nov 2019 16:30:48 +0200 [thread overview]
Message-ID: <20191129143048.1936-3-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20191129143048.1936-1-ville.syrjala@linux.intel.com>
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Using COMMIT_LEGACY for the cursor plane makes the test fail
because the cursor framebuffer is never handed over to the
kernel, and instead only the BO gets passed in via the
legacy cursor ioctl. Thus the rmfb ioctl will not turn off
the cursor plane since the kernel is using an internal fb
for the cursor. Let's avoid that by treating the cursor as
just another universal plane.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
tests/kms_rmfb.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tests/kms_rmfb.c b/tests/kms_rmfb.c
index a7fcab87233a..5cfb0286d90c 100644
--- a/tests/kms_rmfb.c
+++ b/tests/kms_rmfb.c
@@ -87,8 +87,10 @@ test_rmfb(struct rmfb_data *data, igt_output_t *output, enum pipe pipe, bool reo
igt_plane_set_fb(plane, &fb);
}
- if (igt_display_try_commit2(&data->display, data->display.is_atomic ?
- COMMIT_ATOMIC : COMMIT_LEGACY)) {
+ if (igt_display_try_commit2(&data->display,
+ data->display.is_atomic ? COMMIT_ATOMIC :
+ plane->type == DRM_PLANE_TYPE_PRIMARY ?
+ COMMIT_LEGACY : COMMIT_UNIVERSAL)) {
/*
* Disable any plane that fails (presumably
* due to exceeding some hardware limit).
--
2.23.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
next prev parent reply other threads:[~2019-11-29 14:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-29 14:30 [igt-dev] [PATCH i-g-t 1/3] lib/igt_draw: BCS_SWCTRL is gen6+ Ville Syrjala
2019-11-29 14:30 ` [igt-dev] [PATCH i-g-t 2/3] lib/igt_draw: Fix blt tiled stride for gen2/3 Ville Syrjala
2019-11-29 15:08 ` Chris Wilson
2019-11-29 14:30 ` Ville Syrjala [this message]
2019-11-29 15:04 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,1/3] lib/igt_draw: BCS_SWCTRL is gen6+ Patchwork
2019-11-29 15:07 ` [igt-dev] [PATCH i-g-t 1/3] " Chris Wilson
2019-11-30 10:39 ` [igt-dev] ✗ Fi.CI.IGT: failure for series starting with [i-g-t,1/3] " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191129143048.1936-3-ville.syrjala@linux.intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=igt-dev@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox