diff options
author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2017-09-21 14:30:09 +0200 |
---|---|---|
committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2017-10-20 11:17:31 +0200 |
commit | 5e42c6232dab3a7bb96963aec5a9f90e169df20c (patch) | |
tree | 7712cde4dec9ad8782df956cf67c9bfc412c266b /tests | |
parent | 13ead623602b6f60033a2258d17f34094f1418be (diff) |
lib/igt_kms: Rework plane properties to be more atomic, v5.
In the future I want to allow tests to commit more properties,
but for this to work I have to fix all properties to work better
with atomic commit. Instead of special casing each
property make a bitmask for all property changed flags, and try to
commit all properties.
Changes since v1:
- Remove special dumping of src and crtc coordinates.
- Dump all modified coordinates.
Changes since v2:
- Move igt_plane_set_prop_changed up slightly.
Changes since v3:
- Fix wrong ordering of set_position in kms_plane_lowres causing a test failure.
Changes since v4:
- Back out resetting crtc position in igt_plane_set_fb() and
document it during init. Tests appear to rely on it being preserved.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Mika Kahola <mika.kahola@intel.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/kms_atomic_interruptible.c | 12 | ||||
-rw-r--r-- | tests/kms_rotation_crc.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/kms_atomic_interruptible.c b/tests/kms_atomic_interruptible.c index dcdbc267d..4a2a57741 100644 --- a/tests/kms_atomic_interruptible.c +++ b/tests/kms_atomic_interruptible.c @@ -163,12 +163,12 @@ static void run_plane_test(igt_display_t *display, enum pipe pipe, igt_output_t /* connector: 1 prop */ output->props[IGT_CONNECTOR_CRTC_ID], /* plane: remainder props */ - plane->atomic_props_plane[IGT_PLANE_CRTC_ID], - plane->atomic_props_plane[IGT_PLANE_FB_ID], - plane->atomic_props_plane[IGT_PLANE_SRC_W], - plane->atomic_props_plane[IGT_PLANE_SRC_H], - plane->atomic_props_plane[IGT_PLANE_CRTC_W], - plane->atomic_props_plane[IGT_PLANE_CRTC_H] + plane->props[IGT_PLANE_CRTC_ID], + plane->props[IGT_PLANE_FB_ID], + plane->props[IGT_PLANE_SRC_W], + plane->props[IGT_PLANE_SRC_H], + plane->props[IGT_PLANE_CRTC_W], + plane->props[IGT_PLANE_CRTC_H] }; uint64_t prop_vals[] = { /* crtc */ diff --git a/tests/kms_rotation_crc.c b/tests/kms_rotation_crc.c index 5aec8fa39..b8327dfa0 100644 --- a/tests/kms_rotation_crc.c +++ b/tests/kms_rotation_crc.c @@ -122,11 +122,11 @@ static void prepare_crtc(data_t *data, igt_output_t *output, enum pipe pipe, igt_plane_set_fb(primary, &data->fb_modeset); if (commit < COMMIT_ATOMIC) { - primary->rotation_changed = false; + igt_plane_clear_prop_changed(primary, IGT_PLANE_ROTATION); igt_display_commit(display); if (plane->type == DRM_PLANE_TYPE_PRIMARY) - primary->rotation_changed = true; + igt_plane_set_prop_changed(primary, IGT_PLANE_ROTATION); } igt_plane_set_fb(plane, NULL); |