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: 13985276 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 284CAC021AA for ; Fri, 21 Feb 2025 11:36:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A16F610E2CD; Fri, 21 Feb 2025 11:36:15 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=live.com header.i=@live.com header.b="iniof2yw"; dkim-atps=neutral Received: from PNZPR01CU001.outbound.protection.outlook.com (mail-centralindiaazolkn19011027.outbound.protection.outlook.com [52.103.68.27]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3BB7610E2CD for ; Fri, 21 Feb 2025 11:36:14 +0000 (UTC) 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> 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 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 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); From patchwork Fri Feb 21 11:37:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aditya Garg X-Patchwork-Id: 13985277 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 9B4CAC021AA for ; Fri, 21 Feb 2025 11:37:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 13DDF10EA5A; Fri, 21 Feb 2025 11:37:28 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=live.com header.i=@live.com header.b="VwfgHJTm"; dkim-atps=neutral Received: from PNZPR01CU001.outbound.protection.outlook.com (mail-centralindiaazolkn19011033.outbound.protection.outlook.com [52.103.68.33]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2EB5810EA5A for ; Fri, 21 Feb 2025 11:37:26 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=moCLWwChdTFrj0rKN1C3DPaWUuRz/FEnVtmbuhHYSjTVX2bcV9Gz6rWAqhDe2MN0I7iUQaU/mdqRA+eErx4gPqw0YRE8p1yZgKHpgQnXGWx7d6Eg7BEIf4hOnLQWkcLi50OiynONVmVRTpQRF38r96hi5dxYFFzcwQv1wjVd3XmRKo0P+Xi4E7c+VXG+eM9SWGj+P0B83OzJ3fsXQtXDCBHNvF7QZR6hjjtCbNOliA+amDVU/y0YTu50Va0Go2kuXaaa5qRSfjMuOMt1GE4tdZPIl81by02VzrtWEZdEZFU3cbCXMUozahRwk/4osA/CeWc7H41srl6knOAqga43hg== 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=TtDHMcw1b6+smQ9zjnsyzlYPYrXKiqgZ1ffHmC1S8AI=; b=Rud3LzZjY3KhdhC20wkdwZKG5OY03E9441RlJ+1/RVuIjegkkboqn8Zt7FOD/De2g8mv9nGh1oRqAA1TZ815yyB7VMUFCFtO+v2PaHyp4FVcSmw6S3eEOZ1JPom7aKVGVY2751YzOlZtVXDeKa3ZGkWRlcfCKMmAHl9v6AgmTda9SAkkpNtkvLL4pGooz1DIbgUK3vohMM4N6jhRQZfi5dt5nXV2ZR5iqMxM0WHQU14Ytjxs0fhfUmO/r3gcxl/6DtTpaegjEnOUdAU4OkSRzp8SMLOkQZ9VeCc7ME16WFswuM2aTFSlauMERXVdffdXC4SYF03yAhfgopgdUUP71g== 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=TtDHMcw1b6+smQ9zjnsyzlYPYrXKiqgZ1ffHmC1S8AI=; b=VwfgHJTmV4OKO6BdTFH5bz6n7cwEdEeprTjJvR94N/BX2/2VzO1yw5wS3LwkZSLN9Q6zmOmoTZkk8Gp+gxuI9ghHBtcB6rD9jJ/ezUm+JjP3FM6vEkSaL8/eEU4WRuxxqdGmArUHqbbotV4T4KJ8L/r4HrjpMXbz9aqQjftTNiprpVWjkFHLUNEsmoVCHK+xbSvsm5wnxJp3tMV66TQ+0fLxh3bT2jRGMqJMrmFhYmSbUOnawDmlMOiAW3q6vuDxOOQvK8Z3bGTXFyT1VWjFMBlpTmngTYXXLsUd31IeFzP6oOO87QrsV8JKwYXGqKXHS0uTYxoXL+zrOZrPE9o2lQ== Received: from PNZPR01MB4478.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:1d::9) by MA0PR01MB10284.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a01:127::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.16; Fri, 21 Feb 2025 11:37:13 +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:37:13 +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 2/3] lib/vsprintf: Add support for generic FOURCCs by extending %p4cc Thread-Topic: [PATCH v3 2/3] lib/vsprintf: Add support for generic FOURCCs by extending %p4cc Thread-Index: AQHbhFTzgQy2ndYjv0+1YtY5sM6hDw== Date: Fri, 21 Feb 2025 11:37:13 +0000 Message-ID: <98289BC4-D5E1-41B8-AC89-632DBD2C2789@live.com> References: In-Reply-To: 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_|MA0PR01MB10284:EE_ x-ms-office365-filtering-correlation-id: aec76da7-c7bb-4c83-b1b3-08dd526c162e x-microsoft-antispam: BCL:0; ARA:14566002|8062599003|19110799003|15080799006|461199028|8060799006|7092599003|440099028|3412199025|41001999003|102099032; x-microsoft-antispam-message-info: ohtFrewhkxeCfr1INrJ5HqBUWr/bQwz45N3Hi3dKybqNz8zaOg+bWyGP6Fy7ojO4Q2yJ34F9npUJ/wHvlezCzUcttthL9l4vypin54dLEX3Z05NWbL37taz9ZSlobMncnr/v9cuejZR7jTer7G3WNn9oIhNfXKk8ecIO0cl2RGH2fcMdzGfjHFOKtqIkrtzXR7OKmZIszEZNoY4RL84Lbj08WKTvYAh+dPhRMAkb4v8fEZLEEvx161eeNXnJjuF3SJbLhlIlNokrAB4uLYMyC03fAB+Edp4+CKyGkSz773/JerD2MN5CC1PkjPamDwfAX80po2nrIeYeTCECIM+2QrmZcrJ30btkhCwaT8d4SxYunjJ2Pl9xDo16DcaGya6IgjnhB+p6t5V7KDk3SmuZEU9FOcfaQMLXNBNd2n5zm6YizEXB0nrHJC9kpERv7lILUIYXqdREEOn3z7011hGrBYq7TFC5hLaUhtto+IftR3kW2QFROnr9/FymfFMR7Oa5dTphLBBJihBTXc5CcFbWzjEJtc++BccDOjEFZVKCdPd0kijOciVEund+nhrUqhrjN9C00w9GDW4W5dUnYru1MPkO+asT00n90r6m4nHY5EW+2iPcOgOc2kjtirGT8HW4RoxYlAu9806qXUOccubaxunnAsQD3ad3hV3M/lRDn2diaOB48Zxo5flWafRYX8+oBn++6HtF0PAvnRBWQo1ya/VWDI7i6E5h8TYLRe1eN0+IXI6Q5YB7vAGNyvj1ycs2Zj0QHxPJwsOozGjaUFO3W/3bfxdWskxY1QRtIGmxznkyWuN9Cg03hyJQuK6kWboyDZ4a+X6cNGZdFTsQMN2l/kOIkYqaPT0AbA9xsOCvkJFK+y+yJtiq5XrJYItKxPkrrjJMkY1wPQ4HjxX9sx2P52wzA0vPfYprWT2EywkICSZjePP3KaWuN7SaMof0PsIFqLubiUU5FbvpW7u4Nu/pbJ285kuqRZi2aPRPKr+UlgltqB/LTGA5IoAsV5MbG7VhGhMB0PHPtSCEv3RibjwCeXLKEBTTZdLI0mhXbmbyW7dxSJvn5/D8LrXD4UMCbSStAACxtsgGwsAYFoz9e44ppEbpoSkaoVMb2cFB6/loolk= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: euPN1n7u6Ae9lkpNMBVL2GYBz53CDAGcBOoqASLZsw8u7N9Lruum0GvYWXoIvbOcIy1iKTc2Lo6L3772UwpRWRomI+5KrDfbkB50NDBEJ14AEKm911gUNGYkR5QbYNo2f46HNdPbDvUXVn5khCMadmHIVs5MEHkhlcMoP4HmyZv9hjRuBkSn0t16F9lQ24wGK6AjyaWbluRODNDw1c3aoMjwQG46WPLN94wPb7/3Rmd2O5rc0yTt44nE7LXqwd9/cGl788ezhnoYY5+J4hRQFIMWx/XABc4mwIWHFxZcU/EETkL8hWojmRHW5Oggixedg9UNHsZqdjcg4b7rCYGzRDU9aRaVO9ttePFNRwWmNnMYyjJoLt7v+xuN7G1mvymKSeEt6OK/BqRn+TJcUStdks4kSA486TYih4EB6oBOM3EFZPMSGMBgEAu4Pj7UesDyTQOwRhQR0tkHofEuywNIKmB/WFzteLwNSzqQpgt9D4MSf56Oumc/Raosiqv/jyMJiFnUIYaz8Q39BW/ZAcI4gaJ+bpVpFjG/KlFpRrS5UQ+MeJTdAbQgTQ2KRbemPzAh9LVafD+Do0UoZ4gF26salu504w58R3ua59ujugR4hvnWL1c0++ZaadCAPBWf4hj74CnJ077YNErHxbrm9jPJzUU9GSwYK/Fs1ArROzI3M7NR0JJSWxK6fBZoLx+BWForn6Ajh+WLtCZYPFgT7Q9v9IjXRBFWnM6AEv2bcMxVAQ9WBk+E5lUwU+bZvcg/RlpU9YDwVpJ3v+CW2/QPMS+IJq9QMzG88UxGJ/Wh93zVMxLik42yuNfFfHqUu0m25AUVpzzDyuIVXGPP3Lchui1NEhxGE5W7C0BFYGdV8iGkPSxD1obVUZ+esdiM/RrWUWKsEottLGv2vsROrt0NDkrhGRMbXvXi/g6kN0Uq2f0cJgBSaZ57o+mLgm/nnjF+J+bd5R4OFH0Lj8Jy2t0U8lwHGSWcbJ5JdT+QV5hhQNQTqI758YNTPyAaEfOauseLZ7l6w0EwjW9MQIkwi76L5vhYi01NcntykYlA5XnGe3hkJVAyA/I+7fwrwJfCUqrLNuYQ2HtNhtK96iPpqJ+KEViUVW3bsRLG7tTyAhmqvMJDvPCDU+WKpHByW1FK/EKq8AjNMbFLGCNGxvCcHOLKobk+TYKccV9k0KJKVGAFe8mR+a8N9ckPO6ELQt6nLgS5aTRxq3ye8yfp8+NOc4NdPvt/1QZi6Z+scd7CBU8+wnEI2AYMcRefA9hYnONw3/TYsa/6w9i8MsUVRbuaQy8XHZLSWS1Wq4e0s+M4kRoXhdViJt4c2KBs3aMtFwNIA8ttxfzp Content-ID: 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: aec76da7-c7bb-4c83-b1b3-08dd526c162e X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Feb 2025 11:37:13.8244 (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: MA0PR01MB10284 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: Hector Martin %p4cc is designed for DRM/V4L2 FOURCCs with their specific quirks, but it's useful to be able to print generic 4-character codes formatted as an integer. Extend it to add format specifiers for printing generic 32-bit FOURCCs with various endian semantics: %p4ch Host-endian %p4cl Little-endian %p4cb Big-endian %p4cr Reverse-endian The endianness determines how bytes are interpreted as a u32, and the FOURCC is then always printed MSByte-first (this is the opposite of V4L/DRM FOURCCs). This covers most practical cases, e.g. %p4cr would allow printing LSByte-first FOURCCs stored in host endian order (other than the hex form being in character order, not the integer value). Signed-off-by: Hector Martin Signed-off-by: Aditya Garg Acked-by: Rasmus Villemoes --- v2 -> Add this patch v3 -> Make array static Documentation/core-api/printk-formats.rst | 32 +++++++++++++++++++ lib/test_printf.c | 39 +++++++++++++++++++---- lib/vsprintf.c | 38 ++++++++++++++++++---- scripts/checkpatch.pl | 2 +- 4 files changed, 97 insertions(+), 14 deletions(-) diff --git a/Documentation/core-api/printk-formats.rst b/Documentation/core-api/printk-formats.rst index ecccc0473..9982861fa 100644 --- a/Documentation/core-api/printk-formats.rst +++ b/Documentation/core-api/printk-formats.rst @@ -648,6 +648,38 @@ Examples:: %p4cc Y10 little-endian (0x20303159) %p4cc NV12 big-endian (0xb231564e) +Generic FourCC code +------------------- + +:: + %p4c[hrbl] gP00 (0x67503030) + +Print a generic FourCC code, as both ASCII characters and its numerical +value as hexadecimal. + +The additional ``h``, ``r``, ``b``, and ``l`` specifiers are used to specify +host, reversed, big or little endian order data respectively. Host endian +order means the data is interpreted as a 32-bit integer and the most +significant byte is printed first; that is, the character code as printed +matches the byte order stored in memory on big-endian systems, and is reversed +on little-endian systems. + +Passed by reference. + +Examples for a little-endian machine, given &(u32)0x67503030:: + + %p4ch gP00 (0x67503030) + %p4cr 00Pg (0x30305067) + %p4cb 00Pg (0x30305067) + %p4cl gP00 (0x67503030) + +Examples for a big-endian machine, given &(u32)0x67503030:: + + %p4ch gP00 (0x67503030) + %p4cr 00Pg (0x30305067) + %p4cb gP00 (0x67503030) + %p4cl 00Pg (0x30305067) + Rust ---- diff --git a/lib/test_printf.c b/lib/test_printf.c index 59dbe4f9a..4bde40822 100644 --- a/lib/test_printf.c +++ b/lib/test_printf.c @@ -776,21 +776,46 @@ static void __init fwnode_pointer(void) software_node_unregister_node_group(group); } +struct fourcc_struct { + u32 code; + const char *str; +}; + +static void __init fourcc_pointer_test(const struct fourcc_struct *fc, size_t n, + const char *fmt) +{ + size_t i; + + for (i = 0; i < n; i++) + test(fc[i].str, fmt, &fc[i].code); +} + static void __init fourcc_pointer(void) { - struct { - u32 code; - char *str; - } const try[] = { + static const struct fourcc_struct try_cc[] = { { 0x3231564e, "NV12 little-endian (0x3231564e)", }, { 0xb231564e, "NV12 big-endian (0xb231564e)", }, { 0x10111213, ".... little-endian (0x10111213)", }, { 0x20303159, "Y10 little-endian (0x20303159)", }, }; - unsigned int i; + static const struct fourcc_struct try_ch = { + 0x41424344, "ABCD (0x41424344)", + }; + struct const struct fourcc_struct try_cr = { + 0x41424344, "DCBA (0x44434241)", + }; + static const struct fourcc_struct try_cl = { + le32_to_cpu(0x41424344), "ABCD (0x41424344)", + }; + struct const struct fourcc_struct try_cb = { + be32_to_cpu(0x41424344), "ABCD (0x41424344)", + }; - for (i = 0; i < ARRAY_SIZE(try); i++) - test(try[i].str, "%p4cc", &try[i].code); + fourcc_pointer_test(try_cc, ARRAY_SIZE(try_cc), "%p4cc"); + fourcc_pointer_test(&try_ch, 1, "%p4ch"); + fourcc_pointer_test(&try_cr, 1, "%p4cr"); + fourcc_pointer_test(&try_cl, 1, "%p4cl"); + fourcc_pointer_test(&try_cb, 1, "%p4cb"); } static void __init diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 56fe96319..13733a4da 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -1781,27 +1781,53 @@ char *fourcc_string(char *buf, char *end, const u32 *fourcc, char output[sizeof("0123 little-endian (0x01234567)")]; char *p = output; unsigned int i; + bool pixel_fmt = false; u32 orig, val; - if (fmt[1] != 'c' || fmt[2] != 'c') + if (fmt[1] != 'c') return error_string(buf, end, "(%p4?)", spec); if (check_pointer(&buf, end, fourcc, spec)) return buf; orig = get_unaligned(fourcc); - val = orig & ~BIT(31); + switch (fmt[2]) { + case 'h': + val = orig; + break; + case 'r': + orig = swab32(orig); + val = orig; + break; + case 'l': + orig = le32_to_cpu(orig); + val = orig; + break; + case 'b': + orig = be32_to_cpu(orig); + val = orig; + break; + case 'c': + /* Pixel formats are printed LSB-first */ + val = swab32(orig & ~BIT(31)); + pixel_fmt = true; + break; + default: + return error_string(buf, end, "(%p4?)", spec); + } for (i = 0; i < sizeof(u32); i++) { - unsigned char c = val >> (i * 8); + unsigned char c = val >> ((3 - i) * 8); /* Print non-control ASCII characters as-is, dot otherwise */ *p++ = isascii(c) && isprint(c) ? c : '.'; } - *p++ = ' '; - strcpy(p, orig & BIT(31) ? "big-endian" : "little-endian"); - p += strlen(p); + if (pixel_fmt) { + *p++ = ' '; + strcpy(p, orig & BIT(31) ? "big-endian" : "little-endian"); + p += strlen(p); + } *p++ = ' '; *p++ = '('; diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 7b28ad331..21516f753 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -6904,7 +6904,7 @@ sub process { ($extension eq "f" && defined $qualifier && $qualifier !~ /^w/) || ($extension eq "4" && - defined $qualifier && $qualifier !~ /^cc/)) { + defined $qualifier && $qualifier !~ /^c[chlbr]/)) { $bad_specifier = $specifier; last; } From patchwork Fri Feb 21 11:37:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aditya Garg X-Patchwork-Id: 13985278 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 E5CF0C021AA for ; Fri, 21 Feb 2025 11:38:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6C1D710EA54; Fri, 21 Feb 2025 11:38:09 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=live.com header.i=@live.com header.b="NIO2z3tG"; dkim-atps=neutral Received: from PNZPR01CU001.outbound.protection.outlook.com (mail-centralindiaazolkn19011037.outbound.protection.outlook.com [52.103.68.37]) by gabe.freedesktop.org (Postfix) with ESMTPS id 95C2710EA54 for ; Fri, 21 Feb 2025 11:38:07 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=g9d/IPttiadWiS4gsWUiYXuNbj9WuQ3swjW1cKLOospnnmHmtRP3lIxrDEHp7BAXEFanAGRL3UHkgpboFVfVSuLwELzLMTa8bTXHWvh0roacUSuqb5Iwf+daRhi+1+gtJT3krcXybY/f7b+oy/IMvQeA+GibSGrAPVho7DR/oa2upn/mTzk1wj1twildj8fO+1tV514iMnNBUJaOUumK7jK3GnPaV4tSYT7qduWTdYCm5IJuedlYSHEBXKtVuSSe7DeJUn58EfK5k2KMHD36mEn6u8ROTNuVFL0ewAJ9SDkyrpTjod8TltHI1mPSTTecgD5c2cGvvCWCCb7yBB/7Aw== 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=2k5zCvwqyOOz11llCzBmntKwQ/marnl1k0i/LvvSNgU=; b=YwxdI6mCJWZhzCb00h7DbTLQF40rglQvgX7PVaBNNf4xqJQ2oPoIj2GNRJbVIRvkEVsxc29KuaWiHmGaAx51lGTGhr/aLNNXklhL6nQyijcWr1CSgLF7wJFc1NV1BR7X/saubzb+ZrSLMOIHikd74AK02arQ+47P0pkRCWQI4fOvlhiW76CfkbsYQfQ/iVWP8TjqaJs/0VhPAQCdO5hpS8obxRzvygeesaQkUBSTzutWBb6GoHRSAYEZk+u3YtSyXRv6W5uom562RhANuVJ59GQJJQXzc4w/Ef/5oMsJKK9p+Cgky0C1RuXQ/LNqgDaKvEk4bDIVfFNcbe5awdbqSw== 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=2k5zCvwqyOOz11llCzBmntKwQ/marnl1k0i/LvvSNgU=; b=NIO2z3tGFd5wePraoFrXUSvQJIRhqOnGXIHt0FHPrg5SA7Ytd/uGsbjLVnridMOhUgRHhwnhIzqoH09cyQxDN4oBRpiORRmQz/EG1Ah9+m11K7d4KNJzdCk8tAfdB5CWlkOMY57PTotZLCzUlcNS3TTIK8SEOe13plHMJeP3BS4vWPirjhsntOSKP1kTVJCiD0m3tF7BouCxseBWwnD3QiiBomj2txCXNV0/mc6hNIK/g2rdH90420VSAaiCPS5buCvv+x+d1jevokLRpCUIZ+6q7brh1XAw3qCSPjskkm59WYe0aR4XYi+Uv8ZcLthFmlIcnfP/bmfAQRAdqUj+ag== Received: from PNZPR01MB4478.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:1d::9) by MA0PR01MB10284.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a01:127::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.16; Fri, 21 Feb 2025 11:37:57 +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:37:57 +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 3/3] drm/tiny: add driver for Apple Touch Bars in x86 Macs Thread-Topic: [PATCH v3 3/3] drm/tiny: add driver for Apple Touch Bars in x86 Macs Thread-Index: AQHbhFUNHlw/FROyp0uigtAT/tjzfA== Date: Fri, 21 Feb 2025 11:37:57 +0000 Message-ID: <8F522D41-5417-467E-B9D3-7D9FC24AE536@live.com> References: In-Reply-To: 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_|MA0PR01MB10284:EE_ x-ms-office365-filtering-correlation-id: b3e924ef-cedc-4939-8e97-08dd526c3023 x-microsoft-antispam: BCL:0; ARA:14566002|8062599003|12121999004|19110799003|15080799006|461199028|8060799006|7092599003|4302099013|440099028|10035399004|3412199025|41001999003|12091999003|102099032|1602099012; x-microsoft-antispam-message-info: GsQqayPSipeKHl7jNNphs5tRhjOFPOpE2YE4A2HZInRUUzA+NVkiKloW3ZwHkTjFbLWjOUSwQqGUArNz+FuyNy1cowqxcpJ/kVavCOvebI2tY0xdQ/rBBHzRyjq5E4Ss8BuO9CtPCLvBe81Su2gt3x2Bl1RK/Ov8d5b73h992UjkOYR0OxIm8ygIcaiChuZdvR4Gw87uH9zxhpqM6stRe5xcxAyIGFftKrjFET/e4KLJd0qEzh/kpw7d1U+G+4Bnel9JegOLctXTPgJnGkT8o3Nofmt6SpYAwTXJgqHjPFcn66C1qGPDyEA4gBorCZr/FgOGIKdJPuM5CarDw8L3UDIXziEo1FPRTY6e0wHNHKEe1a22grh9gteXR26Xbi4OqVbI0KdCkos1i9pLVr1FXlUJi2tlo6VkKqvmhMZu96clyO1N0Zbm4BUXNQxqULr88hM7QF+Hp29TwY8laeZ1cOeL7Bd9+lxmA8SjGLiuu0Q3Vz27Gm408FDcky7Xddmb3pkivo7XtWpNxuYSbvci+KSSvXWmO1j0SUv50HB/NAo6inPfLlnOaWxcusQI4VC9C1piE1dDpNcvQkhXuvz2PVemQAcT8AD354rdUYWQM0jclCF0eSWVbCOcG9ChsrxViV7hkpACp2CVPiPFPEtDNIDB5Ll2rgQJZQhsonaU2bvxnj758nQ4wHvFg8Yppc9jATraj1UE8tp7uJDo8WhS2xosY8OQCNZq37RHTIB0IZhaUIh+pSDZcTOTSTDQnATYd4ZaYa5yp1rV2RjltBI5cRaao5Mxeqs/jeFD9agCKvAZJkgg6lAgDbWWMxqV9ELi0arASX5ASKNexat/59QRWP4LOrqNgZc8XEiDFgY7C3qxzxjP5PG9pQKDZHO6KYaaO+qgSAjEQWZzAGmrzd6Al8bczwDJ/qNlo01eHQup4V4VFR5BOqJh3lJTKJIhWJ5R0yC01XKFa9itbbKVeOTV7mp2JiYocRa8LSWFfDnyDwV1xYqEnA7JEWvd90I7Csz3PmeE0MqYGF9s2s3LQjGDsqkmHTLYKiyqHDIgwxCV5fVI5g+GAVJPB7s/MAsKT7nA7TavIoXUJWU2QBonexOBjLSYXfUW+c3KsTkLtzPVtn1obHnfeIOOREIGQ3ScB8qhIhf9a8CLZ3AfgCY/egLQbsaeNuyKnzU+fIVnZgwr7Jn3XwqvWFh6GVNVP1MuVfKmKOFKUOSttd35bdK2SQUqHr2+RWAns7gK6SFespLzPFKTHEY6ycHGNr5pUo86S1Xp1quRyazC78mVfsh4V3ApxCp8c4WcoUY9x3HZnnJLgsk= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: si6/RA2LN8U35kwUp+Gskfv0hEGL/F3xqehoNNG5ro/ymseK+pqtvsY1vt7U0Y/A661w6f/JJrcljLNnF0ooFno1knipktCuphywJ9+ORBbTMGxuxN3T5cfzNhecF3+Su13KrFxJloe7A5bWDlff2tx34Mj1f265lqbcWy51kv+GzJB1/7V+1pAyTngzaCjqi0HPuvmUaun3TwRKar5ZhJu3SRJCpFdIr6IOMAgxIA/6QxAGQZdlx9s8XF/wx1VavZ2rJ+8hlLtv43u++9DrlMWOD0ya6cCfK10tHUPizruq+JaoeXXBZ8Z21tLhmi/CL/jmQhOLaY/bd+8zLuaTMAGYsVg5BEBZNSK9pkyK7jK8FsilspU9vO3ur18zKQhl2DbkKndiZvyWmKwpZ24ieqoShEkKSoQnWMs6aoPbPfdm3oya0k5khfKgTImV7buFdQHHR1bvm7q31uk1favT5MIi2St9bYGtlKhXrprinEFGSx8hN4VUv+D2gy4ygBMnd1EyXRyU1aZw/M+ra7igzpT19KG6IBFtr1YdR1Hq9YUxsG/IwgSFELJKXQWp7QtDNMNDBBQac4kYbj7Ss76iGt1IZUauTAQpnMWjVDx0s94mO1rqvKjYVqBWLXjvMmgoSozm1IvMmYE2DBZUoNqGo+Kjk+c8wzZGvNZNi7N6ycnKozTi/tuFuGOvAT9lEiusJVOF0w8fPWlM52kR24VntPIYvbFtHJOiquq6n8qcU6Fuhy8YRu+mjeB/ZaxRKCFrdiMTcZRC2y6CR+CLZkSQ4yYFPhqt+R9p8MD9qUfbJ6qp1SqAFhKHS733jRwB7iJ+onMIL41SovdNZAq9D0Bq9T8EFl6Rif/PShwIVkvoWyXYtISqpkF4J24D07c6Hjb8J96FulkFC+3Pz8Oj2Lo68wuaJAynqtwR0QGEBx5z1ZXe0xW9B1oc871q3jtSNbLVo/XI7MFocqSA7ks5aOH6hi1NcJ+8x3cCTyBIMGhlCTFUCczm/p/y5RFEaRqgRckh8H1wRubDkY9YDYeY7RK0pV/YrGsxc+ixrN+CDu0miET9rYRVxnCIXvFkgXcuzl5oK7DFpJSiXK9vQAqWnQtSUr1Hc3xhbZ8rqVGBl+nMYATJIx9IdQpgvvmT7ZOAi2LYszyFL16jn7mVXnExELH5kKF/ExYKsPqy25Czt76wlGqBIZHI9iDlb3YTw/rmUM+4aMrm65OY3P/aBJCbQALNFTPhpVNEYPyIpbvPJGUAxO6c+nqMVGu378C4J5KeUyykyDAATANT16ForyexVY88U/mHzETzK6wF4CSSxvPXZQtFjWhI8IKG86fUXuxYGnuN Content-ID: 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: b3e924ef-cedc-4939-8e97-08dd526c3023 X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Feb 2025 11:37:57.3915 (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: MA0PR01MB10284 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 The Touch Bars found on x86 Macs support two USB configurations: one where the device presents itself as a HID keyboard and can display predefined sets of keys, and one where the operating system has full control over what is displayed. This commit adds support for the display functionality of the second configuration. Functionality for the first configuration has been merged in the HID tree. Note that this driver has only been tested on T2 Macs, and only includes the USB device ID for these devices. Testing on T1 Macs would be appreciated. Credit goes to Ben (Bingxing) Wang on GitHub [1] for reverse engineering most of the protocol. [1]: https://github.com/imbushuo/DFRDisplayKm Signed-off-by: Kerem Karabay Co-developed-by: Atharva Tiwari Signed-off-by: Atharva Tiwari Co-developed-by: Aditya Garg Signed-off-by: Aditya Garg Signed-off-by: Aun-Ali Zaidi --- v2 -> - Add the driver to MAINTAINERS. - Allocate memory for request and response in plane's atomic-check helper - Void the use of drm_fb_blit() - Implement atomic_disable - Make PRIME work - Remove the date field from struct drm_driver - intersect damage with dst_clip - Register DRM device in appletbdrm_probe - Clear the display as the final call in probe - Select hid_multitouch as well in kconfig v3 -> - Change commit message to credit Ben (Bingxing) Wang MAINTAINERS | 7 + drivers/gpu/drm/tiny/Kconfig | 14 + drivers/gpu/drm/tiny/Makefile | 1 + drivers/gpu/drm/tiny/appletbdrm.c | 806 ++++++++++++++++++++++++++++++ 4 files changed, 828 insertions(+) create mode 100644 drivers/gpu/drm/tiny/appletbdrm.c diff --git a/MAINTAINERS b/MAINTAINERS index efee40ea5..43fafaab3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7148,6 +7148,13 @@ S: Supported T: git https://gitlab.freedesktop.org/drm/misc/kernel.git F: drivers/gpu/drm/sun4i/sun8i* +DRM DRIVER FOR APPLE TOUCH BARS +M: Aun-Ali Zaidi +L: dri-devel@lists.freedesktop.org +S: Maintained +T: git https://gitlab.freedesktop.org/drm/misc/kernel.git +F: drivers/gpu/drm/tiny/appletbdrm.c + DRM DRIVER FOR ARM PL111 CLCD M: Linus Walleij S: Maintained diff --git a/drivers/gpu/drm/tiny/Kconfig b/drivers/gpu/drm/tiny/Kconfig index 94cbdb133..25471791c 100644 --- a/drivers/gpu/drm/tiny/Kconfig +++ b/drivers/gpu/drm/tiny/Kconfig @@ -1,5 +1,19 @@ # SPDX-License-Identifier: GPL-2.0-only +config DRM_APPLETBDRM + tristate "DRM support for Apple Touch Bars" + depends on DRM && USB && MMU + select DRM_GEM_SHMEM_HELPER + select DRM_KMS_HELPER + select HID_APPLETB_BL + select HID_MULTITOUCH + help + Say Y here if you want support for the display of Touch Bars on x86 + MacBook Pros. + + To compile this driver as a module, choose M here: the + module will be called appletbdrm. + config DRM_ARCPGU tristate "ARC PGU" depends on DRM && OF diff --git a/drivers/gpu/drm/tiny/Makefile b/drivers/gpu/drm/tiny/Makefile index 60816d2eb..0a3a7837a 100644 --- a/drivers/gpu/drm/tiny/Makefile +++ b/drivers/gpu/drm/tiny/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only +obj-$(CONFIG_DRM_APPLETBDRM) += appletbdrm.o obj-$(CONFIG_DRM_ARCPGU) += arcpgu.o obj-$(CONFIG_DRM_BOCHS) += bochs.o obj-$(CONFIG_DRM_CIRRUS_QEMU) += cirrus-qemu.o diff --git a/drivers/gpu/drm/tiny/appletbdrm.c b/drivers/gpu/drm/tiny/appletbdrm.c new file mode 100644 index 000000000..a17a3ecc3 --- /dev/null +++ b/drivers/gpu/drm/tiny/appletbdrm.c @@ -0,0 +1,806 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Apple Touch Bar DRM Driver + * + * Copyright (c) 2023 Kerem Karabay + */ + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define __APPLETBDRM_MSG_STR4(str4) ((__le32 __force)((str4[0] << 24) | (str4[1] << 16) | (str4[2] << 8) | str4[3])) +#define __APPLETBDRM_MSG_TOK4(tok4) __APPLETBDRM_MSG_STR4(#tok4) + +#define APPLETBDRM_PIXEL_FORMAT __APPLETBDRM_MSG_TOK4(RGBA) /* The actual format is BGR888 */ +#define APPLETBDRM_BITS_PER_PIXEL 24 + +#define APPLETBDRM_MSG_CLEAR_DISPLAY __APPLETBDRM_MSG_TOK4(CLRD) +#define APPLETBDRM_MSG_GET_INFORMATION __APPLETBDRM_MSG_TOK4(GINF) +#define APPLETBDRM_MSG_UPDATE_COMPLETE __APPLETBDRM_MSG_TOK4(UDCL) +#define APPLETBDRM_MSG_SIGNAL_READINESS __APPLETBDRM_MSG_TOK4(REDY) + +#define APPLETBDRM_BULK_MSG_TIMEOUT 1000 + +#define drm_to_adev(_drm) container_of(_drm, struct appletbdrm_device, drm) +#define adev_to_udev(adev) interface_to_usbdev(to_usb_interface(adev->dev)) + +struct appletbdrm_msg_request_header { + __le16 unk_00; + __le16 unk_02; + __le32 unk_04; + __le32 unk_08; + __le32 size; +} __packed; + +struct appletbdrm_msg_response_header { + u8 unk_00[16]; + __le32 msg; +} __packed; + +struct appletbdrm_msg_simple_request { + struct appletbdrm_msg_request_header header; + __le32 msg; + u8 unk_14[8]; + __le32 size; +} __packed; + +struct appletbdrm_msg_information { + struct appletbdrm_msg_response_header header; + u8 unk_14[12]; + __le32 width; + __le32 height; + u8 bits_per_pixel; + __le32 bytes_per_row; + __le32 orientation; + __le32 bitmap_info; + __le32 pixel_format; + __le32 width_inches; /* floating point */ + __le32 height_inches; /* floating point */ +} __packed; + +struct appletbdrm_frame { + __le16 begin_x; + __le16 begin_y; + __le16 width; + __le16 height; + __le32 buf_size; + u8 buf[]; +} __packed; + +struct appletbdrm_fb_request_footer { + u8 unk_00[12]; + __le32 unk_0c; + u8 unk_10[12]; + __le32 unk_1c; + __le64 timestamp; + u8 unk_28[12]; + __le32 unk_34; + u8 unk_38[20]; + __le32 unk_4c; +} __packed; + +struct appletbdrm_fb_request { + struct appletbdrm_msg_request_header header; + __le16 unk_10; + u8 msg_id; + u8 unk_13[29]; + /* + * Contents of `data`: + * - struct appletbdrm_frame frames[]; + * - struct appletbdrm_fb_request_footer footer; + * - padding to make the total size a multiple of 16 + */ + u8 data[]; +} __packed; + +struct appletbdrm_fb_request_response { + struct appletbdrm_msg_response_header header; + u8 unk_14[12]; + __le64 timestamp; +} __packed; + +struct appletbdrm_device { + struct device *dev; + struct device *dmadev; + + unsigned int in_ep; + unsigned int out_ep; + + unsigned int width; + unsigned int height; + + struct drm_device drm; + struct drm_display_mode mode; + struct drm_connector connector; + struct drm_plane primary_plane; + struct drm_crtc crtc; + struct drm_encoder encoder; +}; + +struct appletbdrm_plane_state { + struct drm_shadow_plane_state base; + struct appletbdrm_fb_request *request; + struct appletbdrm_fb_request_response *response; + size_t request_size; + size_t frames_size; +}; + +static inline struct appletbdrm_plane_state *to_appletbdrm_plane_state(struct drm_plane_state *state) +{ + return container_of(state, struct appletbdrm_plane_state, base.base); +} + +static int appletbdrm_send_request(struct appletbdrm_device *adev, + struct appletbdrm_msg_request_header *request, size_t size) +{ + struct usb_device *udev = adev_to_udev(adev); + struct drm_device *drm = &adev->drm; + int ret, actual_size; + + ret = usb_bulk_msg(udev, usb_sndbulkpipe(udev, adev->out_ep), + request, size, &actual_size, APPLETBDRM_BULK_MSG_TIMEOUT); + if (ret) { + drm_err(drm, "Failed to send message (%d)\n", ret); + return ret; + } + + if (actual_size != size) { + drm_err(drm, "Actual size (%d) doesn't match expected size (%lu)\n", + actual_size, size); + return -EIO; + } + + return ret; +} + +static int appletbdrm_read_response(struct appletbdrm_device *adev, + struct appletbdrm_msg_response_header *response, + size_t size, u32 expected_response) +{ + struct usb_device *udev = adev_to_udev(adev); + struct drm_device *drm = &adev->drm; + int ret, actual_size; + bool readiness_signal_received = false; + +retry: + ret = usb_bulk_msg(udev, usb_rcvbulkpipe(udev, adev->in_ep), + response, size, &actual_size, APPLETBDRM_BULK_MSG_TIMEOUT); + if (ret) { + drm_err(drm, "Failed to read response (%d)\n", ret); + return ret; + } + + /* + * The device responds to the first request sent in a particular + * timeframe after the USB device configuration is set with a readiness + * signal, in which case the response should be read again + */ + if (response->msg == APPLETBDRM_MSG_SIGNAL_READINESS) { + if (!readiness_signal_received) { + readiness_signal_received = true; + goto retry; + } + + drm_err(drm, "Encountered unexpected readiness signal\n"); + return -EIO; + } + + if (actual_size != size) { + drm_err(drm, "Actual size (%d) doesn't match expected size (%lu)\n", + actual_size, size); + return -EIO; + } + + if (response->msg != expected_response) { + drm_err(drm, "Unexpected response from device (expected %p4ch found %p4ch)\n", + &expected_response, &response->msg); + return -EIO; + } + + return 0; +} + +static int appletbdrm_send_msg(struct appletbdrm_device *adev, u32 msg) +{ + struct appletbdrm_msg_simple_request *request; + int ret; + + request = kzalloc(sizeof(*request), GFP_KERNEL); + if (!request) + return -ENOMEM; + + request->header.unk_00 = cpu_to_le16(2); + request->header.unk_02 = cpu_to_le16(0x1512); + request->header.size = cpu_to_le32(sizeof(*request) - sizeof(request->header)); + request->msg = msg; + request->size = request->header.size; + + ret = appletbdrm_send_request(adev, &request->header, sizeof(*request)); + + kfree(request); + + return ret; +} + +static int appletbdrm_clear_display(struct appletbdrm_device *adev) +{ + return appletbdrm_send_msg(adev, APPLETBDRM_MSG_CLEAR_DISPLAY); +} + +static int appletbdrm_signal_readiness(struct appletbdrm_device *adev) +{ + return appletbdrm_send_msg(adev, APPLETBDRM_MSG_SIGNAL_READINESS); +} + +static int appletbdrm_get_information(struct appletbdrm_device *adev) +{ + struct appletbdrm_msg_information *info; + struct drm_device *drm = &adev->drm; + u8 bits_per_pixel; + u32 pixel_format; + int ret; + + info = kzalloc(sizeof(*info), GFP_KERNEL); + if (!info) + return -ENOMEM; + + ret = appletbdrm_send_msg(adev, APPLETBDRM_MSG_GET_INFORMATION); + if (ret) + return ret; + + ret = appletbdrm_read_response(adev, &info->header, sizeof(*info), + APPLETBDRM_MSG_GET_INFORMATION); + if (ret) + goto free_info; + + bits_per_pixel = info->bits_per_pixel; + pixel_format = get_unaligned(&info->pixel_format); + + adev->width = get_unaligned_le32(&info->width); + adev->height = get_unaligned_le32(&info->height); + + if (bits_per_pixel != APPLETBDRM_BITS_PER_PIXEL) { + drm_err(drm, "Encountered unexpected bits per pixel value (%d)\n", bits_per_pixel); + ret = -EINVAL; + goto free_info; + } + + if (pixel_format != APPLETBDRM_PIXEL_FORMAT) { + drm_err(drm, "Encountered unknown pixel format (%p4ch)\n", &pixel_format); + ret = -EINVAL; + goto free_info; + } + +free_info: + kfree(info); + + return ret; +} + +static u32 rect_size(struct drm_rect *rect) +{ + return drm_rect_width(rect) * drm_rect_height(rect) * (APPLETBDRM_BITS_PER_PIXEL / 8); +} + +static int appletbdrm_connector_helper_get_modes(struct drm_connector *connector) +{ + struct appletbdrm_device *adev = drm_to_adev(connector->dev); + + return drm_connector_helper_get_modes_fixed(connector, &adev->mode); +} + +static const u32 appletbdrm_primary_plane_formats[] = { + DRM_FORMAT_BGR888, + DRM_FORMAT_XRGB8888, /* emulated */ +}; + +static int appletbdrm_primary_plane_helper_atomic_check(struct drm_plane *plane, + struct drm_atomic_state *state) +{ + struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state, plane); + struct drm_plane_state *old_plane_state = drm_atomic_get_old_plane_state(state, plane); + struct drm_crtc *new_crtc = new_plane_state->crtc; + struct drm_crtc_state *new_crtc_state = NULL; + struct appletbdrm_plane_state *appletbdrm_state = to_appletbdrm_plane_state(new_plane_state); + struct drm_atomic_helper_damage_iter iter; + struct drm_rect damage; + size_t frames_size = 0; + size_t request_size; + int ret; + + if (new_crtc) + new_crtc_state = drm_atomic_get_new_crtc_state(state, new_crtc); + + ret = drm_atomic_helper_check_plane_state(new_plane_state, new_crtc_state, + DRM_PLANE_NO_SCALING, + DRM_PLANE_NO_SCALING, + false, false); + if (ret) + return ret; + else if (!new_plane_state->visible) + return 0; + + drm_atomic_helper_damage_iter_init(&iter, old_plane_state, new_plane_state); + drm_atomic_for_each_plane_damage(&iter, &damage) { + frames_size += struct_size((struct appletbdrm_frame *)0, buf, rect_size(&damage)); + } + + if (!frames_size) + return 0; + + request_size = ALIGN(sizeof(struct appletbdrm_fb_request) + + frames_size + + sizeof(struct appletbdrm_fb_request_footer), 16); + + appletbdrm_state->request = kzalloc(request_size, GFP_KERNEL); + + if (!appletbdrm_state->request) + return -ENOMEM; + + appletbdrm_state->response = kzalloc(sizeof(*appletbdrm_state->response), GFP_KERNEL); + + if (!appletbdrm_state->response) + return -ENOMEM; + + appletbdrm_state->request_size = request_size; + appletbdrm_state->frames_size = frames_size; + + return 0; +} + +static int appletbdrm_flush_damage(struct appletbdrm_device *adev, + struct drm_plane_state *old_state, + struct drm_plane_state *state) +{ + struct appletbdrm_plane_state *appletbdrm_state = to_appletbdrm_plane_state(state); + struct drm_shadow_plane_state *shadow_plane_state = to_drm_shadow_plane_state(state); + struct appletbdrm_fb_request_response *response = appletbdrm_state->response; + struct appletbdrm_fb_request_footer *footer; + struct drm_atomic_helper_damage_iter iter; + struct drm_framebuffer *fb = state->fb; + struct appletbdrm_fb_request *request = appletbdrm_state->request; + struct drm_device *drm = &adev->drm; + struct appletbdrm_frame *frame; + u64 timestamp = ktime_get_ns(); + struct drm_rect damage; + size_t frames_size = appletbdrm_state->frames_size; + size_t request_size = appletbdrm_state->request_size; + int ret; + + if (!frames_size) + return 0; + + ret = drm_gem_fb_begin_cpu_access(fb, DMA_FROM_DEVICE); + if (ret) { + drm_err(drm, "Failed to start CPU framebuffer access (%d)\n", ret); + goto end_fb_cpu_access; + } + + request->header.unk_00 = cpu_to_le16(2); + request->header.unk_02 = cpu_to_le16(0x12); + request->header.unk_04 = cpu_to_le32(9); + request->header.size = cpu_to_le32(request_size - sizeof(request->header)); + request->unk_10 = cpu_to_le16(1); + request->msg_id = timestamp & 0xff; + + frame = (struct appletbdrm_frame *)request->data; + + drm_atomic_helper_damage_iter_init(&iter, old_state, state); + drm_atomic_for_each_plane_damage(&iter, &damage) { + struct drm_rect dst_clip = state->dst; + struct iosys_map dst = IOSYS_MAP_INIT_VADDR(frame->buf); + u32 buf_size = rect_size(&damage); + + if (!drm_rect_intersect(&dst_clip, &damage)) + continue; + + /* + * The coordinates need to be translated to the coordinate + * system the device expects, see the comment in + * appletbdrm_setup_mode_config + */ + frame->begin_x = cpu_to_le16(damage.y1); + frame->begin_y = cpu_to_le16(adev->height - damage.x2); + frame->width = cpu_to_le16(drm_rect_height(&damage)); + frame->height = cpu_to_le16(drm_rect_width(&damage)); + frame->buf_size = cpu_to_le32(buf_size); + + switch (fb->format->format) { + case DRM_FORMAT_XRGB8888: + drm_fb_xrgb8888_to_bgr888(&dst, NULL, &shadow_plane_state->data[0], fb, &damage, &shadow_plane_state->fmtcnv_state); + break; + default: + drm_fb_memcpy(&dst, NULL, &shadow_plane_state->data[0], fb, &damage); + break; + } + + frame = (void *)frame + struct_size(frame, buf, buf_size); + } + + footer = (struct appletbdrm_fb_request_footer *)&request->data[frames_size]; + + footer->unk_0c = cpu_to_le32(0xfffe); + footer->unk_1c = cpu_to_le32(0x80001); + footer->unk_34 = cpu_to_le32(0x80002); + footer->unk_4c = cpu_to_le32(0xffff); + footer->timestamp = cpu_to_le64(timestamp); + + ret = appletbdrm_send_request(adev, &request->header, request_size); + if (ret) + goto end_fb_cpu_access; + + ret = appletbdrm_read_response(adev, &response->header, sizeof(*response), + APPLETBDRM_MSG_UPDATE_COMPLETE); + if (ret) + goto end_fb_cpu_access; + + if (response->timestamp != footer->timestamp) { + drm_err(drm, "Response timestamp (%llu) doesn't match request timestamp (%llu)\n", + le64_to_cpu(response->timestamp), timestamp); + goto end_fb_cpu_access; + } + +end_fb_cpu_access: + drm_gem_fb_end_cpu_access(fb, DMA_FROM_DEVICE); + + return ret; +} + +static void appletbdrm_primary_plane_helper_atomic_update(struct drm_plane *plane, + struct drm_atomic_state *old_state) +{ + struct appletbdrm_device *adev = drm_to_adev(plane->dev); + struct drm_device *drm = plane->dev; + struct drm_plane_state *plane_state = plane->state; + struct drm_plane_state *old_plane_state = drm_atomic_get_old_plane_state(old_state, plane); + int idx; + + if (!drm_dev_enter(drm, &idx)) + return; + + appletbdrm_flush_damage(adev, old_plane_state, plane_state); + + drm_dev_exit(idx); +} + +static void appletbdrm_primary_plane_helper_atomic_disable(struct drm_plane *plane, + struct drm_atomic_state *state) +{ + struct drm_device *dev = plane->dev; + struct appletbdrm_device *adev = drm_to_adev(dev); + int idx; + + if (!drm_dev_enter(dev, &idx)) + return; + + appletbdrm_clear_display(adev); + + drm_dev_exit(idx); +} + +static void appletbdrm_primary_plane_reset(struct drm_plane *plane) +{ + struct appletbdrm_plane_state *appletbdrm_state; + + WARN_ON(plane->state); + + appletbdrm_state = kzalloc(sizeof(*appletbdrm_state), GFP_KERNEL); + if (!appletbdrm_state) + return; + + __drm_gem_reset_shadow_plane(plane, &appletbdrm_state->base); +} + +static struct drm_plane_state *appletbdrm_primary_plane_duplicate_state(struct drm_plane *plane) +{ + struct drm_shadow_plane_state *new_shadow_plane_state; + struct appletbdrm_plane_state *old_appletbdrm_state; + struct appletbdrm_plane_state *appletbdrm_state; + + if (WARN_ON(!plane->state)) + return NULL; + + old_appletbdrm_state = to_appletbdrm_plane_state(plane->state); + appletbdrm_state = kmemdup(old_appletbdrm_state, sizeof(*appletbdrm_state), GFP_KERNEL); + if (!appletbdrm_state) + return NULL; + + /* Request and response are not duplicated and are allocated in .atomic_check */ + appletbdrm_state->request = NULL; + appletbdrm_state->response = NULL; + + new_shadow_plane_state = &appletbdrm_state->base; + + __drm_gem_duplicate_shadow_plane_state(plane, new_shadow_plane_state); + + return &new_shadow_plane_state->base; +} + +static void appletbdrm_primary_plane_destroy_state(struct drm_plane *plane, + struct drm_plane_state *state) +{ + struct appletbdrm_plane_state *appletbdrm_state = to_appletbdrm_plane_state(state); + + kfree(appletbdrm_state->request); + kfree(appletbdrm_state->response); + + __drm_gem_destroy_shadow_plane_state(&appletbdrm_state->base); + + kfree(appletbdrm_state); +} + +static const struct drm_plane_helper_funcs appletbdrm_primary_plane_helper_funcs = { + DRM_GEM_SHADOW_PLANE_HELPER_FUNCS, + .atomic_check = appletbdrm_primary_plane_helper_atomic_check, + .atomic_update = appletbdrm_primary_plane_helper_atomic_update, + .atomic_disable = appletbdrm_primary_plane_helper_atomic_disable, +}; + +static const struct drm_plane_funcs appletbdrm_primary_plane_funcs = { + .update_plane = drm_atomic_helper_update_plane, + .disable_plane = drm_atomic_helper_disable_plane, + .reset = appletbdrm_primary_plane_reset, + .atomic_duplicate_state = appletbdrm_primary_plane_duplicate_state, + .atomic_destroy_state = appletbdrm_primary_plane_destroy_state, + .destroy = drm_plane_cleanup, +}; + +static enum drm_mode_status appletbdrm_crtc_helper_mode_valid(struct drm_crtc *crtc, + const struct drm_display_mode *mode) +{ + struct appletbdrm_device *adev = drm_to_adev(crtc->dev); + + return drm_crtc_helper_mode_valid_fixed(crtc, mode, &adev->mode); +} + +static const struct drm_mode_config_funcs appletbdrm_mode_config_funcs = { + .fb_create = drm_gem_fb_create_with_dirty, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, +}; + +static const struct drm_connector_funcs appletbdrm_connector_funcs = { + .reset = drm_atomic_helper_connector_reset, + .destroy = drm_connector_cleanup, + .fill_modes = drm_helper_probe_single_connector_modes, + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, +}; + +static const struct drm_connector_helper_funcs appletbdrm_connector_helper_funcs = { + .get_modes = appletbdrm_connector_helper_get_modes, +}; + +static const struct drm_crtc_helper_funcs appletbdrm_crtc_helper_funcs = { + .mode_valid = appletbdrm_crtc_helper_mode_valid, +}; + +static const struct drm_crtc_funcs appletbdrm_crtc_funcs = { + .reset = drm_atomic_helper_crtc_reset, + .destroy = drm_crtc_cleanup, + .set_config = drm_atomic_helper_set_config, + .page_flip = drm_atomic_helper_page_flip, + .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, +}; + +static const struct drm_encoder_funcs appletbdrm_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; + +static struct drm_gem_object *appletbdrm_driver_gem_prime_import(struct drm_device *dev, + struct dma_buf *dma_buf) +{ + struct appletbdrm_device *adev = drm_to_adev(dev); + + if (!adev->dmadev) + return ERR_PTR(-ENODEV); + + return drm_gem_prime_import_dev(dev, dma_buf, adev->dmadev); +} + +DEFINE_DRM_GEM_FOPS(appletbdrm_drm_fops); + +static const struct drm_driver appletbdrm_drm_driver = { + DRM_GEM_SHMEM_DRIVER_OPS, + .gem_prime_import = appletbdrm_driver_gem_prime_import, + .name = "appletbdrm", + .desc = "Apple Touch Bar DRM Driver", + .major = 1, + .minor = 0, + .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, + .fops = &appletbdrm_drm_fops, +}; + +static int appletbdrm_setup_mode_config(struct appletbdrm_device *adev) +{ + struct drm_connector *connector = &adev->connector; + struct drm_plane *primary_plane; + struct drm_crtc *crtc; + struct drm_encoder *encoder; + struct drm_device *drm = &adev->drm; + struct device *dev = adev->dev; + int ret; + + ret = drmm_mode_config_init(drm); + if (ret) + return dev_err_probe(dev, ret, "Failed to initialize mode configuration\n"); + + primary_plane = &adev->primary_plane; + ret = drm_universal_plane_init(drm, primary_plane, 0, + &appletbdrm_primary_plane_funcs, + appletbdrm_primary_plane_formats, + ARRAY_SIZE(appletbdrm_primary_plane_formats), + NULL, + DRM_PLANE_TYPE_PRIMARY, NULL); + if (ret) + return dev_err_probe(dev, ret, "Failed to initialize universal plane object\n"); + drm_plane_helper_add(primary_plane, &appletbdrm_primary_plane_helper_funcs); + drm_plane_enable_fb_damage_clips(primary_plane); + + crtc = &adev->crtc; + ret = drm_crtc_init_with_planes(drm, crtc, primary_plane, NULL, + &appletbdrm_crtc_funcs, NULL); + if (ret) + return dev_err_probe(dev, ret, "Failed to initialize CRTC object\n"); + drm_crtc_helper_add(crtc, &appletbdrm_crtc_helper_funcs); + + encoder = &adev->encoder; + ret = drm_encoder_init(drm, encoder, &appletbdrm_encoder_funcs, + DRM_MODE_ENCODER_DAC, NULL); + if (ret) + return dev_err_probe(dev, ret, "Failed to initialize encoder\n"); + encoder->possible_crtcs = drm_crtc_mask(crtc); + + /* + * The coordinate system used by the device is different from the + * coordinate system of the framebuffer in that the x and y axes are + * swapped, and that the y axis is inverted; so what the device reports + * as the height is actually the width of the framebuffer and vice + * versa + */ + drm->mode_config.min_width = 0; + drm->mode_config.min_height = 0; + drm->mode_config.max_width = max(adev->height, DRM_SHADOW_PLANE_MAX_WIDTH); + drm->mode_config.max_height = max(adev->width, DRM_SHADOW_PLANE_MAX_HEIGHT); + drm->mode_config.preferred_depth = APPLETBDRM_BITS_PER_PIXEL; + drm->mode_config.funcs = &appletbdrm_mode_config_funcs; + + adev->mode = (struct drm_display_mode) { + DRM_MODE_INIT(60, adev->height, adev->width, + DRM_MODE_RES_MM(adev->height, 218), + DRM_MODE_RES_MM(adev->width, 218)) + }; + + ret = drm_connector_init(drm, connector, + &appletbdrm_connector_funcs, DRM_MODE_CONNECTOR_USB); + if (ret) + return dev_err_probe(dev, ret, "Failed to initialize connector\n"); + + drm_connector_helper_add(connector, &appletbdrm_connector_helper_funcs); + + ret = drm_connector_set_panel_orientation(connector, + DRM_MODE_PANEL_ORIENTATION_RIGHT_UP); + if (ret) + return dev_err_probe(dev, ret, "Failed to set panel orientation\n"); + + connector->display_info.non_desktop = true; + ret = drm_object_property_set_value(&connector->base, + drm->mode_config.non_desktop_property, true); + if (ret) + return dev_err_probe(dev, ret, "Failed to set non-desktop property\n"); + + ret = drm_connector_attach_encoder(connector, encoder); + + if (ret) + return dev_err_probe(dev, ret, "Failed to initialize simple display pipe\n"); + + drm_mode_config_reset(drm); + + return 0; +} + +static int appletbdrm_probe(struct usb_interface *intf, + const struct usb_device_id *id) +{ + struct usb_endpoint_descriptor *bulk_in, *bulk_out; + struct device *dev = &intf->dev; + struct appletbdrm_device *adev; + struct drm_device *drm; + int ret; + + ret = usb_find_common_endpoints(intf->cur_altsetting, &bulk_in, &bulk_out, NULL, NULL); + if (ret) + return dev_err_probe(dev, ret, "Failed to find bulk endpoints\n"); + + adev = devm_drm_dev_alloc(dev, &appletbdrm_drm_driver, struct appletbdrm_device, drm); + if (IS_ERR(adev)) + return PTR_ERR(adev); + + adev->dev = dev; + adev->in_ep = bulk_in->bEndpointAddress; + adev->out_ep = bulk_out->bEndpointAddress; + + drm = &adev->drm; + + usb_set_intfdata(intf, adev); + + ret = appletbdrm_get_information(adev); + if (ret) + return dev_err_probe(dev, ret, "Failed to get display information\n"); + + ret = appletbdrm_signal_readiness(adev); + if (ret) + return dev_err_probe(dev, ret, "Failed to signal readiness\n"); + + ret = appletbdrm_setup_mode_config(adev); + if (ret) + return dev_err_probe(dev, ret, "Failed to setup mode config\n"); + + ret = drm_dev_register(drm, 0); + if (ret) + return dev_err_probe(dev, ret, "Failed to register DRM device\n"); + + ret = appletbdrm_clear_display(adev); + if (ret) + return dev_err_probe(dev, ret, "Failed to clear display\n"); + + return 0; +} + +static void appletbdrm_disconnect(struct usb_interface *intf) +{ + struct appletbdrm_device *adev = usb_get_intfdata(intf); + struct drm_device *drm = &adev->drm; + + drm_dev_unplug(drm); + drm_atomic_helper_shutdown(drm); +} + +static void appletbdrm_shutdown(struct usb_interface *intf) +{ + struct appletbdrm_device *adev = usb_get_intfdata(intf); + + /* + * The framebuffer needs to be cleared on shutdown since its content + * persists across boots + */ + drm_atomic_helper_shutdown(&adev->drm); +} + +static const struct usb_device_id appletbdrm_usb_id_table[] = { + { USB_DEVICE_INTERFACE_CLASS(0x05ac, 0x8302, USB_CLASS_AUDIO_VIDEO) }, + {} +}; +MODULE_DEVICE_TABLE(usb, appletbdrm_usb_id_table); + +static struct usb_driver appletbdrm_usb_driver = { + .name = "appletbdrm", + .probe = appletbdrm_probe, + .disconnect = appletbdrm_disconnect, + .shutdown = appletbdrm_shutdown, + .id_table = appletbdrm_usb_id_table, +}; +module_usb_driver(appletbdrm_usb_driver); + +MODULE_AUTHOR("Kerem Karabay "); +MODULE_DESCRIPTION("Apple Touch Bar DRM Driver"); +MODULE_LICENSE("GPL");