From patchwork Thu Jun 3 14:55:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vidya Srinivas X-Patchwork-Id: 12297377 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=-14.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, 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 0F472C47096 for ; Thu, 3 Jun 2021 15:04:59 +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 C7A946023D for ; Thu, 3 Jun 2021 15:04:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C7A946023D 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 64D1E6F4AA; Thu, 3 Jun 2021 15:04:58 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6E50F6F495; Thu, 3 Jun 2021 15:04:57 +0000 (UTC) IronPort-SDR: +5ey6h70h/LmAw8cufAnxktT5KsOSP0bT4bAomOhQFK7fScYOgQu7MXmAqEISazbnXSUlTIrYT WErWwigJ2Gww== X-IronPort-AV: E=McAfee;i="6200,9189,10004"; a="202206301" X-IronPort-AV: E=Sophos;i="5.83,246,1616482800"; d="scan'208";a="202206301" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jun 2021 08:04:55 -0700 IronPort-SDR: iCTG6/1J/mH1/TYxwPuRds/7KFZ1xYZHG4iC1FeAAuIbsxTOrre2C6rETfv+Im+k/7X7ZdwE0J IRp+dt+J4erA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,246,1616482800"; d="scan'208";a="417408677" Received: from vsrini4-xps-8920.iind.intel.com (HELO localhost.localdomain) ([10.223.163.28]) by orsmga002.jf.intel.com with ESMTP; 03 Jun 2021 08:04:52 -0700 From: Vidya Srinivas To: intel-gfx@lists.freedesktop.org, igt-dev@lists.freedesktop.org Date: Thu, 3 Jun 2021 20:25:41 +0530 Message-Id: <1622732141-13561-1-git-send-email-vidya.srinivas@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [Intel-gfx] [PATCH i-g-t] tests/kms_color: Remove gamma code from 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" CRC should be collected without degamma transformation and after drawing gradient with degamma LUT. This patch removes things which are not related to degamma and makes it similar to pipe gamma test. Change-Id: I37f957b3a95dfe95119f0f0941f20c10471f437c Signed-off-by: Vidya Srinivas --- tests/kms_color.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/tests/kms_color.c b/tests/kms_color.c index 3a42532a5c27..2c9821cdecce 100644 --- a/tests/kms_color.c +++ b/tests/kms_color.c @@ -31,8 +31,7 @@ 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; + gamma_lut_t *degamma_full; color_t red_green_blue[] = { { 1.0, 0.0, 0.0 }, { 0.0, 1.0, 0.0 }, @@ -42,11 +41,8 @@ static void test_pipe_degamma(data_t *data, igt_require(igt_pipe_obj_has_prop(primary->pipe, IGT_CRTC_DEGAMMA_LUT)); igt_require(igt_pipe_obj_has_prop(primary->pipe, IGT_CRTC_GAMMA_LUT)); - 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,8 +71,7 @@ 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_full); igt_display_commit(&data->display); /* Draw solid colors with no degamma transformation. */ @@ -92,7 +87,6 @@ static void test_pipe_degamma(data_t *data, */ paint_gradient_rectangles(data, mode, red_green_blue, &fb); igt_plane_set_fb(primary, &fb); - set_degamma(data, primary->pipe, degamma_full); igt_display_commit(&data->display); igt_wait_for_vblank(data->drm_fd, display->pipes[primary->pipe->pipe].crtc_offset); @@ -105,13 +99,13 @@ static void test_pipe_degamma(data_t *data, igt_plane_set_fb(primary, NULL); 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, &fb); igt_remove_fb(data->drm_fd, &fb_modeset); } - free_lut(degamma_linear); free_lut(degamma_full); - free_lut(gamma_linear); } /* @@ -191,6 +185,8 @@ static void test_pipe_gamma(data_t *data, igt_plane_set_fb(primary, NULL); 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, &fb); igt_remove_fb(data->drm_fd, &fb_modeset); }