From patchwork Fri Feb 21 11:36:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aditya Garg X-Patchwork-Id: 867308 Received: from MA0PR01CU012.outbound.protection.outlook.com (mail-southindiaazolkn19011027.outbound.protection.outlook.com [52.103.67.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CC9AC2040AE; Fri, 21 Feb 2025 11:36:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.103.67.27 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740137775; cv=fail; b=lvSolHZCscvIzLeLGfYP6qZqMAKiwk+8lvxckMedYR5qEQBEMn2Nsgy5OelTNZMISbQMir9UaiUuekDineoTDD1282Ov0iwaIN9MFqKAzXDb2uVcYbH/gdz0La1VdLlcF8jjgi2dZquiu6L/l/bXPfd0hvC9Ap4KfadQrBHasX0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740137775; c=relaxed/simple; bh=DJWVuNP4gzwWQdlBCx9ZiJlsW/XWO4AKzHiOc9Phuno=; h=From:To:CC:Subject:Date:Message-ID:Content-Type:MIME-Version; b=sKAyl88dTRy94EZaIYDuZQK5eiSoUFaAVSKrNqZR4WEw5J06kJHbUwjVx892iOD48fyYWuV5uOEfXLSuaom0WAC3yctHYlhjbKvR6R7A0WWfULvGavGH6hpkHdbA9Dz7fjtrLHO3xeDHEM14WaY1BF6Wd23u1fSyMR9rYkdRQwk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=live.com; spf=pass smtp.mailfrom=live.com; dkim=pass (2048-bit key) header.d=live.com header.i=@live.com header.b=iniof2yw; arc=fail smtp.client-ip=52.103.67.27 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=live.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=live.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=live.com header.i=@live.com header.b="iniof2yw" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CTIgXMyiDgXGdpYRp35Clu2zVlZw8nkWWyCp3XgB1YrwiP+niHYwun3+Szmck+fpC1yvNFsHvayqVuyf9NOLSZWUuRB9uL964+zwj1cHnf/zKGE2Y0jN55OkdKDJ0r3NpgfElyLyN8sHwuln8lOzLIvbnpe6vuw/OUJ0h7WR7NfYXv+CcE7CymXC4+RhWSKz2OY5ye9xVOftTRSidq+ISVqsmlxMB4GrpqPDGtf8b0eTuOcarZJwteMGa7gHrNKtUQGgk0bG5ad4YPiusd6D1YBbq9lH/bgebchKpGxJ/1pVLrabQyYUAZ9G7sJP3+5bTz7vKHc5wfqVUhIFWfBqmg== 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=b7YHFu7v/bv/9AABEWj2muQuuwY6ueCX79QT2sAl/Xs=; b=jg42j/u848D4/V5Wd/UhQBScYfOwFo3Oj8OoM1+MkgrJjIk/r+idEdLsGVCyU5viCAwachKsC99gU0UPlB+zrIJ9aQd5EW9F2KiJQeb/ZF/MkqjFLqf8I8b/ynyF/qupIZHMR6REsMmfbV3B7a5CIvaXWFrp7vFq0jKgcuODZEJ7IvrNMk55RAHDGSerXt1RtwXHxtqfF6u+eVXBVuCeC4r//lx+L6uY8BxsDyfcITK2x+eW7ASUdIbNZx2puLmTN3vHmxn8BiDbo/S/RRLVvclT+6iWXQkSsXfdkR+BpzPrQgXaDC3NTTwcWgQOqo65wdEWxO2aibzBogXYnvJVeQ== 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=b7YHFu7v/bv/9AABEWj2muQuuwY6ueCX79QT2sAl/Xs=; b=iniof2ywYa8QLtE7iVwDPXpW1ga2LEa6II7vZGv2nShytm918w+GHYNJFKoMMhPVo9KrXyt2tICF9z2j2M4ye30MGP0MwMI8m5CGWrahf9JEVYM+aIazA8FEnbM0S7t5Mx4OvuuYsre88sQ0pObG6CKo+kKkFC2MI2K1YH6u5ewKFgekXDSrocJRRQ7s11aLm8nBGdt6WKmP/9yOqEofO5zWb7vMxXGFDqdjAMZ7DB8DlFofmHY4yRFTYaIoDim8WwlvJfw/byNwcoApcaoMBnizUxuuLrM3v5EriO6TJXWrfsdZeuETjhd+1AxGE8W+k7vRz9uFLwgxeeroqjZDpg== Received: from PNZPR01MB4478.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:1d::9) by PN3PR01MB6457.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:84::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.17; Fri, 21 Feb 2025 11:36:01 +0000 Received: from PNZPR01MB4478.INDPRD01.PROD.OUTLOOK.COM ([fe80::27a3:3d7e:30be:e1d1]) by PNZPR01MB4478.INDPRD01.PROD.OUTLOOK.COM ([fe80::27a3:3d7e:30be:e1d1%3]) with mapi id 15.20.8466.016; Fri, 21 Feb 2025 11:36:00 +0000 From: Aditya Garg To: "pmladek@suse.com" , Steven Rostedt , "andriy.shevchenko@linux.intel.com" , "linux@rasmusvillemoes.dk" , "senozhatsky@chromium.org" , Jonathan Corbet , "maarten.lankhorst@linux.intel.com" , "mripard@kernel.org" , "tzimmermann@suse.de" , "airlied@gmail.com" , "simona@ffwll.ch" , Andrew Morton , "apw@canonical.com" , "joe@perches.com" , "dwaipayanray1@gmail.com" , "lukas.bulwahn@gmail.com" , "sumit.semwal@linaro.org" , "christian.koenig@amd.com" CC: Kerem Karabay , Aun-Ali Zaidi , Orlando Chamberlain , Atharva Tiwari , "linux-doc@vger.kernel.org" , Linux Kernel Mailing List , "dri-devel@lists.freedesktop.org" , "linux-media@vger.kernel.org" , "linaro-mm-sig@lists.linaro.org" , Hector Martin , "linux@armlinux.org.uk" , Asahi Linux Mailing List , Sven Peter , Janne Grunau Subject: [PATCH v3 1/3] drm/format-helper: Add conversion from XRGB8888 to BGR888 Thread-Topic: [PATCH v3 1/3] drm/format-helper: Add conversion from XRGB8888 to BGR888 Thread-Index: AQHbhFTIgiDbbKYiw0mijjb2mLA7Rg== Date: Fri, 21 Feb 2025 11:36:00 +0000 Message-ID: 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: PNZPR01MB4478:EE_|PN3PR01MB6457:EE_ x-ms-office365-filtering-correlation-id: d2b787ef-e183-4c7c-8b2d-08dd526beaa6 x-microsoft-antispam: BCL:0; ARA:14566002|8062599003|8060799006|19110799003|7092599003|15080799006|461199028|440099028|3412199025|41001999003|102099032; x-microsoft-antispam-message-info: C2SvoPCpfeXgBU9RZLIGmd4Znp07FkaAU0jQNAub2UK/HwTxbnQ5J5eFhwWMGSMuy4tyBwESmz4/1MQ/TpPZkMtY5uFuhR0KmoGHajBhcJIj4t8w8dILK0tTkA3QBx6hhbOmdPyjyvLSg4YrraUg3x4ilJHJpBFdG284yneAp5SeCTu/W93ihOiNtUjfc4UEMcLj4SeNxn4y9d6gH1iJ7qS6yRzJUu1WJt8Qt3QAF35FbQ2+c+Z69OA5SmEPcIkeBtdPDU9+T7NoImtjNAHbMKz/3+nsPauXUmNQBaXz5t6Pbsmav2cVN/oflVT/URqn8rWZK6A/s+P4KnTr8Kkl2N1exXvYrnKJEJ9EzJOWCghcYVs7BFkbF+ntTQwUYVwxLtasF7GOdyWcnz3LZ/c3PzcFSmU+S5TfO/G3+9DO3sQAxFmkDGNRkPjiepWhxtfArLXIK800tF2Zx+gKYPn0v3TF+kNKMLRD8hHQRrIX0g+125/y/ITasgu7EgUfXlWJZL2gBSVomRnXjDFioSNNp1ePMy7P/eSTNzT4GORBhBxNB6Bvicc5c/SzVBvQUdCgKe72t1D4KPpXqFTHuNp4gF3+eL5TNWxZitCpTZR2m5TGFx1J+vi/5bLPX1iDmRJ8O22Ed2AKu1sD67gK9r/4seJ27lE5IeuEo7K/FMWVzNvrQ1KaJUHocd6CRQ4ljUbaUmT2a2fAa0pGwK/nGCw6agQlMtVg2jqUskG9YQTe1QQYjbwin+O6dlf2bvyjEHBWYnIZBC+LoA6MndZnRSqYWA47P5Za3D6cZqAPe4DVqRaUV3ACvusK8TuCjtcFrCDydZ/tRBSFy3OKL25b6YU5dpaB8a9tS+NPQkvAh2XI2wG/ytOP8FyQy4agTGd/YLzoSM/XnoyM124A0Y+1zraTuEZLdbCWRTNlKY2b21oIF5ZAEzBo53b94vbuh0YZvRxmdhsHR1K6C8ecDbU6UJhQPoClheudPbtuwJVRigj9xh8nEKmj6hm9pYNY4lCgU4uplFVmO+tlTMxiT8S4/tZi4KuK0bycBoiMSj17aMTJtiPAq2/KBpOjZPSU5mPAKwCnvS13BQb13WXMaCcI+Ot2o99UdrnFGwEKTZ398bbIg+Q= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: NcIoGNLdaqtcHbT6+vOh/R5FntoFhkXj9JmE21TlcxsiRacBdwilbKxCmqxvi1UgXOOgob0UQqCGY0MJSP0yVnaJZv7QaLLAmWFS7hxTixsF7nBK0cdzYgxs/ZxD8KTXjK/6RuPPP5cNPGJP5YjBaqoqU4sMqK4vuANPk3H8IkCw3gXr4jWOmVZpbHQa4W3+hBWTJrtXrrCnu7ImWBtc0V+woQgbOgsW8qBAIHyIBhJhKzJIPhQyusQc8bhkDClFfo7bJVvyrhj8SUoNEfiDPklQRi6k+5AcyMdFHJcrW/VSpIEqiJY2mJ9MtKcAwSq+rxxU0EgDLfyqLIw43Pk0Rh5irgppqTGlnNpPonK1wdBF9QwFBn+lwiGBSUjynDoO/0sfm3TBUVThurEhqinGtNIcwsw7jhx2KUNn5VyRkDqC5jFzHBi/pkGN1fkT3zK82xdnIiiEZghhBx/qOjEiR2tVJo3/YIBo1scj+ESCAQM5aTpKofCGGTxMQg0YpSB04tRDav88H3MFpH1gtBCreQgP843oQgXFH4vAJTLPvCw1JOhidHHu4VQcIx2/YFH9UomU+c4Yw8yZb4Lo0zoNf+MzvL2Vs/8ANp9KhmfV3k9leofgsmEHMi4PyuWmEMW9z/IjB5Zbn9S0ZGFZGA9ZcRilSO9svIvFZ+DN3b6BZFSBbH+yKMAI++s1MaP36B4Od5kHK/HxRTXIOv6KrkDMSCVSiLYn4R7v3mGiHuVG/B0S5veYywEgnOQ86gM3pGvean9MaurTyhCtWFvBGPn3r9cmmOOVTrZul3yn7yfv5mmelTKy7YwcUaLuQDSBTMbZQHYiLYRrG9Quz15osBtGRolk9jOKDjU1cMbXO5Xo0weZ+FhREl4ZUR6tB25j5Xdq4KeCdG39tz387YkZoD2HJdSqwCFVemrlmIfxKJ8LXVfz0lSgOAZBgwFU4xNq8Yq2YFFBsv5oaPFGD3zqqcwKCYZ1reBQID4O/jR3uZiqDgoXHw3PThP+V3qdfSkLmrH52j5po0Q+EPX4Ar6gxQf7cjzjKMSFZvdPM+OG0DCOX3TwlD0CyYnPZKZIM0OlWA7t9kx+jBLT6FLeJxt4OvrUCjKVT8r09bYCYU2q8mmRl/akwM0E8WBHjwYvFwb4lVscSZC/C1QqqJUAGtVE7GqbMdmhZIrMohOMt6ZuKiw4Se47gsI0Fw1cBWmI2FgG1qX7PhqVE4rngpf0bUGFWM2HJd0nfHrlozSbYwjjvAe+a+iEv8p9YWPPhmakdDg1Tt4l6AkupYu5iZvq/qFwPWHMZqt0VSfDj6D6T16ntdG8WX6EjgES2jQMUmblqWcbndN2 Content-ID: <43988FB88197EF40A9C46BAB804BE7F1@INDPRD01.PROD.OUTLOOK.COM> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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: PNZPR01MB4478.INDPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: d2b787ef-e183-4c7c-8b2d-08dd526beaa6 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Feb 2025 11:36:00.7880 (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: PN3PR01MB6457 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 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);