From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by gabe.freedesktop.org (Postfix) with ESMTPS id 860E0899DB for ; Tue, 18 Aug 2020 19:35:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6E90381F021 for ; Tue, 18 Aug 2020 19:35:41 +0000 (UTC) From: Lyude Date: Tue, 18 Aug 2020 15:35:28 -0400 Message-Id: <20200818193528.986926-2-lyude@redhat.com> In-Reply-To: <20200818193528.986926-1-lyude@redhat.com> References: <20200818193528.986926-1-lyude@redhat.com> MIME-Version: 1.0 Subject: [igt-dev] [PATCH i-g-t v2 2/2] tests/kms_pipe_crc_basic: Add disable-crc-after-crtc-pipe-* tests 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: From: Lyude Paul I ended up hitting some bugs when writing nouveau's CRC implementation due to incorrectly handling the situation where we disable CRCs on a pipe that already been disabled, which ended up causing some other vague igt issues when running certain tests in multi-mode. So, let's add a trivial test for this scenario while we're at it. v2: * Rebased * Write test description for new tests Signed-off-by: Lyude Paul --- tests/kms_pipe_crc_basic.c | 40 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/tests/kms_pipe_crc_basic.c b/tests/kms_pipe_crc_basic.c index 53d76df1..e584dca9 100644 --- a/tests/kms_pipe_crc_basic.c +++ b/tests/kms_pipe_crc_basic.c @@ -221,6 +221,41 @@ static void test_compare_crc(data_t *data, enum pipe pipe) igt_remove_fb(data->drm_fd, &fb1); } +static void test_disable_crc_after_crtc(data_t *data, enum pipe pipe) +{ + igt_display_t *display = &data->display; + igt_output_t *output = igt_get_single_output_for_pipe(&data->display, pipe); + igt_pipe_crc_t *pipe_crc = igt_pipe_crc_new(data->drm_fd, pipe, "auto"); + drmModeModeInfo *mode = igt_output_get_mode(output); + igt_crc_t crc[2]; + + igt_display_reset(display); + igt_output_set_pipe(output, pipe); + + igt_create_color_fb(data->drm_fd, + mode->hdisplay, mode->vdisplay, + DRM_FORMAT_XRGB8888, + LOCAL_DRM_FORMAT_MOD_NONE, + 0.0, 1.0, 0.0, &data->fb); + igt_plane_set_fb(igt_output_get_plane(output, 0), &data->fb); + igt_display_commit(display); + + igt_pipe_crc_start(pipe_crc); + igt_pipe_crc_get_current(data->drm_fd, pipe_crc, &crc[0]); + + kmstest_set_connector_dpms(data->drm_fd, output->config.connector, + DRM_MODE_DPMS_OFF); + igt_pipe_crc_stop(pipe_crc); + + kmstest_set_connector_dpms(data->drm_fd, output->config.connector, + DRM_MODE_DPMS_ON); + igt_pipe_crc_collect_crc(pipe_crc, &crc[1]); + igt_assert_crc_equal(&crc[0], &crc[1]); + + igt_pipe_crc_free(pipe_crc); + igt_remove_fb(data->drm_fd, &data->fb); +} + data_t data = {0, }; igt_main @@ -265,6 +300,11 @@ igt_main test_read_crc(&data, pipe, 0); } + igt_describe("Check that disabling CRCs on a CRTC after having disabled the CRTC " + "does not cause issues."); + igt_subtest_f("disable-crc-after-crtc-pipe-%s", kmstest_pipe_name(pipe)) + test_disable_crc_after_crtc(&data, pipe); + igt_subtest_f("hang-read-crc-pipe-%s", kmstest_pipe_name(pipe)) { igt_hang_t hang = igt_allow_hang(data.drm_fd, 0, 0); -- 2.26.2 _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev