Return-Path: Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9AB976E7D3 for ; Mon, 26 Apr 2021 10:31:35 +0000 (UTC) From: Bhanuprakash Modem Date: Mon, 26 Apr 2021 23:51:30 +0530 Message-Id: <20210426182136.2815-9-bhanuprakash.modem@intel.com> In-Reply-To: <20210426182136.2815-1-bhanuprakash.modem@intel.com> References: <20210426182136.2815-1-bhanuprakash.modem@intel.com> MIME-Version: 1.0 Subject: [igt-dev] [v3 i-g-t 08/14] tests/kms_plane: Reset the state before exiting the test List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org List-ID: Before starting the next subtest, clean up the states to default values, those are assumed by other tests. This patch will also fix few typos & depricated macros. Cc: Imre Deak Cc: Ankit Nautiyal Cc: Daniel Vetter Signed-off-by: Bhanuprakash Modem --- tests/kms_plane.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/tests/kms_plane.c b/tests/kms_plane.c index 9fe253a8c..bea3cef00 100644 --- a/tests/kms_plane.c +++ b/tests/kms_plane.c @@ -132,7 +132,7 @@ test_grab_crc(data_t *data, igt_output_t *output, enum pipe pipe, igt_output_set_pipe(output, pipe); - primary = igt_output_get_plane(output, 0); + primary = igt_output_get_plane(output, DRM_PLANE_TYPE_PRIMARY); mode = igt_output_get_mode(output); if (flags & TEST_POSITION_PARTIALLY_COVERED) { @@ -251,7 +251,11 @@ test_plane_position_with_output(data_t *data, igt_plane_set_fb(sprite, NULL); /* reset the constraint on the pipe */ - igt_output_set_pipe(output, PIPE_ANY); + igt_output_set_pipe(output, PIPE_NONE); + igt_display_commit2(&data->display, data->display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); + + igt_remove_fb(data->drm_fd, &primary_fb); + igt_remove_fb(data->drm_fd, &sprite_fb); } static void @@ -288,7 +292,7 @@ test_plane_position(data_t *data, enum pipe pipe, unsigned int flags) * (vdisplay, hdisplay) we do get the same CRC than the full blue fb. */ static void -create_fb_for_mode__panning(data_t *data, drmModeModeInfo *mode, +create_fb_for_mode_panning(data_t *data, drmModeModeInfo *mode, struct igt_fb *fb /* out */) { unsigned int fb_id; @@ -332,9 +336,9 @@ test_plane_panning_with_output(data_t *data, igt_output_set_pipe(output, pipe); mode = igt_output_get_mode(output); - primary = igt_output_get_plane(output, 0); + primary = igt_output_get_plane(output, DRM_PLANE_TYPE_PRIMARY); - create_fb_for_mode__panning(data, mode, &primary_fb); + create_fb_for_mode_panning(data, mode, &primary_fb); igt_plane_set_fb(primary, &primary_fb); if (flags & TEST_PANNING_TOP_LEFT) @@ -355,8 +359,11 @@ test_plane_panning_with_output(data_t *data, igt_plane_set_fb(primary, NULL); /* reset states to neutral values, assumed by other tests */ - igt_output_set_pipe(output, PIPE_ANY); + igt_output_set_pipe(output, PIPE_NONE); igt_fb_set_position(&primary_fb, primary, 0, 0); + igt_display_commit2(&data->display, data->display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); + + igt_remove_fb(data->drm_fd, &primary_fb); } static void -- 2.20.1 _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev