From patchwork Wed Feb 26 16:03:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aditya Garg X-Patchwork-Id: 13992768 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 2D3C8C021B8 for ; Wed, 26 Feb 2025 16:03:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BA2CD10E27C; Wed, 26 Feb 2025 16:03:57 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=live.com header.i=@live.com header.b="GvB2sv7K"; dkim-atps=neutral Received: from MA0PR01CU012.outbound.protection.outlook.com (mail-southindiaazolkn19011031.outbound.protection.outlook.com [52.103.67.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 000F710E27C for ; Wed, 26 Feb 2025 16:03:55 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Vk/kEFJRptywICL8idd47e9c0b+fEtpMHG94cQIGlVgwcPMJC9xUce9i9S/WMNxjtG5LsS0+5VqYa7iXb7yyiLL0Q/FQEgEXOPVkxzPTP6I0GVZZECAPstZkrXzmxRWlFrlu4Rq40e8NGjdLYWdgSqQV0qJPcBtokLrPaF8rnarKplBxZZF0z6sKiQoKmYWc5h00sQhaceVPoHIRb05qUI4qA/LwCRrMpZnu/laRZIyvEV/Pga2BbnuM7Sj64kQBpHOr6lG4fOQf0qn6hvGByG2ykQ/dGGUEowxvoxFlhZdGxoEhGZLrc2EcfVXZ8i0gTLf9Wmtpdm59ih6SG9SZoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=qnIa/weZ1vZAc04cLquzJngle4sCIe4M0v7NPh8nKOQ=; b=ZNNHFHPTLSSiP/B+4flGlLMBc+TO5zwpmI5YePSAS052VhR0hqLlb3p36CtBJlvf5hPtbnCrOuWK1DDPDZo/XXc79WgAlgyit928qAdFImkSse5wGzbgVP6mEIEnD1ORhnBtt9jQ6AAIOsZV9DScJkaSLvYqAr6VpEEaphNrU5pIzy0g7+Hm0UQqLUreoFFjDuBg6qU+s06Px9QrL4wvf/UeLcyywgVuHGpWe4IgJoYfscV7R4t9yIqsYkRngukBIAFpOz13OUQhZjs47DqbO2Px1u74H0Zr87euFfQGmWBlkeDqXiNXaZtLVXjhb44aJ+YVQH2TAHMus0eJ/CZxNQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=live.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qnIa/weZ1vZAc04cLquzJngle4sCIe4M0v7NPh8nKOQ=; b=GvB2sv7K3UsvgVqzMuEAyeH05r+/sE1HPu2eYqqIHytXnGJoNz79/ugbt2L2HmM03crohIVGBcmZ+aTvsXBrLXXrVSiItw5Lir1dndME8p/Kq5JQhJs2uY71yXYauDm0pFG9fnp37LVroVQtHqpdiP1HJ/AeTMIgvRQiRoGno2SE2aaZq8Tr+gW6gh0aGDrrZIFZUPZlcSynsNNCKcQ1fjQf+71ITYyvESvGQ+9lung+pp49eRgHWGh5TAZCHjoPhzIMq6Z0JsBV80hLzR0KNwJx20jiNmaMYMCu/kgQ76EYMfaPzWko9FIIwIPXiNGEYFva4T8SN87vcPkb5Q3AcA== Received: from PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:f7::14) by MAZPR01MB8842.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a01:cd::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.21; Wed, 26 Feb 2025 16:03:48 +0000 Received: from PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM ([fe80::324:c085:10c8:4e77]) by PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM ([fe80::324:c085:10c8:4e77%7]) with mapi id 15.20.8466.016; Wed, 26 Feb 2025 16:03:47 +0000 From: Aditya Garg To: Thomas Zimmermann , "maarten.lankhorst@linux.intel.com" , "mripard@kernel.org" , "airlied@gmail.com" , "simona@ffwll.ch" , "andriy.shevchenko@linux.intel.com" CC: Kerem Karabay , Atharva Tiwari , Aun-Ali Zaidi , Linux Kernel Mailing List , "dri-devel@lists.freedesktop.org" Subject: [PATCH v7 1/2] drm/format-helper: Add conversion from XRGB8888 to BGR888 Thread-Topic: [PATCH v7 1/2] drm/format-helper: Add conversion from XRGB8888 to BGR888 Thread-Index: AQHbiGgEjHDb/pitMkqBqp5xDPfXnA== Date: Wed, 26 Feb 2025 16:03:47 +0000 Message-ID: <9A67EA95-9BC7-4D56-8F87-05EAC1C166AD@live.com> References: <361DAD47-01E8-4ED9-BC8C-0F98B08FFA5C@live.com> In-Reply-To: <361DAD47-01E8-4ED9-BC8C-0F98B08FFA5C@live.com> Accept-Language: en-IN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PN3PR01MB9597:EE_|MAZPR01MB8842:EE_ x-ms-office365-filtering-correlation-id: 372221bb-fd9b-44a7-8479-08dd567f2773 x-microsoft-antispam: BCL:0; ARA:14566002|8062599003|8060799006|19110799003|7092599003|461199028|15080799006|440099028|3412199025|41001999003|102099032; x-microsoft-antispam-message-info: Bi9PqBa+ZYjb/Weu4w/JiYOXbrohPhHpbkA36ywFspqbDZjIU6atMxgyLWElfqJAfhEZH4JxUz15scpScSPTQSfd4coDx3vVb/BoDxRpxQtqFR2fzOnb1O7SJkQh9FHGP/YsOw6VtxYix7pigKqC8oaMtcNH56SAK31kTjPZKdAhP8DEqZPIhuDurU05EY64/PWzs23o8/CPQ/ykveTxTQxDa/rfxhoDHaDWg5NDVKasBV7mY0ctpPVd2gR2WrSMhsqScTMFWlJxyp/Ct1hCnXO5q+NX1YxeLVSmuifQcWJ1MVsQRRk+8LPswv0F4QCTcvPo3wGc6mjIWaeylLS1ryLdZ/B3rNyXU9XIA+Uyj/Cgx3W8H/ISAwmbB2O6pyrLxdEWI1XwF04nL5tU6b9UhiRSTADZI92btQfa4tjNS4kWZqAni1GMe98P24DJYjA242Ffhn6U6NHSEbaBHnG1T2AyMy5toqvZ7bmIuqJIFIQFrX/BTGQOczFuMjpspsHoAWwoa2fXtsxIWpZ9dihiIk0U8EEJZsRtvwx5LkU96fT3YLt/Wm6hHIteLwvJzOOl7qP+wIWIMrUMgbJgjm3yuvfBveqt5SteElDltwu23gbXNCX7GnXZ/6pa8b5R6F3XoSBXYEFo0CMVXuuPTXDuEEtuLTRmkijjyBpKPM/+qvbuuBtt4Jrgy7wedRfTTiZ2Qxcc1SqQ40GltzOvhkewwz/fEN07Z1lLlPOFB4f6DH8nxV4efQ6bxyAPSkXM3BE9X5JLTOthvzizBzkZz7KA7fORq+SpU0hyhZ2Qhjs70ZxaqkP426Dj+n9W0YOxBOtr9ds4JSO/f6ZfM1bBL0JrpFJq9P8Kw5+5wJ//gNptwHcyVuAC5Sbilqt8nFkZdR0w5Xz/YUCUGA23Va6yOeyNDrgnoNZrmzj4jQhzurrpcZWEkqsLnzxHKr5JopKPiVfNg83KAD7f9SbL9Amq3316d/fEytLuwnYWY0j7ozp+fU7y+SBTaqTrBxYlbPGQCF+xQxKZCPslEE+GWt66ZhP8sdKjaBGYyXYdR3xgjTt5CLYhJUh47EoZON+JMfJXv2REc2wmw762mmHXbSFa6m2bKsGUEY6JFav9zrgy4aLNLgs= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: QBtxNN0kbK+uno0y3QJCHIDoE5rrvRzzq1wscjs1NLLp/MzcadkmQ0K7UZi86+WQuW8aLmkjkYGqt6+m+uq7eoq/H2Jhh7G89bGTtdZMAqP20B6a0HJSyVesa8BvVTYY12yfan/ptKxYZPtWJmcOMIF+wVFFEllsZIjMFpNUjRkBzcHsKqP6gx3vIH4he0FuC3a/Po9Vahcd+SsK8IjLgUnHyKIzOBryjm9zQ0s4dQlGVdthar+FRjOqbOmjCgGjnJcE8utXgtAwxsmLR5M89JvG/X7736CS7TCix0NGhFHfCPe9ObcchExoNvcDOjKBhgEPyq0poE332QqZ/HAmFNLQBSM2baJejQslrrGLCUgGhDoBPjU9/0FGi0KRXlP+T3RskKdBUXF25KNxz37g/3i6IipikzfGVXZuLAMZhUuiXR8M7GeZpb9M22TEJwtL4ihBtHkYc7iPzMesw6M9pf68esQhrYS/DnB7rmQWFheejKqvDwgeURcEWaLQwEAUbS3qHh3ZmkW4HdVOGOPz7DN7duWxXWBRhIvSoILNpfAZfxOuAMYis5p7xXUiddVkN3qu82ORiPQCM2LEPUTugSdYtvn6qNwWAC2fxGmFuKNVnH1WWLbIxmnLrlnQs+5hTzDCWGtPLN8ox9kc8q0iy8boLxmpjb12ljLt/o46XNyQMB2dGhTWGtR88oY5t5tTprZKgWXDsd8NVUUE/n4ypzEcPK8dOT+IGRXbmvFwAH4/qbv7v6glExlm0UyhO+5YS75eQ1RO3FRLd5nuQqOzEMj8rJtrzIbC6QS8Za13etH44HBAVbK78y54leImeaJIdWK3j6tuUHwC0K35pN0hwiUhsVnwTBYdXkWX8m0dyhrutamM3X7Z4CyrQSMXwucCQPeVQf6KnS0ThF29Cy0i/rTxQpV88tpIqv7Ml392YceyLxXe5SiJUTrbp2TdX/yV25tcPbPAV0QrtiO+WN04DWUXZDEJibYKJ2gjhvPXKGjUJFFQkUb/Bwgcx45wCZuhkmWnPfePJ3BYmqzVBntkn9c18sw4jHk85U7oyCmdiAK2hSHlrr6J1DfhLXk0Gmr0ijTTH3AXCp5jPexlLrv1cgrF7AaZCSFUXdSj9rrxS+rKYrt0S/I6cvN1xmCar3Zyi0JGTg56KFtyV53WghiI+2iMOYN+5aXPPbhn/kBWa5xhstqErjk49UbWBr1cAbdSf6HtoUEk85tJF748IcEoabqEqzXZ8EYId6MLHRHhLAtymLxOm//GmdAkY8rRecVHV+EOIsDtTVzDVbjcXHs65PHEvT9yK75MoJbafTKIrJn+wZgsF2Tz2hxpbhIo1ql3 Content-ID: <144D416F79B5C44EA43649C8FDB42980@INDPRD01.PROD.OUTLOOK.COM> MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-7719-20-msonline-outlook-ae5c4.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PN3PR01MB9597.INDPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 372221bb-fd9b-44a7-8479-08dd567f2773 X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Feb 2025 16:03:47.8880 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MAZPR01MB8842 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Kerem Karabay Add XRGB8888 emulation helper for devices that only support BGR888. Signed-off-by: Kerem Karabay Signed-off-by: Aditya Garg Reviewed-by: Thomas Zimmermann --- v2 -> Fix incorrect description v3 -> No change in this patch v4 -> No change in this patch v5 -> No change in this patch v6 -> No change in this patch v7 -> No change in this patch drivers/gpu/drm/drm_format_helper.c | 54 +++++++++++++ .../gpu/drm/tests/drm_format_helper_test.c | 81 +++++++++++++++++++ include/drm/drm_format_helper.h | 3 + 3 files changed, 138 insertions(+) diff --git a/drivers/gpu/drm/drm_format_helper.c b/drivers/gpu/drm/drm_format_helper.c index b1be458ed..4f60c8d8f 100644 --- a/drivers/gpu/drm/drm_format_helper.c +++ b/drivers/gpu/drm/drm_format_helper.c @@ -702,6 +702,57 @@ void drm_fb_xrgb8888_to_rgb888(struct iosys_map *dst, const unsigned int *dst_pi } EXPORT_SYMBOL(drm_fb_xrgb8888_to_rgb888); +static void drm_fb_xrgb8888_to_bgr888_line(void *dbuf, const void *sbuf, unsigned int pixels) +{ + u8 *dbuf8 = dbuf; + const __le32 *sbuf32 = sbuf; + unsigned int x; + u32 pix; + + for (x = 0; x < pixels; x++) { + pix = le32_to_cpu(sbuf32[x]); + /* write red-green-blue to output in little endianness */ + *dbuf8++ = (pix & 0x00ff0000) >> 16; + *dbuf8++ = (pix & 0x0000ff00) >> 8; + *dbuf8++ = (pix & 0x000000ff) >> 0; + } +} + +/** + * drm_fb_xrgb8888_to_bgr888 - Convert XRGB8888 to BGR888 clip buffer + * @dst: Array of BGR888 destination buffers + * @dst_pitch: Array of numbers of bytes between the start of two consecutive scanlines + * within @dst; can be NULL if scanlines are stored next to each other. + * @src: Array of XRGB8888 source buffers + * @fb: DRM framebuffer + * @clip: Clip rectangle area to copy + * @state: Transform and conversion state + * + * This function copies parts of a framebuffer to display memory and converts the + * color format during the process. Destination and framebuffer formats must match. The + * parameters @dst, @dst_pitch and @src refer to arrays. Each array must have at + * least as many entries as there are planes in @fb's format. Each entry stores the + * value for the format's respective color plane at the same index. + * + * This function does not apply clipping on @dst (i.e. the destination is at the + * top-left corner). + * + * Drivers can use this function for BGR888 devices that don't natively + * support XRGB8888. + */ +void drm_fb_xrgb8888_to_bgr888(struct iosys_map *dst, const unsigned int *dst_pitch, + const struct iosys_map *src, const struct drm_framebuffer *fb, + const struct drm_rect *clip, struct drm_format_conv_state *state) +{ + static const u8 dst_pixsize[DRM_FORMAT_MAX_PLANES] = { + 3, + }; + + drm_fb_xfrm(dst, dst_pitch, dst_pixsize, src, fb, clip, false, state, + drm_fb_xrgb8888_to_bgr888_line); +} +EXPORT_SYMBOL(drm_fb_xrgb8888_to_bgr888); + static void drm_fb_xrgb8888_to_argb8888_line(void *dbuf, const void *sbuf, unsigned int pixels) { __le32 *dbuf32 = dbuf; @@ -1035,6 +1086,9 @@ int drm_fb_blit(struct iosys_map *dst, const unsigned int *dst_pitch, uint32_t d } else if (dst_format == DRM_FORMAT_RGB888) { drm_fb_xrgb8888_to_rgb888(dst, dst_pitch, src, fb, clip, state); return 0; + } else if (dst_format == DRM_FORMAT_BGR888) { + drm_fb_xrgb8888_to_bgr888(dst, dst_pitch, src, fb, clip, state); + return 0; } else if (dst_format == DRM_FORMAT_ARGB8888) { drm_fb_xrgb8888_to_argb8888(dst, dst_pitch, src, fb, clip, state); return 0; diff --git a/drivers/gpu/drm/tests/drm_format_helper_test.c b/drivers/gpu/drm/tests/drm_format_helper_test.c index 08992636e..35cd3405d 100644 --- a/drivers/gpu/drm/tests/drm_format_helper_test.c +++ b/drivers/gpu/drm/tests/drm_format_helper_test.c @@ -60,6 +60,11 @@ struct convert_to_rgb888_result { const u8 expected[TEST_BUF_SIZE]; }; +struct convert_to_bgr888_result { + unsigned int dst_pitch; + const u8 expected[TEST_BUF_SIZE]; +}; + struct convert_to_argb8888_result { unsigned int dst_pitch; const u32 expected[TEST_BUF_SIZE]; @@ -107,6 +112,7 @@ struct convert_xrgb8888_case { struct convert_to_argb1555_result argb1555_result; struct convert_to_rgba5551_result rgba5551_result; struct convert_to_rgb888_result rgb888_result; + struct convert_to_bgr888_result bgr888_result; struct convert_to_argb8888_result argb8888_result; struct convert_to_xrgb2101010_result xrgb2101010_result; struct convert_to_argb2101010_result argb2101010_result; @@ -151,6 +157,10 @@ static struct convert_xrgb8888_case convert_xrgb8888_cases[] = { .dst_pitch = TEST_USE_DEFAULT_PITCH, .expected = { 0x00, 0x00, 0xFF }, }, + .bgr888_result = { + .dst_pitch = TEST_USE_DEFAULT_PITCH, + .expected = { 0xFF, 0x00, 0x00 }, + }, .argb8888_result = { .dst_pitch = TEST_USE_DEFAULT_PITCH, .expected = { 0xFFFF0000 }, @@ -217,6 +227,10 @@ static struct convert_xrgb8888_case convert_xrgb8888_cases[] = { .dst_pitch = TEST_USE_DEFAULT_PITCH, .expected = { 0x00, 0x00, 0xFF }, }, + .bgr888_result = { + .dst_pitch = TEST_USE_DEFAULT_PITCH, + .expected = { 0xFF, 0x00, 0x00 }, + }, .argb8888_result = { .dst_pitch = TEST_USE_DEFAULT_PITCH, .expected = { 0xFFFF0000 }, @@ -330,6 +344,15 @@ static struct convert_xrgb8888_case convert_xrgb8888_cases[] = { 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, }, }, + .bgr888_result = { + .dst_pitch = TEST_USE_DEFAULT_PITCH, + .expected = { + 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, + 0xFF, 0x00, 0x00, 0x00, 0xFF, 0x00, + 0x00, 0x00, 0xFF, 0xFF, 0x00, 0xFF, + 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0xFF, + }, + }, .argb8888_result = { .dst_pitch = TEST_USE_DEFAULT_PITCH, .expected = { @@ -468,6 +491,17 @@ static struct convert_xrgb8888_case convert_xrgb8888_cases[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }, }, + .bgr888_result = { + .dst_pitch = 15, + .expected = { + 0x0E, 0x44, 0x9C, 0x11, 0x4D, 0x05, 0xA8, 0xF3, 0x03, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x6C, 0xF0, 0x73, 0x0E, 0x44, 0x9C, 0x11, 0x4D, 0x05, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xA8, 0x03, 0x03, 0x6C, 0xF0, 0x73, 0x0E, 0x44, 0x9C, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + }, + }, .argb8888_result = { .dst_pitch = 20, .expected = { @@ -914,6 +948,52 @@ static void drm_test_fb_xrgb8888_to_rgb888(struct kunit *test) KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size); } +static void drm_test_fb_xrgb8888_to_bgr888(struct kunit *test) +{ + const struct convert_xrgb8888_case *params = test->param_value; + const struct convert_to_bgr888_result *result = ¶ms->bgr888_result; + size_t dst_size; + u8 *buf = NULL; + __le32 *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_BGR888, result->dst_pitch, + ¶ms->clip, 0); + 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 = cpubuf_to_le32(test, params->xrgb8888, TEST_BUF_SIZE); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, xrgb8888); + iosys_map_set_vaddr(&src, xrgb8888); + + /* + * BGR888 expected results are already in little-endian + * order, so there's no need to convert the test output. + */ + drm_fb_xrgb8888_to_bgr888(&dst, &result->dst_pitch, &src, &fb, ¶ms->clip, + &fmtcnv_state); + KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size); + + buf = dst.vaddr; /* restore original value of buf */ + memset(buf, 0, dst_size); + + int blit_result = 0; + + blit_result = drm_fb_blit(&dst, &result->dst_pitch, DRM_FORMAT_BGR888, &src, &fb, ¶ms->clip, + &fmtcnv_state); + + KUNIT_EXPECT_FALSE(test, blit_result); + KUNIT_EXPECT_MEMEQ(test, buf, result->expected, dst_size); +} + static void drm_test_fb_xrgb8888_to_argb8888(struct kunit *test) { const struct convert_xrgb8888_case *params = test->param_value; @@ -1851,6 +1931,7 @@ static struct kunit_case drm_format_helper_test_cases[] = { KUNIT_CASE_PARAM(drm_test_fb_xrgb8888_to_argb1555, convert_xrgb8888_gen_params), KUNIT_CASE_PARAM(drm_test_fb_xrgb8888_to_rgba5551, convert_xrgb8888_gen_params), KUNIT_CASE_PARAM(drm_test_fb_xrgb8888_to_rgb888, convert_xrgb8888_gen_params), + KUNIT_CASE_PARAM(drm_test_fb_xrgb8888_to_bgr888, convert_xrgb8888_gen_params), KUNIT_CASE_PARAM(drm_test_fb_xrgb8888_to_argb8888, convert_xrgb8888_gen_params), KUNIT_CASE_PARAM(drm_test_fb_xrgb8888_to_xrgb2101010, convert_xrgb8888_gen_params), KUNIT_CASE_PARAM(drm_test_fb_xrgb8888_to_argb2101010, convert_xrgb8888_gen_params), diff --git a/include/drm/drm_format_helper.h b/include/drm/drm_format_helper.h index 428d81afe..aa1604d92 100644 --- a/include/drm/drm_format_helper.h +++ b/include/drm/drm_format_helper.h @@ -96,6 +96,9 @@ void drm_fb_xrgb8888_to_rgba5551(struct iosys_map *dst, const unsigned int *dst_ void drm_fb_xrgb8888_to_rgb888(struct iosys_map *dst, const unsigned int *dst_pitch, const struct iosys_map *src, const struct drm_framebuffer *fb, const struct drm_rect *clip, struct drm_format_conv_state *state); +void drm_fb_xrgb8888_to_bgr888(struct iosys_map *dst, const unsigned int *dst_pitch, + const struct iosys_map *src, const struct drm_framebuffer *fb, + const struct drm_rect *clip, struct drm_format_conv_state *state); void drm_fb_xrgb8888_to_argb8888(struct iosys_map *dst, const unsigned int *dst_pitch, const struct iosys_map *src, const struct drm_framebuffer *fb, const struct drm_rect *clip, struct drm_format_conv_state *state);