Received: by 2002:a05:6358:45e:b0:b5:b6eb:e1f9 with SMTP id 30csp2064726rwe; Sun, 28 Aug 2022 03:03:51 -0700 (PDT) X-Google-Smtp-Source: AA6agR6BrsRLENuCuAwSn3vUd/qC9Wk1+GPCFsflYHP4T6LJpmY+v7zFFsBX2LYXtzNTLRePeCJp X-Received: by 2002:a17:902:7803:b0:172:c13a:fd9b with SMTP id p3-20020a170902780300b00172c13afd9bmr11538869pll.86.1661681031593; Sun, 28 Aug 2022 03:03:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661681031; cv=none; d=google.com; s=arc-20160816; b=Cb120zCeIEeOvooO+lt40yIn7CWR1n0pa7qnywDH2bTS+2iRM2lhSRASi3qKoN5i1c W7w8K1yH0q8ah3CRQYI9uo1evoORvS7weqmPHo9/KHDp/AO/ZmYs/xA4tCty3JvwJMvd C7d5mh/zYLy3MmMDZ7lkoWFiaimNauPH8Ev1shc2C/h0py798UZURh0fuSdCBg+yiFea oEolVz9InV6fJxC8jXKhfHwvoNSkbYoqT1g6+24UMVH7Dqzw5akajfvxRO3J/mnAhUpK 9t8Y9j8Y3mRroWxq6QZ1R6i/NDKrZ0kVylgfaZ4pAQnv9NG8uh/3n8p64IxvsESP0jMd tyXw== 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=ukyn6zE4GRd1MFW/Dexs9A07F10NCcPaNwkvsxCOzJU=; b=W/IHmzMnP7DFJSbQlblLZHnghKKVhDFRS08rXCugq9oaKoefhAB88QrTPei/UMHBvk ADuG8tMO5VY+nHp2j3ZC+6QadVv7uxDW7zKgrNMcoeXlRRDfXneTqDy7GamFa1jDjASj +wbFfV1Dpw0oaEahIthJ2jBwCamYzjjwHRAQ0nZfsdNMNt9wUuUK8x0O0FOD2QK+2Skf +mmp7Uh76NM+i0IiOVUTfCQZyEIrV3QsqJdYv1F2eF0RIlpOW1KlIqeL95pVLjMcNm95 nfea/0+gfvkOgWbtDC1iTMxGv7hteOI2co230zsAfylsakmdcC71ADUrWYe3827tuwvn 6pEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=m0qFG57f; 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 oa5-20020a17090b1bc500b001fadbf92247si6558123pjb.24.2022.08.28.03.03.38; Sun, 28 Aug 2022 03:03:51 -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=m0qFG57f; 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 S230406AbiH1JBh (ORCPT + 99 others); Sun, 28 Aug 2022 05:01:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230105AbiH1JBd (ORCPT ); Sun, 28 Aug 2022 05:01:33 -0400 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 058C43ED6A for ; Sun, 28 Aug 2022 02:01:32 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id i188-20020a1c3bc5000000b003a7b6ae4eb2so1651103wma.4 for ; Sun, 28 Aug 2022 02:01:31 -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=ukyn6zE4GRd1MFW/Dexs9A07F10NCcPaNwkvsxCOzJU=; b=m0qFG57f4yjRW9Cy/7AOAnS9V3E3pw7LW+jz9wp3TLA3n3ZyXR9nEMVYe3JwAvs3H0 l5e1u2ClC9wY5EzbCaCQZKRmv4e7AuvP8P/wiVKO7b7SbreSh9PHAV5JjCvz8Q43DlJg IIuvRr3Ew7Q2ojZnvjTXoapyRvimsAI+tycJ1BJTaP+VJFwKWpxEbfAz8QcQ4PB8jTa6 VPFCCkzW4z2HX5L9AH3icPsvajVDLiZSDjgFiLGu8IXQRiq56JjdrQYmAaIW7mcn2hdN Fl5a7mT5WlS3z3D15alrmmBajQnR8TPJj7AU6iL4YXC2q8Hz1SWWFlXB4kdnXHuuCZig f7pQ== 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=ukyn6zE4GRd1MFW/Dexs9A07F10NCcPaNwkvsxCOzJU=; b=AjjCFD0R5mVWGAFIzWEKK05J66edgRfWyHQAusvX8qAhVCUmZt/6hBnbgHGJIqJdO7 nkpPqppT1u4a6gypPx0eZjFqRvT7OhhbGSG/5eFV+GWwA7yuV7fvMs5gM9NX7RYeQGyS jM4y0OlMGS8urN3Gt+RaNIDXy6cFAQ5TWraWPNi+SfaoiPVw3CT4VNn0hxLmS4A08cge uepp4MSY9Yget7v7rqoTuf9fQp+L4UE18Bc406RmL4uzWpU6fbv+0tdcXQBTIQD2TX0V lY9n6FTFskeKqcuFc6hjlcha+pAkXFHBRBtKlv5+XL8k47Y5zTZ9OaaS3/hcgeEPlJSB zFDQ== X-Gm-Message-State: ACgBeo0TNk3QBe6wJBAw3YIixhI5mD/oyqPctqJj98/Lr5Oe7OC5fLQ8 eiYqgzHfqFSEtcEmLJW3Sqs= X-Received: by 2002:a05:600c:a49:b0:3a6:673a:2a9b with SMTP id c9-20020a05600c0a4900b003a6673a2a9bmr3943971wmq.3.1661677290418; Sun, 28 Aug 2022 02:01:30 -0700 (PDT) Received: from localhost.localdomain ([94.73.32.249]) by smtp.gmail.com with ESMTPSA id h18-20020a05600c351200b003a60ff7c082sm5733425wmq.15.2022.08.28.02.01.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Aug 2022 02:01:30 -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 v2 2/3] drm/format-helper: Add KUnit tests for drm_fb_xrgb8888_to_xrgb2101010() Date: Sun, 28 Aug 2022 11:01:20 +0200 Message-Id: <20220828090121.13243-3-jose.exposito89@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220828090121.13243-1-jose.exposito89@gmail.com> References: <20220828090121.13243-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 XRGB2101010. Tested-by: Maíra Canal Reviewed-by: David Gow Signed-off-by: José Expósito --- .../gpu/drm/tests/drm_format_helper_test.c | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/drivers/gpu/drm/tests/drm_format_helper_test.c b/drivers/gpu/drm/tests/drm_format_helper_test.c index 08d08e7ab19a..d8536db4de1e 100644 --- a/drivers/gpu/drm/tests/drm_format_helper_test.c +++ b/drivers/gpu/drm/tests/drm_format_helper_test.c @@ -32,6 +32,11 @@ struct convert_to_rgb888_result { const u8 expected[TEST_BUF_SIZE]; }; +struct convert_to_xrgb2101010_result { + unsigned int dst_pitch; + const u32 expected[TEST_BUF_SIZE]; +}; + struct convert_xrgb8888_case { const char *name; unsigned int pitch; @@ -40,6 +45,7 @@ struct convert_xrgb8888_case { struct convert_to_rgb332_result rgb332_result; struct convert_to_rgb565_result rgb565_result; struct convert_to_rgb888_result rgb888_result; + struct convert_to_xrgb2101010_result xrgb2101010_result; }; static struct convert_xrgb8888_case convert_xrgb8888_cases[] = { @@ -61,6 +67,10 @@ static struct convert_xrgb8888_case convert_xrgb8888_cases[] = { .dst_pitch = 0, .expected = { 0x00, 0x00, 0xFF }, }, + .xrgb2101010_result = { + .dst_pitch = 0, + .expected = { 0x3FF00000 }, + }, }, { .name = "single_pixel_clip_rectangle", @@ -83,6 +93,10 @@ static struct convert_xrgb8888_case convert_xrgb8888_cases[] = { .dst_pitch = 0, .expected = { 0x00, 0x00, 0xFF }, }, + .xrgb2101010_result = { + .dst_pitch = 0, + .expected = { 0x3FF00000 }, + }, }, { /* Well known colors: White, black, red, green, blue, magenta, @@ -132,6 +146,15 @@ static struct convert_xrgb8888_case convert_xrgb8888_cases[] = { 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, }, }, + .xrgb2101010_result = { + .dst_pitch = 0, + .expected = { + 0x3FFFFFFF, 0x00000000, + 0x3FF00000, 0x000FFC00, + 0x000003FF, 0x3FF003FF, + 0x3FFFFC00, 0x000FFFFF, + }, + }, }, { /* Randomly picked colors. Full buffer within the clip area. */ @@ -175,6 +198,14 @@ static struct convert_xrgb8888_case convert_xrgb8888_cases[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }, }, + .xrgb2101010_result = { + .dst_pitch = 20, + .expected = { + 0x03844672, 0x0444D414, 0x2A20300C, 0x00000000, 0x00000000, + 0x1B1705CD, 0x03844672, 0x0444D414, 0x00000000, 0x00000000, + 0x2A20300C, 0x1B1705CD, 0x03844672, 0x00000000, 0x00000000, + }, + }, }, }; @@ -319,10 +350,42 @@ static void xrgb8888_to_rgb888_test(struct kunit *test) KUNIT_EXPECT_EQ(test, memcmp(buf, result->expected, dst_size), 0); } +static void xrgb8888_to_xrgb2101010_test(struct kunit *test) +{ + const struct convert_xrgb8888_case *params = test->param_value; + const struct convert_to_xrgb2101010_result *result = ¶ms->xrgb2101010_result; + size_t dst_size; + __u32 *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_XRGB2101010, + 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_xrgb2101010(&dst, &result->dst_pitch, &src, &fb, ¶ms->clip); + buf = le32buf_to_cpu(test, buf, TEST_BUF_SIZE); + 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), {} }; -- 2.25.1