From patchwork Mon Jun 7 03:47:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Srinivas, Vidya" X-Patchwork-Id: 12302495 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 264FFC47082 for ; Mon, 7 Jun 2021 03:56:57 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DB6D560241 for ; Mon, 7 Jun 2021 03:56:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DB6D560241 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 53D156E02E; Mon, 7 Jun 2021 03:56:56 +0000 (UTC) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 517666E02E; Mon, 7 Jun 2021 03:56:55 +0000 (UTC) IronPort-SDR: RPnlNn17dec47zFmvTkEKkGpvNv/PcaRVsGW79fTH/9M1+aTHEiZVCZWKHk2TwDy3Lpj1x8mxK s5v+fjvQguXQ== X-IronPort-AV: E=McAfee;i="6200,9189,10007"; a="191884057" X-IronPort-AV: E=Sophos;i="5.83,254,1616482800"; d="scan'208";a="191884057" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jun 2021 20:56:53 -0700 IronPort-SDR: Qo44Xg7cEDZTWUshbV9HUEpn5GozWeJIBPEjQ+S6pyqNX0fg+KgXFs5CTDkY+DnCa6DYSDUjVN +UTYaTn0C7yg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,254,1616482800"; d="scan'208";a="551106241" Received: from vsrini4-xps-8920.iind.intel.com (HELO localhost.localdomain) ([10.223.163.28]) by orsmga004.jf.intel.com with ESMTP; 06 Jun 2021 20:56:50 -0700 From: Vidya Srinivas To: intel-gfx@lists.freedesktop.org, igt-dev@lists.freedesktop.org Date: Mon, 7 Jun 2021 09:17:41 +0530 Message-Id: <1623037661-2087-1-git-send-email-vidya.srinivas@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1622812262-16592-1-git-send-email-vidya.srinivas@intel.com> References: <1622812262-16592-1-git-send-email-vidya.srinivas@intel.com> Subject: [Intel-gfx] [PATCH i-g-t] tests/kms_color: Disable gamma in degamma tests X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: markyacoub@chromium.org, charlton.lin@intel.com MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" This patch disables gamma in degamma subtest which is missing. It compares CRC between (linear degamma + solid colors) and (max degamma + gradient colors). Patch also cleans up degamma before exiting degamma test and cleans up gamma before exiting gamma test. v2 - Addressed review comments from Bhanuprakash Modem Changed full degamma for reference CRC to linear degamma Added clean up of degamma end of degamma test. v3 - Addressed review comments from Bhanuprakash Modem Ported changes to kms_color_chamelium Change-Id: Ibdb91b603e2e4024d170727d24c6a5425441e2e1 Signed-off-by: Vidya Srinivas Reviewed-by: Bhanuprakash Modem Reviewed-by: Bhanuprakash Modem --- tests/kms_color.c | 14 +++++++------- tests/kms_color_chamelium.c | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/kms_color.c b/tests/kms_color.c index 3a42532a5c27..1b021ac3ce0c 100644 --- a/tests/kms_color.c +++ b/tests/kms_color.c @@ -32,7 +32,6 @@ static void test_pipe_degamma(data_t *data, igt_output_t *output; igt_display_t *display = &data->display; gamma_lut_t *degamma_linear, *degamma_full; - gamma_lut_t *gamma_linear; color_t red_green_blue[] = { { 1.0, 0.0, 0.0 }, { 0.0, 1.0, 0.0 }, @@ -45,8 +44,6 @@ static void test_pipe_degamma(data_t *data, degamma_linear = generate_table(data->degamma_lut_size, 1.0); degamma_full = generate_table_max(data->degamma_lut_size); - gamma_linear = generate_table(data->gamma_lut_size, 1.0); - for_each_valid_output_on_pipe(&data->display, primary->pipe->pipe, output) { drmModeModeInfo *mode; struct igt_fb fb_modeset, fb; @@ -75,11 +72,11 @@ static void test_pipe_degamma(data_t *data, igt_plane_set_fb(primary, &fb_modeset); disable_ctm(primary->pipe); - disable_degamma(primary->pipe); - set_gamma(data, primary->pipe, gamma_linear); + disable_gamma(primary->pipe); + set_degamma(data, primary->pipe, degamma_linear); igt_display_commit(&data->display); - /* Draw solid colors with no degamma transformation. */ + /* Draw solid colors with linear degamma transformation. */ paint_rectangles(data, mode, red_green_blue, &fb); igt_plane_set_fb(primary, &fb); igt_display_commit(&data->display); @@ -103,15 +100,16 @@ static void test_pipe_degamma(data_t *data, */ igt_assert_crc_equal(&crc_fullgamma, &crc_fullcolors); + disable_degamma(primary->pipe); igt_plane_set_fb(primary, NULL); igt_output_set_pipe(output, PIPE_NONE); + igt_display_commit(&data->display); igt_remove_fb(data->drm_fd, &fb); igt_remove_fb(data->drm_fd, &fb_modeset); } free_lut(degamma_linear); free_lut(degamma_full); - free_lut(gamma_linear); } /* @@ -189,8 +187,10 @@ static void test_pipe_gamma(data_t *data, */ igt_assert_crc_equal(&crc_fullgamma, &crc_fullcolors); + disable_gamma(primary->pipe); igt_plane_set_fb(primary, NULL); igt_output_set_pipe(output, PIPE_NONE); + igt_display_commit(&data->display); igt_remove_fb(data->drm_fd, &fb); igt_remove_fb(data->drm_fd, &fb_modeset); } diff --git a/tests/kms_color_chamelium.c b/tests/kms_color_chamelium.c index 30b38b82e306..c21d64e9cc9a 100644 --- a/tests/kms_color_chamelium.c +++ b/tests/kms_color_chamelium.c @@ -36,7 +36,6 @@ static void test_pipe_degamma(data_t *data, { igt_output_t *output; gamma_lut_t *degamma_linear, *degamma_full; - gamma_lut_t *gamma_linear; color_t red_green_blue[] = { { 1.0, 0.0, 0.0 }, { 0.0, 1.0, 0.0 }, @@ -57,8 +56,6 @@ static void test_pipe_degamma(data_t *data, degamma_linear = generate_table(data->degamma_lut_size, 1.0); degamma_full = generate_table_max(data->degamma_lut_size); - gamma_linear = generate_table(data->gamma_lut_size, 1.0); - for_each_valid_output_on_pipe(&data->display, primary->pipe->pipe, output) { @@ -110,10 +107,10 @@ static void test_pipe_degamma(data_t *data, igt_plane_set_fb(primary, &fb_modeset); disable_ctm(primary->pipe); disable_degamma(primary->pipe); - set_gamma(data, primary->pipe, gamma_linear); + set_degamma(data, primary->pipe, degamma_linear); igt_display_commit(&data->display); - /* Draw solid colors with no degamma transformation. */ + /* Draw solid colors with linear degamma transformation. */ paint_rectangles(data, mode, red_green_blue, &fbref); /* Draw a gradient with degamma LUT to remap all @@ -135,13 +132,14 @@ static void test_pipe_degamma(data_t *data, frame_fullcolors, &fbref, CHAMELIUM_CHECK_ANALOG); + disable_degamma(primary->pipe); igt_plane_set_fb(primary, NULL); igt_output_set_pipe(output, PIPE_NONE); + igt_display_commit(&data->display); } free_lut(degamma_linear); free_lut(degamma_full); - free_lut(gamma_linear); } /* @@ -247,8 +245,10 @@ static void test_pipe_gamma(data_t *data, frame_fullcolors, &fbref, CHAMELIUM_CHECK_ANALOG); + disable_gamma(primary->pipe); igt_plane_set_fb(primary, NULL); igt_output_set_pipe(output, PIPE_NONE); + igt_display_commit(&data->display); } free_lut(gamma_full);