From mboxrd@z Thu Jan 1 00:00:00 1970 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 BA639CDB465 for ; Thu, 19 Oct 2023 15:50:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7529C10E51B; Thu, 19 Oct 2023 15:50:40 +0000 (UTC) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2049.outbound.protection.outlook.com [40.107.237.49]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3C71E10E51B; Thu, 19 Oct 2023 15:50:39 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OOoGANhYUXJazMD8Kj0pubKEz8sumrPDJ0AuoxUu1pGOM2eAWUSkcByKGYKo3B0oj1qn1WOLNiy/VCvqFaL6VxmpDDsoYNVDK8WkOfKpTDWH1YMkVP/ScLDCSIaeWF77XYiUT8iTmUFOraPCkm9PoJdRMnTYF3MgK2oaAL0rHz+pv+ft9let6KJ8AxAe95SuH2C7xNaH3UW4hWuKn7L49vM12hfSs6UzeH8LeKeYqArYnZz68Ovxxl/v80SsBGgKv5zWyXEbeMKdR7A8FcBuE1/PLL8UtfEQZ8Tvn6nUvLD51b5IDQCpIgRZ9kYp7wvk/E7syJDF60DkOBnmsiAE+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=EsB12a9JV64bSWyQb9TcEm4mC8ncWMb9sJW0OoC9nLs=; b=NsBHf/IlsdcahuGeX5hDX+b3IBOYGaY32R5OpFFkfYDZHMDKEODm6brK4hBcbH9pNB7mFV8cN090GdvqZEHiHhH0aVsEPWNx50NYm2OHWpMsCMHjfHChEwrczMmABnHcHF5KjNl/ck3AnrMX/1gagire1l/S/zxGkDg3/pMO3XMLgJ2zL6mNIRXLsP2RTq8gOowHs0AUpDLEU7q3DhdOV84YBzeJPrdYbqW5YNyg8DJlEcGpZF3u/W4H//kLOeSZkIqba9tBzoL3QzHSoPUswgnI8eKhV5wb/VDlW/Wb4FdYSAVsJmHCCsn83qODDHYY3HviarZ1t3knGzD0/Jb2JA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EsB12a9JV64bSWyQb9TcEm4mC8ncWMb9sJW0OoC9nLs=; b=NDV5a5v/UgxkCQSAgRYoRA5F206F+AvAwuOijVlCHQjbQmKjdGBdWxgn2l+thvQ2n1qUvGWdW2qwHjURT0sHSRBUSqqZRJoxC90bgHGAOc9KaUXXTH01rcG9mKndhv0gJ20LB40guzga6Ic2ggNykI/BkAAxGusxUtWvq2oT5fo= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=amd.com; Received: from CO6PR12MB5427.namprd12.prod.outlook.com (2603:10b6:5:358::13) by DM4PR12MB5745.namprd12.prod.outlook.com (2603:10b6:8:5c::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26; Thu, 19 Oct 2023 15:50:31 +0000 Received: from CO6PR12MB5427.namprd12.prod.outlook.com ([fe80::121e:5e68:c78a:1f2f]) by CO6PR12MB5427.namprd12.prod.outlook.com ([fe80::121e:5e68:c78a:1f2f%3]) with mapi id 15.20.6907.022; Thu, 19 Oct 2023 15:50:31 +0000 Message-ID: <22f13ab6-a78f-4da4-9fdd-4a63151c56be@amd.com> Date: Thu, 19 Oct 2023 11:50:27 -0400 User-Agent: Mozilla Thunderbird Subject: Re: [RFC PATCH 10/10] drm/vkms: Add enumerated 1D curve colorop Content-Language: en-US To: Melissa Wen References: <20230908150235.75918-1-harry.wentland@amd.com> <20230908150235.75918-11-harry.wentland@amd.com> <20231010162738.dhcijm6u2zlv5anw@mail.igalia.com> From: Harry Wentland In-Reply-To: <20231010162738.dhcijm6u2zlv5anw@mail.igalia.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: YT4PR01CA0090.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:ff::16) To CO6PR12MB5427.namprd12.prod.outlook.com (2603:10b6:5:358::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO6PR12MB5427:EE_|DM4PR12MB5745:EE_ X-MS-Office365-Filtering-Correlation-Id: c8153f86-8be8-4918-569c-08dbd0bb1fba X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qM0KHAOfbwCG04mI2u3L6shZkPu11zVkkHD1eJIJxLnPWV/IHQOQH9h8OXgPUpt8DsVrCKn+j92MklTF/cuPv8DNWWsKxjh6PZCYn3PV1/9elcVPHMJvYINIpU1NagfBGpnU+jpn6vWfEwob3U1J36S0XdkXu0nV1Bmghv4FaLjJIatmbG9tmUH4u4PSazjtHDOOYzl4RmanDu29JFIj/wPEaWsKnKplofGGG0BzGnBxUoqIlrXEqHQwyxGK910FWq70yE1YqFZBAP6XdcffUDxcPmxhAhnaWyVmhNNQ2TaCLpAtDkh0P1vyvpwnLcjKblY4648V3pwRrR7aurRoWPMkNN1sb7wZyxHh9VSFQD2cG9BgwSlayOKN1DP95p4gGR2LTWRAA3LUlwxgDIMAyS7/qAJPOw0UczzYH6e5tGSjF4rvHvbLUSawC0SVQAm+bXYX7Upttj89PB3SwYe1lahrSOts+jgije5hlqdPGQFRO2nnBm+MfNxmc4iKak1PZ/ZW9jtDJoahJR2UApG/p4eQACW6c5KA6RcbuM39hrvaJ1pizaGfnYfHfX9vFsSuKVlwPOf19yk3g2glCc9rNm/HCO23EmqjnrhInwcylYXFXtW04LZnvwpvNMAlMBbus+AUxOhFdgWP7Hr9Gi2PVw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CO6PR12MB5427.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(376002)(396003)(366004)(136003)(39860400002)(346002)(230922051799003)(451199024)(64100799003)(1800799009)(186009)(4001150100001)(66899024)(30864003)(2906002)(53546011)(6512007)(31696002)(6666004)(6506007)(2616005)(54906003)(66946007)(66476007)(316002)(66556008)(66574015)(6916009)(6486002)(478600001)(86362001)(83380400001)(26005)(38100700002)(7416002)(41300700001)(8676002)(4326008)(8936002)(36756003)(5660300002)(44832011)(31686004)(43740500002)(45980500001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dzdVbXQxalZDZVovc2xVRTE1cnRRb0w0enl3Tk41RUp2ckgremdvQVZVcWk0?= =?utf-8?B?SzMxdGppVU5rdUErSFMwNXhxcWV6eFJQOWZWZVp1aVQwU28rekZDTXJYSUxI?= =?utf-8?B?R1pxclE3QVdjL1hKb0daRTVWTDNuMGlKMHdMdG41Q0NuVjJ5S2xRN3BSUlFl?= =?utf-8?B?ZjNQM3Q0b2R0cDRBS29xSmpyVHRkNXpvZjlhQ2R1ZkUzMHQ3YmxFODFyYklU?= =?utf-8?B?WUZsV0ZiWmxJK1ZCMXdySTAxUUNPVFpNTDdqQTJia0tUd3IrVEVnL0hoeFla?= =?utf-8?B?STVsNjZaYThVMUZMRTlaZ3pUYmo4NWkrU0VXTXBKL1ZtcEVZeXlPZXpsei9K?= =?utf-8?B?aTRTMTNsY3IyaWhyUkxzRm9YOTlwT0JiMEk0bTVaWlV6TDArV2p1RTZsTzFy?= =?utf-8?B?N0tMMDE2SExSWURDTE5UL0xTT2IvRnBCbWFhMCtzb3QwVzVRaFMrcTdKUHpV?= =?utf-8?B?WmRpVTRKeFpiMnp3MlkzWWF5cEl0SVV4cWJONHFNZ3FWd29GV2IwUmhFRGRJ?= =?utf-8?B?NmFwNmN4VUJ3T1lHM0JtVGszVnp5Vkx5ZzdnNFgwZE9Fd3NQMEJNbGFuUnRT?= =?utf-8?B?WnAvTm1aa1grd0EwczJOMDFpNVBXTTkrL1hZeVBlSVpvYUdXTE1XZ2U2YXN5?= =?utf-8?B?a2lEMzFPdzlBRzI2RUdZa3g5NmdTUENyb3lmSXFKbkx0N2FLeitaMzhiSGYw?= =?utf-8?B?MkxlSFJmOFNLaVdURUduVFJXckNVWWtwZjA0OUZtbDYybFR1REFPMS9haWYr?= =?utf-8?B?QzRQRlNpa1hHMStibjhja2FucVVGTXZVWU9hZG5IcEtWcDJ6R0pvTkxLekgv?= =?utf-8?B?M1lZM2tlbDgvaTlabjNnaXpxYXBXQ2FXc1FjSzVDQktkN1d1eS9LclpvRnZ1?= =?utf-8?B?VHRFOUp4RmxUK3IzaTBsd253T2xLWEN4bmJiMGFLWi9aNTR6SzVjcCtPeWxx?= =?utf-8?B?RVNRZjk0eFMzcnBtbnNmVTR0SnNuVWUxeDQzQmYwSE9pTi9XZkljUnIrcmxX?= =?utf-8?B?Q1RQSWdkYnpYcWcyL2xJTFBsRmxzanUyQWduZUZxeVhrVUFTTjVlNEd2bWk5?= =?utf-8?B?cGZSSUc0YVZ6ZEpFRHRRaVlNdHQxWXc4cDFOd3NkVVZQZDZRZSs3ZTN3M3F0?= =?utf-8?B?bnRlZDJnT3ZWRzBRZkxFRS9pdFpMSHNENSt5L3A2LzhsVGhLdm1ZWm1yVmdz?= =?utf-8?B?eUF4SXVaS3ZNdExlZkgvbkM0U21Tb3lkcTc2bUU5SEFhQ2RjcU1sazhmd1Fj?= =?utf-8?B?UmNCYmU5Zk00WUFLdklqSG5jVUZqZmozNHhOTkNobXJoZHM1dm1LOFBrZmVY?= =?utf-8?B?RXJKQTVXSEhVd3hUMDB4ajhDWVRITmZXOEovZFJCYW1zamE5OVZ4Smh3UDBC?= =?utf-8?B?ODlvVzM4QVkxL2FDdVIwSTF6eVdtYWdQVk9lejh4bzVsR1luYW1ON05GYnFM?= =?utf-8?B?QzhlNUJMaFFuS0NudXV1Q0pWUGpmVExRVmtIdWszR1lucHdrem5yeVBHM056?= =?utf-8?B?eGZCZmJndkw5dkZJM2dnWEkvRFljRXB0aVp1M1oxK3VFQmFieExpYTY1NXgr?= =?utf-8?B?Zk9NUkpsOTZuZkEraXdiNWVDT0RGK08vZlZYSFNoVGJvK1dsdVU5V2t0NHBJ?= =?utf-8?B?aVo4OUt2MUkrcWNBYnN2c0kvbFF1eE9sL0Z5dWdybFRzVE1XVGtUNk1iK1pr?= =?utf-8?B?c2ZMVERNbXBqZDROcGUvZnMwUndseGJBdnVRK0xXN2RWSzBwWjJpQ3crM1dY?= =?utf-8?B?MHlXYlJ0RFpzQXRWS3JLMEJVVUVON0hNOVN2VWpPamhGci9CV3M0ZmgxZlVq?= =?utf-8?B?NjAwR2IvYXJVUzlzc09GOE1qWUFweXZmN1kreXF0dFhiREVkSWdEZ0hmR0Zk?= =?utf-8?B?UWR6TG15WlcxK2ZsSHE0YTF4SGNocDU3c3cvd3dSWXBuTllWMXRzeWsvSlRM?= =?utf-8?B?YXMrM0dBaGxyUjc3VU5ibXpleHFsWGRSU0dsQVNDWFVXQnFuWjkvRmJZQllh?= =?utf-8?B?cTdsRFR0dG9LSVV4RU1ScmRNU0RSbDJDVmhuOHRlR3RPaTFMMTNRdSttUFdr?= =?utf-8?B?SkNZVlI5QlczQy9XMWdFVHdLUDJjVTlNdDFzZmdjM3oxNWU4andpc1BaYnd3?= =?utf-8?Q?qVd8IKEJf7KGoS6Vu/GoTnDlE?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: c8153f86-8be8-4918-569c-08dbd0bb1fba X-MS-Exchange-CrossTenant-AuthSource: CO6PR12MB5427.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2023 15:50:31.4957 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: FsdDyCxmazp0OYxKT9QO/TJNiigIC9Lsy8x5ksP8C3rVYt2rjCLMFA9zle9Kqrz92cbvX1/3nsQBhX8iuad7Dw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5745 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: , Cc: Sebastian Wick , Pekka Paalanen , Shashank Sharma , dri-devel@lists.freedesktop.org, wayland-devel@lists.freedesktop.org, Xaver Hugl , =?UTF-8?Q?Jonas_=C3=85dahl?= , Uma Shankar , =?UTF-8?Q?Michel_D=C3=A4nzer?= , Victoria Brekenfeld , Aleix Pol , Naseer Ahmed , Christopher Braga , Joshua Ashton Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 2023-10-10 12:27, Melissa Wen wrote: > On 09/08, Harry Wentland wrote: >> Signed-off-by: Harry Wentland >> Cc: Ville Syrjala >> Cc: Pekka Paalanen >> Cc: Simon Ser >> Cc: Harry Wentland >> Cc: Melissa Wen >> Cc: Jonas Ådahl >> Cc: Sebastian Wick >> Cc: Shashank Sharma >> Cc: Alexander Goins >> Cc: Joshua Ashton >> Cc: Michel Dänzer >> Cc: Aleix Pol >> Cc: Xaver Hugl >> Cc: Victoria Brekenfeld >> Cc: Daniel Vetter >> Cc: Uma Shankar >> Cc: Naseer Ahmed >> Cc: Christopher Braga >> --- >> drivers/gpu/drm/vkms/Makefile | 3 +- >> drivers/gpu/drm/vkms/vkms_colorop.c | 108 +++++++++ >> drivers/gpu/drm/vkms/vkms_composer.c | 316 +++++++++++++++++++++++++++ >> drivers/gpu/drm/vkms/vkms_drv.h | 4 + >> drivers/gpu/drm/vkms/vkms_plane.c | 2 + >> 5 files changed, 432 insertions(+), 1 deletion(-) >> create mode 100644 drivers/gpu/drm/vkms/vkms_colorop.c >> >> diff --git a/drivers/gpu/drm/vkms/Makefile b/drivers/gpu/drm/vkms/Makefile >> index 1b28a6a32948..bcf508873622 100644 >> --- a/drivers/gpu/drm/vkms/Makefile >> +++ b/drivers/gpu/drm/vkms/Makefile >> @@ -6,6 +6,7 @@ vkms-y := \ >> vkms_formats.o \ >> vkms_crtc.o \ >> vkms_composer.o \ >> - vkms_writeback.o >> + vkms_writeback.o \ >> + vkms_colorop.o >> >> obj-$(CONFIG_DRM_VKMS) += vkms.o >> diff --git a/drivers/gpu/drm/vkms/vkms_colorop.c b/drivers/gpu/drm/vkms/vkms_colorop.c >> new file mode 100644 >> index 000000000000..b3da0705bca7 >> --- /dev/null >> +++ b/drivers/gpu/drm/vkms/vkms_colorop.c >> @@ -0,0 +1,108 @@ >> +/* >> + * Copyright (C) 2023 Advanced Micro Devices, Inc. All rights reserved. >> + * >> + * Permission is hereby granted, free of charge, to any person obtaining a >> + * copy of this software and associated documentation files (the "Software"), >> + * to deal in the Software without restriction, including without limitation >> + * the rights to use, copy, modify, merge, publish, distribute, sublicense, >> + * and/or sell copies of the Software, and to permit persons to whom the >> + * Software is furnished to do so, subject to the following conditions: >> + * >> + * The above copyright notice and this permission notice shall be included in >> + * all copies or substantial portions of the Software. >> + * >> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR >> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, >> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL >> + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR >> + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, >> + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR >> + * OTHER DEALINGS IN THE SOFTWARE. >> + * >> + * Authors: AMD >> + * >> + */ >> + >> +#include >> +#include >> +#include >> +#include >> +#include >> + >> +#define MAX_COLOR_PIPELINES 5 >> + >> +const int vkms_initialize_tf_pipeline(struct drm_plane *plane, struct drm_prop_enum_list *list) >> +{ >> + >> + struct drm_colorop *op, *prev_op; >> + struct drm_device *dev = plane->dev; >> + int ret; >> + >> + /* 1st op: 1d curve */ >> + op = kzalloc(sizeof(struct drm_colorop), GFP_KERNEL); >> + if (!op) { >> + DRM_ERROR("KMS: Failed to allocate colorop\n"); >> + return -ENOMEM; >> + } >> + >> + ret = drm_colorop_init(dev, op, plane, DRM_COLOROP_1D_CURVE); >> + if (ret) >> + return ret; >> + >> + list->type = op->base.id; >> + list->name = kasprintf(GFP_KERNEL, "Color Pipeline %d", op->base.id); >> + >> + prev_op = op; >> + >> + /* 2nd op: 1d curve */ >> + op = kzalloc(sizeof(struct drm_colorop), GFP_KERNEL); >> + if (!op) { >> + DRM_ERROR("KMS: Failed to allocate colorop\n"); >> + return -ENOMEM; >> + } >> + >> + ret = drm_colorop_init(dev, op, plane, DRM_COLOROP_1D_CURVE); >> + if (ret) >> + return ret; >> + >> + drm_colorop_set_next_property(prev_op, op); >> + >> + return 0; >> +} >> + >> +int vkms_initialize_colorops(struct drm_plane *plane) >> +{ >> + struct drm_device *dev = plane->dev; >> + struct drm_property *prop; >> + struct drm_prop_enum_list pipelines[MAX_COLOR_PIPELINES]; >> + int len = 0; >> + int ret; >> + >> + /* Add "Bypass" (i.e. NULL) pipeline */ >> + pipelines[len].type = 0; >> + pipelines[len].name = "Bypass"; >> + len++; >> + >> + /* Add pipeline consisting of transfer functions */ >> + ret = vkms_initialize_tf_pipeline(plane, &(pipelines[len])); >> + if (ret) >> + return ret; >> + len++; >> + >> + /* Create COLOR_PIPELINE property and attach */ >> + prop = drm_property_create_enum(dev, DRM_MODE_PROP_ATOMIC, >> + "COLOR_PIPELINE", >> + pipelines, len); >> + if (!prop) >> + return -ENOMEM; >> + >> + plane->color_pipeline_property = prop; >> + >> + drm_object_attach_property(&plane->base, prop, 0); >> + >> + /* TODO do we even need this? */ >> + if (plane->state) >> + plane->state->color_pipeline = NULL; >> + >> + return 0; >> +} >> diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c >> index f6c311e8a87c..92ab9c62a554 100644 >> --- a/drivers/gpu/drm/vkms/vkms_composer.c >> +++ b/drivers/gpu/drm/vkms/vkms_composer.c >> @@ -12,6 +12,284 @@ >> >> #include "vkms_drv.h" >> >> +#define LUT_SIZE 256 >> + >> +struct drm_color_lut srgb_array[LUT_SIZE] = { >> + { 0x13, 0x13, 0x13, 0 }, >> + { 0x27, 0x27, 0x27, 0 }, >> + { 0x3b, 0x3b, 0x3b, 0 }, >> + { 0x4f, 0x4f, 0x4f, 0 }, >> + { 0x63, 0x63, 0x63, 0 }, >> + { 0x76, 0x76, 0x76, 0 }, >> + { 0x8a, 0x8a, 0x8a, 0 }, >> + { 0x9e, 0x9e, 0x9e, 0 }, >> + { 0xb2, 0xb2, 0xb2, 0 }, >> + { 0xc6, 0xc6, 0xc6, 0 }, >> + { 0xda, 0xda, 0xda, 0 }, >> + { 0xef, 0xef, 0xef, 0 }, >> + { 0x106, 0x106, 0x106, 0 }, >> + { 0x11e, 0x11e, 0x11e, 0 }, >> + { 0x137, 0x137, 0x137, 0 }, >> + { 0x151, 0x151, 0x151, 0 }, >> + { 0x16d, 0x16d, 0x16d, 0 }, >> + { 0x18a, 0x18a, 0x18a, 0 }, >> + { 0x1a8, 0x1a8, 0x1a8, 0 }, >> + { 0x1c7, 0x1c7, 0x1c7, 0 }, >> + { 0x1e8, 0x1e8, 0x1e8, 0 }, >> + { 0x20a, 0x20a, 0x20a, 0 }, >> + { 0x22e, 0x22e, 0x22e, 0 }, >> + { 0x253, 0x253, 0x253, 0 }, >> + { 0x279, 0x279, 0x279, 0 }, >> + { 0x2a0, 0x2a0, 0x2a0, 0 }, >> + { 0x2c9, 0x2c9, 0x2c9, 0 }, >> + { 0x2f4, 0x2f4, 0x2f4, 0 }, >> + { 0x320, 0x320, 0x320, 0 }, >> + { 0x34d, 0x34d, 0x34d, 0 }, >> + { 0x37c, 0x37c, 0x37c, 0 }, >> + { 0x3ac, 0x3ac, 0x3ac, 0 }, >> + { 0x3de, 0x3de, 0x3de, 0 }, >> + { 0x411, 0x411, 0x411, 0 }, >> + { 0x446, 0x446, 0x446, 0 }, >> + { 0x47c, 0x47c, 0x47c, 0 }, >> + { 0x4b4, 0x4b4, 0x4b4, 0 }, >> + { 0x4ed, 0x4ed, 0x4ed, 0 }, >> + { 0x528, 0x528, 0x528, 0 }, >> + { 0x564, 0x564, 0x564, 0 }, >> + { 0x5a3, 0x5a3, 0x5a3, 0 }, >> + { 0x5e2, 0x5e2, 0x5e2, 0 }, >> + { 0x624, 0x624, 0x624, 0 }, >> + { 0x666, 0x666, 0x666, 0 }, >> + { 0x6ab, 0x6ab, 0x6ab, 0 }, >> + { 0x6f1, 0x6f1, 0x6f1, 0 }, >> + { 0x739, 0x739, 0x739, 0 }, >> + { 0x782, 0x782, 0x782, 0 }, >> + { 0x7ce, 0x7ce, 0x7ce, 0 }, >> + { 0x81b, 0x81b, 0x81b, 0 }, >> + { 0x869, 0x869, 0x869, 0 }, >> + { 0x8b9, 0x8b9, 0x8b9, 0 }, >> + { 0x90b, 0x90b, 0x90b, 0 }, >> + { 0x95f, 0x95f, 0x95f, 0 }, >> + { 0x9b5, 0x9b5, 0x9b5, 0 }, >> + { 0xa0c, 0xa0c, 0xa0c, 0 }, >> + { 0xa65, 0xa65, 0xa65, 0 }, >> + { 0xabf, 0xabf, 0xabf, 0 }, >> + { 0xb1c, 0xb1c, 0xb1c, 0 }, >> + { 0xb7a, 0xb7a, 0xb7a, 0 }, >> + { 0xbda, 0xbda, 0xbda, 0 }, >> + { 0xc3c, 0xc3c, 0xc3c, 0 }, >> + { 0xca0, 0xca0, 0xca0, 0 }, >> + { 0xd06, 0xd06, 0xd06, 0 }, >> + { 0xd6d, 0xd6d, 0xd6d, 0 }, >> + { 0xdd6, 0xdd6, 0xdd6, 0 }, >> + { 0xe41, 0xe41, 0xe41, 0 }, >> + { 0xeae, 0xeae, 0xeae, 0 }, >> + { 0xf1d, 0xf1d, 0xf1d, 0 }, >> + { 0xf8e, 0xf8e, 0xf8e, 0 }, >> + { 0x1001, 0x1001, 0x1001, 0 }, >> + { 0x1075, 0x1075, 0x1075, 0 }, >> + { 0x10ec, 0x10ec, 0x10ec, 0 }, >> + { 0x1164, 0x1164, 0x1164, 0 }, >> + { 0x11de, 0x11de, 0x11de, 0 }, >> + { 0x125a, 0x125a, 0x125a, 0 }, >> + { 0x12d9, 0x12d9, 0x12d9, 0 }, >> + { 0x1359, 0x1359, 0x1359, 0 }, >> + { 0x13db, 0x13db, 0x13db, 0 }, >> + { 0x145f, 0x145f, 0x145f, 0 }, >> + { 0x14e5, 0x14e5, 0x14e5, 0 }, >> + { 0x156d, 0x156d, 0x156d, 0 }, >> + { 0x15f7, 0x15f7, 0x15f7, 0 }, >> + { 0x1683, 0x1683, 0x1683, 0 }, >> + { 0x1711, 0x1711, 0x1711, 0 }, >> + { 0x17a1, 0x17a1, 0x17a1, 0 }, >> + { 0x1833, 0x1833, 0x1833, 0 }, >> + { 0x18c7, 0x18c7, 0x18c7, 0 }, >> + { 0x195d, 0x195d, 0x195d, 0 }, >> + { 0x19f6, 0x19f6, 0x19f6, 0 }, >> + { 0x1a90, 0x1a90, 0x1a90, 0 }, >> + { 0x1b2c, 0x1b2c, 0x1b2c, 0 }, >> + { 0x1bcb, 0x1bcb, 0x1bcb, 0 }, >> + { 0x1c6b, 0x1c6b, 0x1c6b, 0 }, >> + { 0x1d0e, 0x1d0e, 0x1d0e, 0 }, >> + { 0x1db3, 0x1db3, 0x1db3, 0 }, >> + { 0x1e59, 0x1e59, 0x1e59, 0 }, >> + { 0x1f02, 0x1f02, 0x1f02, 0 }, >> + { 0x1fad, 0x1fad, 0x1fad, 0 }, >> + { 0x205b, 0x205b, 0x205b, 0 }, >> + { 0x210a, 0x210a, 0x210a, 0 }, >> + { 0x21bb, 0x21bb, 0x21bb, 0 }, >> + { 0x226f, 0x226f, 0x226f, 0 }, >> + { 0x2325, 0x2325, 0x2325, 0 }, >> + { 0x23dd, 0x23dd, 0x23dd, 0 }, >> + { 0x2497, 0x2497, 0x2497, 0 }, >> + { 0x2553, 0x2553, 0x2553, 0 }, >> + { 0x2612, 0x2612, 0x2612, 0 }, >> + { 0x26d2, 0x26d2, 0x26d2, 0 }, >> + { 0x2795, 0x2795, 0x2795, 0 }, >> + { 0x285a, 0x285a, 0x285a, 0 }, >> + { 0x2922, 0x2922, 0x2922, 0 }, >> + { 0x29eb, 0x29eb, 0x29eb, 0 }, >> + { 0x2ab7, 0x2ab7, 0x2ab7, 0 }, >> + { 0x2b85, 0x2b85, 0x2b85, 0 }, >> + { 0x2c56, 0x2c56, 0x2c56, 0 }, >> + { 0x2d28, 0x2d28, 0x2d28, 0 }, >> + { 0x2dfd, 0x2dfd, 0x2dfd, 0 }, >> + { 0x2ed4, 0x2ed4, 0x2ed4, 0 }, >> + { 0x2fad, 0x2fad, 0x2fad, 0 }, >> + { 0x3089, 0x3089, 0x3089, 0 }, >> + { 0x3167, 0x3167, 0x3167, 0 }, >> + { 0x3247, 0x3247, 0x3247, 0 }, >> + { 0x332a, 0x332a, 0x332a, 0 }, >> + { 0x340e, 0x340e, 0x340e, 0 }, >> + { 0x34f5, 0x34f5, 0x34f5, 0 }, >> + { 0x35df, 0x35df, 0x35df, 0 }, >> + { 0x36cb, 0x36cb, 0x36cb, 0 }, >> + { 0x37b9, 0x37b9, 0x37b9, 0 }, >> + { 0x38a9, 0x38a9, 0x38a9, 0 }, >> + { 0x399c, 0x399c, 0x399c, 0 }, >> + { 0x3a91, 0x3a91, 0x3a91, 0 }, >> + { 0x3b89, 0x3b89, 0x3b89, 0 }, >> + { 0x3c83, 0x3c83, 0x3c83, 0 }, >> + { 0x3d7f, 0x3d7f, 0x3d7f, 0 }, >> + { 0x3e7e, 0x3e7e, 0x3e7e, 0 }, >> + { 0x3f7f, 0x3f7f, 0x3f7f, 0 }, >> + { 0x4082, 0x4082, 0x4082, 0 }, >> + { 0x4188, 0x4188, 0x4188, 0 }, >> + { 0x4290, 0x4290, 0x4290, 0 }, >> + { 0x439b, 0x439b, 0x439b, 0 }, >> + { 0x44a8, 0x44a8, 0x44a8, 0 }, >> + { 0x45b7, 0x45b7, 0x45b7, 0 }, >> + { 0x46c9, 0x46c9, 0x46c9, 0 }, >> + { 0x47dd, 0x47dd, 0x47dd, 0 }, >> + { 0x48f4, 0x48f4, 0x48f4, 0 }, >> + { 0x4a0d, 0x4a0d, 0x4a0d, 0 }, >> + { 0x4b29, 0x4b29, 0x4b29, 0 }, >> + { 0x4c47, 0x4c47, 0x4c47, 0 }, >> + { 0x4d68, 0x4d68, 0x4d68, 0 }, >> + { 0x4e8b, 0x4e8b, 0x4e8b, 0 }, >> + { 0x4fb1, 0x4fb1, 0x4fb1, 0 }, >> + { 0x50d9, 0x50d9, 0x50d9, 0 }, >> + { 0x5203, 0x5203, 0x5203, 0 }, >> + { 0x5330, 0x5330, 0x5330, 0 }, >> + { 0x5460, 0x5460, 0x5460, 0 }, >> + { 0x5592, 0x5592, 0x5592, 0 }, >> + { 0x56c6, 0x56c6, 0x56c6, 0 }, >> + { 0x57fd, 0x57fd, 0x57fd, 0 }, >> + { 0x5937, 0x5937, 0x5937, 0 }, >> + { 0x5a73, 0x5a73, 0x5a73, 0 }, >> + { 0x5bb2, 0x5bb2, 0x5bb2, 0 }, >> + { 0x5cf3, 0x5cf3, 0x5cf3, 0 }, >> + { 0x5e37, 0x5e37, 0x5e37, 0 }, >> + { 0x5f7d, 0x5f7d, 0x5f7d, 0 }, >> + { 0x60c6, 0x60c6, 0x60c6, 0 }, >> + { 0x6212, 0x6212, 0x6212, 0 }, >> + { 0x6360, 0x6360, 0x6360, 0 }, >> + { 0x64b0, 0x64b0, 0x64b0, 0 }, >> + { 0x6604, 0x6604, 0x6604, 0 }, >> + { 0x6759, 0x6759, 0x6759, 0 }, >> + { 0x68b2, 0x68b2, 0x68b2, 0 }, >> + { 0x6a0d, 0x6a0d, 0x6a0d, 0 }, >> + { 0x6b6a, 0x6b6a, 0x6b6a, 0 }, >> + { 0x6ccb, 0x6ccb, 0x6ccb, 0 }, >> + { 0x6e2d, 0x6e2d, 0x6e2d, 0 }, >> + { 0x6f93, 0x6f93, 0x6f93, 0 }, >> + { 0x70fb, 0x70fb, 0x70fb, 0 }, >> + { 0x7266, 0x7266, 0x7266, 0 }, >> + { 0x73d3, 0x73d3, 0x73d3, 0 }, >> + { 0x7543, 0x7543, 0x7543, 0 }, >> + { 0x76b6, 0x76b6, 0x76b6, 0 }, >> + { 0x782b, 0x782b, 0x782b, 0 }, >> + { 0x79a3, 0x79a3, 0x79a3, 0 }, >> + { 0x7b1d, 0x7b1d, 0x7b1d, 0 }, >> + { 0x7c9b, 0x7c9b, 0x7c9b, 0 }, >> + { 0x7e1b, 0x7e1b, 0x7e1b, 0 }, >> + { 0x7f9d, 0x7f9d, 0x7f9d, 0 }, >> + { 0x8123, 0x8123, 0x8123, 0 }, >> + { 0x82ab, 0x82ab, 0x82ab, 0 }, >> + { 0x8436, 0x8436, 0x8436, 0 }, >> + { 0x85c3, 0x85c3, 0x85c3, 0 }, >> + { 0x8753, 0x8753, 0x8753, 0 }, >> + { 0x88e6, 0x88e6, 0x88e6, 0 }, >> + { 0x8a7c, 0x8a7c, 0x8a7c, 0 }, >> + { 0x8c14, 0x8c14, 0x8c14, 0 }, >> + { 0x8daf, 0x8daf, 0x8daf, 0 }, >> + { 0x8f4d, 0x8f4d, 0x8f4d, 0 }, >> + { 0x90ed, 0x90ed, 0x90ed, 0 }, >> + { 0x9290, 0x9290, 0x9290, 0 }, >> + { 0x9436, 0x9436, 0x9436, 0 }, >> + { 0x95df, 0x95df, 0x95df, 0 }, >> + { 0x978b, 0x978b, 0x978b, 0 }, >> + { 0x9939, 0x9939, 0x9939, 0 }, >> + { 0x9aea, 0x9aea, 0x9aea, 0 }, >> + { 0x9c9e, 0x9c9e, 0x9c9e, 0 }, >> + { 0x9e55, 0x9e55, 0x9e55, 0 }, >> + { 0xa00e, 0xa00e, 0xa00e, 0 }, >> + { 0xa1ca, 0xa1ca, 0xa1ca, 0 }, >> + { 0xa389, 0xa389, 0xa389, 0 }, >> + { 0xa54b, 0xa54b, 0xa54b, 0 }, >> + { 0xa710, 0xa710, 0xa710, 0 }, >> + { 0xa8d7, 0xa8d7, 0xa8d7, 0 }, >> + { 0xaaa1, 0xaaa1, 0xaaa1, 0 }, >> + { 0xac6e, 0xac6e, 0xac6e, 0 }, >> + { 0xae3e, 0xae3e, 0xae3e, 0 }, >> + { 0xb011, 0xb011, 0xb011, 0 }, >> + { 0xb1e7, 0xb1e7, 0xb1e7, 0 }, >> + { 0xb3bf, 0xb3bf, 0xb3bf, 0 }, >> + { 0xb59a, 0xb59a, 0xb59a, 0 }, >> + { 0xb778, 0xb778, 0xb778, 0 }, >> + { 0xb959, 0xb959, 0xb959, 0 }, >> + { 0xbb3d, 0xbb3d, 0xbb3d, 0 }, >> + { 0xbd24, 0xbd24, 0xbd24, 0 }, >> + { 0xbf0d, 0xbf0d, 0xbf0d, 0 }, >> + { 0xc0fa, 0xc0fa, 0xc0fa, 0 }, >> + { 0xc2e9, 0xc2e9, 0xc2e9, 0 }, >> + { 0xc4db, 0xc4db, 0xc4db, 0 }, >> + { 0xc6d0, 0xc6d0, 0xc6d0, 0 }, >> + { 0xc8c8, 0xc8c8, 0xc8c8, 0 }, >> + { 0xcac3, 0xcac3, 0xcac3, 0 }, >> + { 0xccc1, 0xccc1, 0xccc1, 0 }, >> + { 0xcec1, 0xcec1, 0xcec1, 0 }, >> + { 0xd0c5, 0xd0c5, 0xd0c5, 0 }, >> + { 0xd2cc, 0xd2cc, 0xd2cc, 0 }, >> + { 0xd4d5, 0xd4d5, 0xd4d5, 0 }, >> + { 0xd6e1, 0xd6e1, 0xd6e1, 0 }, >> + { 0xd8f1, 0xd8f1, 0xd8f1, 0 }, >> + { 0xdb03, 0xdb03, 0xdb03, 0 }, >> + { 0xdd18, 0xdd18, 0xdd18, 0 }, >> + { 0xdf30, 0xdf30, 0xdf30, 0 }, >> + { 0xe14b, 0xe14b, 0xe14b, 0 }, >> + { 0xe369, 0xe369, 0xe369, 0 }, >> + { 0xe58a, 0xe58a, 0xe58a, 0 }, >> + { 0xe7ae, 0xe7ae, 0xe7ae, 0 }, >> + { 0xe9d5, 0xe9d5, 0xe9d5, 0 }, >> + { 0xebff, 0xebff, 0xebff, 0 }, >> + { 0xee2c, 0xee2c, 0xee2c, 0 }, >> + { 0xf05c, 0xf05c, 0xf05c, 0 }, >> + { 0xf28f, 0xf28f, 0xf28f, 0 }, >> + { 0xf4c4, 0xf4c4, 0xf4c4, 0 }, >> + { 0xf6fd, 0xf6fd, 0xf6fd, 0 }, >> + { 0xf939, 0xf939, 0xf939, 0 }, >> + { 0xfb78, 0xfb78, 0xfb78, 0 }, >> + { 0xfdba, 0xfdba, 0xfdba, 0 }, >> + { 0xffff, 0xffff, 0xffff, 0 } >> +}; >> + >> +#if 0 >> +struct vkms_color_lut srgb_eotf = { >> + .base = NULL, >> + . lut_length = LUT_SIZE, >> + .channel_value2index_ratio = drm_int2fixp(0xffff) >> + // .channel_value2index_ratio = 0 //drm_fixp_div(drm_int2fixp(0xffff), drm_int2fixp(LUT_SIZE)) >> +}; >> + >> +#else >> +const struct vkms_color_lut srgb_eotf = { >> + .base = srgb_array, >> + .lut_length = 256, >> + .channel_value2index_ratio = 16711935ll >> +}; >> + >> +#endif >> + >> static u16 pre_mul_blend_channel(u16 src, u16 dst, u16 alpha) >> { >> u32 new_color; >> @@ -136,6 +414,39 @@ static void apply_lut(const struct vkms_crtc_state *crtc_state, struct line_buff >> } >> } >> >> +static void pre_blend_color_transform(const struct vkms_plane_state *plane_state, struct line_buffer *output_buffer) >> +{ >> + struct drm_colorop *pipeline = plane_state->base.base.color_pipeline; >> + /* TODO this is probably wrong */ >> + struct drm_colorop_state *colorop_state; >> + >> + if (!pipeline) >> + return; >> + >> + colorop_state = pipeline->state; >> + >> + if (!colorop_state) >> + return; >> + >> + for (size_t x = 0; x < output_buffer->n_pixels; x++) { >> + struct pixel_argb_u16 *pixel = &output_buffer->pixels[x]; >> + >> + if (pipeline->type == DRM_COLOROP_1D_CURVE && >> + colorop_state->bypass == false) { >> + switch (colorop_state->curve_1d_type) { >> + case DRM_COLOROP_1D_CURVE_SRGB_INV_EOTF: >> + break; >> + case DRM_COLOROP_1D_CURVE_SRGB_EOTF: >> + default: >> + pixel->r = apply_lut_to_channel_value(&srgb_eotf, pixel->r, LUT_RED); >> + pixel->g = apply_lut_to_channel_value(&srgb_eotf, pixel->g, LUT_GREEN); >> + pixel->b = apply_lut_to_channel_value(&srgb_eotf, pixel->b, LUT_BLUE); >> + break; >> + } >> + } >> + } >> +} >> + >> /** >> * @wb_frame_info: The writeback frame buffer metadata >> * @crtc_state: The crtc state >> @@ -168,8 +479,13 @@ static void blend(struct vkms_writeback_job *wb, >> continue; >> >> plane[i]->plane_read(stage_buffer, plane[i]->frame_info, y); >> + >> + /* do per-plane color transformations here */ >> + // pre_blend_color_transform(plane[i], stage_buffer); >> + >> pre_mul_alpha_blend(plane[i]->frame_info, stage_buffer, >> output_buffer); >> + pre_blend_color_transform(plane[i], output_buffer); > > I see it should be applied to the `stage_buffer` before blending (i.e. > pre_mul_alpha_blend()) and in the lines commented above. Were you > getting any unexpected result? > v2 fixes this. You're absolutely right. I did see some issues and was experimenting with moving things around, but it needs to be before the blend call. > Otherwise, having this VKMS implementation looks very nice. Thank you! > Thanks :) Harry > Melissa > >> } >> >> apply_lut(crtc_state, output_buffer); >> diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h >> index 310b31f47928..c04f714cd486 100644 >> --- a/drivers/gpu/drm/vkms/vkms_drv.h >> +++ b/drivers/gpu/drm/vkms/vkms_drv.h >> @@ -168,4 +168,8 @@ void vkms_set_composer(struct vkms_output *out, bool enabled); >> /* Writeback */ >> int vkms_enable_writeback_connector(struct vkms_device *vkmsdev); >> >> +/* Colorops */ >> +int vkms_initialize_colorops(struct drm_plane *plane); >> + >> + >> #endif /* _VKMS_DRV_H_ */ >> diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_plane.c >> index b3f8a115cc23..cbffbdd7cbf9 100644 >> --- a/drivers/gpu/drm/vkms/vkms_plane.c >> +++ b/drivers/gpu/drm/vkms/vkms_plane.c >> @@ -237,5 +237,7 @@ struct vkms_plane *vkms_plane_init(struct vkms_device *vkmsdev, >> >> drm_plane_helper_add(&plane->base, funcs); >> >> + vkms_initialize_colorops(&plane->base); >> + >> return plane; >> } >> -- >> 2.42.0 >>