Received: by 2002:a05:6358:45e:b0:b5:b6eb:e1f9 with SMTP id 30csp2382734rwe; Sun, 28 Aug 2022 09:57:45 -0700 (PDT) X-Google-Smtp-Source: AA6agR6Sy6AURu/6jgpaOmk7kTKrBeIgiOAgj4Fsqdcs/Nc4JWeEPknpr/PHwaX9600LArSHA9qA X-Received: by 2002:a63:ef49:0:b0:42b:40b5:9bc4 with SMTP id c9-20020a63ef49000000b0042b40b59bc4mr10941704pgk.266.1661705864854; Sun, 28 Aug 2022 09:57:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661705864; cv=none; d=google.com; s=arc-20160816; b=dSiF6+L5iwYr9VMG/m9NGJceZcQSHIq+30SyAVBbp9kjbvBUab4bCUQ8cV28Jc0ISn 9ctpvAx8/RGAb6na8a8WByScxgxZkt1b6Z+p3DESuZ3p/AnGLGSIaC8gqXmONE07C6+9 p3H4a0EV81OFotqrvV/OSm0GDSvcYSG2dC6L44ijWjS4ctZu4q4NJpbxS9qs9819cXAJ 5gJiizfToVPyfcXlP/Uw/M+Rn5KD2ZoS/XUGybp1uOwhjZoq4UxVWHAMgnIsGObiW7XI EHVQvQ+VjeWMEnvNcICHwFwTrN6aKpjG6q6l/g1EhEHDLA6XRYlyz13yGHSDFSm70m/Z li/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=T5aRwr6pqcsQk7PMMmsjKOURSAFgkEiep7tVEjgOEu8=; b=Hs+NVnfCBM3wx+jrxecDjtXwn7DoFCKuWVwN5pd+IY7q1e+IUGKrES8KYWe2FObVzT HrHwfqkSzoFLT6YtOJFGXkDgin33AuVMP4J50Cr1DrBKh5laBe1TL8y758h61DzGgR+A GTl7s2PLwuBnTm4FtyfO7jjbH4h0tNWf0qGAK35iDwJ/eWdyaorXGOR+6mpdAU4xv3j2 2Fc8vObEafjC59LpzODBAUAlrS4HZFk5S4pTZhXxznWwTD2Yxoo1uvUvowJmxFJRhG7m rBqrpbN1XcV5UMzkwIq03OGDPypBI5qtP4lxXfVo2HSCp6BbPHSIrqft9vNlPH8gwpRo 4M6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=eMVxp40D; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 1-20020a630001000000b0042a96804a6dsi4751683pga.423.2022.08.28.09.57.33; Sun, 28 Aug 2022 09:57:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=eMVxp40D; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230042AbiH1Qpv (ORCPT + 99 others); Sun, 28 Aug 2022 12:45:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38584 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229873AbiH1Qpk (ORCPT ); Sun, 28 Aug 2022 12:45:40 -0400 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DAB051A813 for ; Sun, 28 Aug 2022 09:45:38 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id az27so7491738wrb.6 for ; Sun, 28 Aug 2022 09:45:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=T5aRwr6pqcsQk7PMMmsjKOURSAFgkEiep7tVEjgOEu8=; b=eMVxp40D8zIPnnJMVchQvjuBddHTX1y2JuTilTMpaHdYOA3XVTrIWrxlutKoh5Nnuz aKR4a/L3hZGTg+L7entXUOpqVn8ZqYYSHIxRgrubT0r10RqyTRyF1HuFeQSVwqZLjxaQ 8+EvGwx+RxWdNbrXTLipQ8kNEUiFeIg7Bp514To1u9GAxH2v9v5jqZ4PYMD7TW1N5V5A EvfFeD3dWFN2c5+OF+BY+osUyL7oh6/c2dCBx724bE38b3IrzlagAPlnIhKXAHqQ6QNI kfTKrBAqOVr+nbulqjGoYep5kW+hPrqa3K8omCdGojVz7II+/B1ovpVktKLGStfFESER JkCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=T5aRwr6pqcsQk7PMMmsjKOURSAFgkEiep7tVEjgOEu8=; b=jI0bP19Mbx8SXhJTE8qTAXnhnQOzbvqbIJuU8v/Q4CpEQ9vRVh7k/Qc9wyrw8DOfnK E96MBemC4Y8kw8iB/1MHvMgHFuyysmBJkwXNG8vZnh7C0bqxj5dqEtt+D51XLgnEX8Z4 fq8LVjWx0h6623HuNDWDOQoeMMtyt4Ol80gVw796CN3wVU+UyWt2mrEWcmpIB6ffFJEo PPq82TFUtYaPlLgHt4Xbg1hk8dCX9UVWy7jwQ5hii/ImocF+F5PhiVXxVPLlhtdgN7HK txvaLxEA7gDW1EHw5muyTBN8wH5ftveiqX/KRw1SGARllDdqge7+KqxDjfGyR0knc4q5 iQ2Q== X-Gm-Message-State: ACgBeo1P37V8qmS/ROgtlLtUOSzdegt4ePJpr67/ytes2XLuBN8O6G73 MZz0qCTT0yLslLdkTeqXFN4= X-Received: by 2002:a05:6000:702:b0:225:4a84:89ea with SMTP id bs2-20020a056000070200b002254a8489eamr4708496wrb.194.1661705137422; Sun, 28 Aug 2022 09:45:37 -0700 (PDT) Received: from localhost.localdomain ([94.73.32.249]) by smtp.gmail.com with ESMTPSA id e14-20020adfef0e000000b0021d6924b777sm399926wro.115.2022.08.28.09.45.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Aug 2022 09:45:37 -0700 (PDT) From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= To: javierm@redhat.com Cc: davidgow@google.com, dlatypov@google.com, tzimmermann@suse.de, mripard@kernel.org, daniel@ffwll.ch, airlied@linux.ie, maarten.lankhorst@linux.intel.com, jani.nikula@linux.intel.com, maira.canal@usp.br, isabbasso@riseup.net, magalilemes00@gmail.com, tales.aparecida@gmail.com, geert@linux-m68k.org, dri-devel@lists.freedesktop.org, kunit-dev@googlegroups.com, linux-kernel@vger.kernel.org, =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= , =?UTF-8?q?Ma=C3=ADra=20Canal?= Subject: [PATCH v3 3/3] drm/format-helper: Add KUnit tests for drm_fb_xrgb8888_to_gray8() Date: Sun, 28 Aug 2022 18:45:17 +0200 Message-Id: <20220828164517.185092-4-jose.exposito89@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220828164517.185092-1-jose.exposito89@gmail.com> References: <20220828164517.185092-1-jose.exposito89@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Extend the existing test cases to test the conversion from XRGB8888 to grayscale. Tested-by: Maíra Canal Reviewed-by: David Gow Signed-off-by: José Expósito --- .../gpu/drm/tests/drm_format_helper_test.c | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/drivers/gpu/drm/tests/drm_format_helper_test.c b/drivers/gpu/drm/tests/drm_format_helper_test.c index d8536db4de1e..2f548aa51a30 100644 --- a/drivers/gpu/drm/tests/drm_format_helper_test.c +++ b/drivers/gpu/drm/tests/drm_format_helper_test.c @@ -37,6 +37,11 @@ struct convert_to_xrgb2101010_result { const u32 expected[TEST_BUF_SIZE]; }; +struct convert_to_gray8_result { + unsigned int dst_pitch; + const u8 expected[TEST_BUF_SIZE]; +}; + struct convert_xrgb8888_case { const char *name; unsigned int pitch; @@ -46,6 +51,7 @@ struct convert_xrgb8888_case { struct convert_to_rgb565_result rgb565_result; struct convert_to_rgb888_result rgb888_result; struct convert_to_xrgb2101010_result xrgb2101010_result; + struct convert_to_gray8_result gray8_result; }; static struct convert_xrgb8888_case convert_xrgb8888_cases[] = { @@ -71,6 +77,10 @@ static struct convert_xrgb8888_case convert_xrgb8888_cases[] = { .dst_pitch = 0, .expected = { 0x3FF00000 }, }, + .gray8_result = { + .dst_pitch = 0, + .expected = { 0x4C }, + }, }, { .name = "single_pixel_clip_rectangle", @@ -97,6 +107,10 @@ static struct convert_xrgb8888_case convert_xrgb8888_cases[] = { .dst_pitch = 0, .expected = { 0x3FF00000 }, }, + .gray8_result = { + .dst_pitch = 0, + .expected = { 0x4C }, + }, }, { /* Well known colors: White, black, red, green, blue, magenta, @@ -155,6 +169,15 @@ static struct convert_xrgb8888_case convert_xrgb8888_cases[] = { 0x3FFFFC00, 0x000FFFFF, }, }, + .gray8_result = { + .dst_pitch = 0, + .expected = { + 0xFF, 0x00, + 0x4C, 0x99, + 0x19, 0x66, + 0xE5, 0xB2, + }, + }, }, { /* Randomly picked colors. Full buffer within the clip area. */ @@ -206,6 +229,14 @@ static struct convert_xrgb8888_case convert_xrgb8888_cases[] = { 0x2A20300C, 0x1B1705CD, 0x03844672, 0x00000000, 0x00000000, }, }, + .gray8_result = { + .dst_pitch = 5, + .expected = { + 0x3C, 0x33, 0x34, 0x00, 0x00, + 0x6F, 0x3C, 0x33, 0x00, 0x00, + 0x34, 0x6F, 0x3C, 0x00, 0x00, + }, + }, }, }; @@ -381,11 +412,42 @@ static void xrgb8888_to_xrgb2101010_test(struct kunit *test) KUNIT_EXPECT_EQ(test, memcmp(buf, result->expected, dst_size), 0); } +static void xrgb8888_to_gray8_test(struct kunit *test) +{ + const struct convert_xrgb8888_case *params = test->param_value; + const struct convert_to_gray8_result *result = ¶ms->gray8_result; + size_t dst_size; + __u8 *buf = NULL; + __u32 *xrgb8888 = NULL; + struct iosys_map dst, src; + + struct drm_framebuffer fb = { + .format = drm_format_info(DRM_FORMAT_XRGB8888), + .pitches = { params->pitch, 0, 0 }, + }; + + dst_size = conversion_buf_size(DRM_FORMAT_R8, result->dst_pitch, + ¶ms->clip); + KUNIT_ASSERT_GT(test, dst_size, 0); + + buf = kunit_kzalloc(test, dst_size, GFP_KERNEL); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, buf); + iosys_map_set_vaddr(&dst, buf); + + xrgb8888 = le32buf_to_cpu(test, params->xrgb8888, TEST_BUF_SIZE); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, xrgb8888); + iosys_map_set_vaddr(&src, xrgb8888); + + drm_fb_xrgb8888_to_gray8(&dst, &result->dst_pitch, &src, &fb, ¶ms->clip); + KUNIT_EXPECT_EQ(test, memcmp(buf, result->expected, dst_size), 0); +} + static struct kunit_case drm_format_helper_test_cases[] = { KUNIT_CASE_PARAM(xrgb8888_to_rgb332_test, convert_xrgb8888_gen_params), KUNIT_CASE_PARAM(xrgb8888_to_rgb565_test, convert_xrgb8888_gen_params), KUNIT_CASE_PARAM(xrgb8888_to_rgb888_test, convert_xrgb8888_gen_params), KUNIT_CASE_PARAM(xrgb8888_to_xrgb2101010_test, convert_xrgb8888_gen_params), + KUNIT_CASE_PARAM(xrgb8888_to_gray8_test, convert_xrgb8888_gen_params), {} }; -- 2.25.1