From patchwork Fri Jan 21 21:38:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Igor Matheus Andrade Torrente X-Patchwork-Id: 12720305 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 8F42DC433EF for ; Fri, 21 Jan 2022 21:39:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 98B1D10E43F; Fri, 21 Jan 2022 21:39:07 +0000 (UTC) Received: from mail-ua1-x92a.google.com (mail-ua1-x92a.google.com [IPv6:2607:f8b0:4864:20::92a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 084DE10E43F for ; Fri, 21 Jan 2022 21:39:06 +0000 (UTC) Received: by mail-ua1-x92a.google.com with SMTP id p1so19203882uap.9 for ; Fri, 21 Jan 2022 13:39:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fxiHRCnllaybcwK9h+/yyyprDNL6BwxhTWyTaAvat5Q=; b=SYF5Cg0YexwpDZb+NuA9S6HouQNPbWnYUhYICHtiLCJdOSyOF4tUczdfExHe94Odf6 hiQv0aH8kb9kp8sClaQMm0iWNkRfRWyS0RGnTbDezsXPfxib9OSSEJdN+OQnVcWG6vP5 K+8QW/R0poQXaio94i1rQalCI8wMP+40gYy2csQ+TU3B8qFo4r6L4tFjbiv3WYwhZwT5 tzns7d6O3UfMkK+MWDB7DTgmSZkbYYXsKS6rwtUW340cC9yIpOyYdG7x4+MVR8bqwoAB xBbXQ5R7B6PdNN/E3x7AHTwyAvAlY372yY1jDS0wseUseHHfcWzSUIJBxisjUvejJrfS TjRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fxiHRCnllaybcwK9h+/yyyprDNL6BwxhTWyTaAvat5Q=; b=0Qx+Swy2vCHeESz0nPTuE3Y2Limbdw4x43bZc0gMko+5nkePTM5yRvGsqD66Vz8JB2 CJVx4WSCT07Pd1oiKwDIO66c2eFgI9u6YcBJA/lvVVGWRYaOVdjInVT/0yXfoDZCC98F Si2DvHErZVD/DzPN64o0OPfCJ9ZNj8twHh9CNVOZdZ06QPa72c0stwAhaAFUPdDw5hhh sAP4rv0FeeqNoA2PLKNZHQD/cGNTEUI/iuXcaTRACNDr805QXeoJupwISCAeae8ZlMrg B8TcQcy2cJUVy0tfi6DZa5P4C3YaW6TnUG0NKfrMgs8HqRehzlX1KUvvXZhr9sAYq3D+ ZnSw== X-Gm-Message-State: AOAM533dOHuD5PGRQhfrn/RjmocDwhoayr2gcxQfXC2vrVeB1KMS5BiR K/3vH8UTxOZ+hSau/XSkT7I= X-Google-Smtp-Source: ABdhPJz0+tXPoage9b7IjCnwYJloTTA8uW3mnWqf2JNkYGGQpByAyI2WkLr4/rNSA2SRAE6ZEtKuuA== X-Received: by 2002:a67:dd15:: with SMTP id y21mr2572474vsj.84.1642801145160; Fri, 21 Jan 2022 13:39:05 -0800 (PST) Received: from localhost.localdomain ([2804:431:c7f4:2d80:9427:7267:dbaf:8ccf]) by smtp.googlemail.com with ESMTPSA id 29sm1633844vki.25.2022.01.21.13.39.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 13:39:04 -0800 (PST) From: Igor Torrente To: rodrigosiqueiramelo@gmail.com, melissa.srw@gmail.com, ppaalanen@gmail.com, tzimmermann@suse.de Subject: [PATCH v4 1/9] drm: vkms: Replace the deprecated drm_mode_config_init Date: Fri, 21 Jan 2022 18:38:23 -0300 Message-Id: <20220121213831.47229-2-igormtorrente@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220121213831.47229-1-igormtorrente@gmail.com> References: <20220121213831.47229-1-igormtorrente@gmail.com> MIME-Version: 1.0 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: hamohammed.sa@gmail.com, airlied@linux.ie, dri-devel@lists.freedesktop.org, ~lkcamp/patches@lists.sr.ht, Igor Torrente Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" `drm_mode_config_init` is deprecated since commit c3b790ea07a1 ("drm: Manage drm_mode_config_init with drmm_") in favor of `drmm_mode_config_init`. Update the former to the latter. Signed-off-by: Igor Torrente Reviewed-by: Melissa Wen --- V2: Change the code style(Thomas Zimmermann). V4: Update the commit message(Nícolas F. R. A. Prado) --- drivers/gpu/drm/vkms/vkms_drv.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_drv.c index 0ffe5f0e33f7..ee4d96dabe19 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.c +++ b/drivers/gpu/drm/vkms/vkms_drv.c @@ -140,8 +140,12 @@ static const struct drm_mode_config_helper_funcs vkms_mode_config_helpers = { static int vkms_modeset_init(struct vkms_device *vkmsdev) { struct drm_device *dev = &vkmsdev->drm; + int ret; + + ret = drmm_mode_config_init(dev); + if (ret < 0) + return ret; - drm_mode_config_init(dev); dev->mode_config.funcs = &vkms_mode_funcs; dev->mode_config.min_width = XRES_MIN; dev->mode_config.min_height = YRES_MIN; From patchwork Fri Jan 21 21:38:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Matheus Andrade Torrente X-Patchwork-Id: 12720306 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 39812C433EF for ; Fri, 21 Jan 2022 21:39:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6BAFF10E452; Fri, 21 Jan 2022 21:39:10 +0000 (UTC) Received: from mail-ua1-x92b.google.com (mail-ua1-x92b.google.com [IPv6:2607:f8b0:4864:20::92b]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7848A10E460 for ; Fri, 21 Jan 2022 21:39:08 +0000 (UTC) Received: by mail-ua1-x92b.google.com with SMTP id 2so19268296uax.10 for ; Fri, 21 Jan 2022 13:39:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wqMc7i1j40Y6DJkM28XSTOEIlGNuQurfBNScJR7ESu8=; b=deg9y5rzsQq1zGdONQcrCVWlXk/79YlHYoxZ94gLNquv9QkSbVxPvYhtnnly2KYqLb 4lX8gVmI4EhDItyn7dxRiwzxoYtSHBMKWQUSrrKPDN5WuP0R7ZakBRGw3pWAoBiPvmM2 XBgihfmVo1fgOAtNuNF4D3IeEY+CJUubQ057cbEA/mAMJcilDrGKkkchgqe0EdGzUvUb kBOVp5ELRdNni6ky7EiryHPFpOm9s21r6y8Gya0ANLnZOILTEl1Oso5vjU4C9pJG5hr4 PWXSprfvFdckdCH478X0/aWYVHr8B273MlVss+hwFJMQ+a/zsdj8bqnYV1nnTgCAO0PJ Bcmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wqMc7i1j40Y6DJkM28XSTOEIlGNuQurfBNScJR7ESu8=; b=pQrtoajmHl67kHyZ22LEwTMfKt7Wok+stlM8N2MVKIoo3AwkQIm9KDetsIjtpP0o18 kb3beJ5/VaGKPh1hWD4tMz/LbdbSobUG7KxGSXkHAfNsuZNLGAy/cs4vkOleDYPCUtWS +L6LgRm6yxe4NForUF5I8DLaev23bjfJsjDhvtKVu2tq1xJ9lQ/PrTJNLax75guw5YtY QlxWEAahP2iMMIIEFubmtiH/r236LNnbDUo9C+N+fZQSNX/qEjMlLnPMgu4fbGtAL2hn dwUqZ2h4Kxd6Q7I15bjR3w7ofIz3hmp0Z42U2qQa3gFeKZjrhQcZ/cxs3D0zSc3njN/l Cccw== X-Gm-Message-State: AOAM532lgqWd4P35oM+xhploHHHskAOdyaOr2nLXMKZVZhYJiogcnZDO vIsu6V7o1wdTQcDHXB7jyEM= X-Google-Smtp-Source: ABdhPJxHqsXNkD3+xQXa96KXQwx8jqsG6/zY9cSkNluo9jIEynctBI7C+V+KwCMxoFQ/pEUQUTGkoA== X-Received: by 2002:a05:6102:3566:: with SMTP id bh6mr2381538vsb.11.1642801147629; Fri, 21 Jan 2022 13:39:07 -0800 (PST) Received: from localhost.localdomain ([2804:431:c7f4:2d80:9427:7267:dbaf:8ccf]) by smtp.googlemail.com with ESMTPSA id 29sm1633844vki.25.2022.01.21.13.39.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 13:39:07 -0800 (PST) From: Igor Torrente To: rodrigosiqueiramelo@gmail.com, melissa.srw@gmail.com, ppaalanen@gmail.com, tzimmermann@suse.de Subject: [PATCH v4 2/9] drm: vkms: Alloc the compose frame using vzalloc Date: Fri, 21 Jan 2022 18:38:24 -0300 Message-Id: <20220121213831.47229-3-igormtorrente@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220121213831.47229-1-igormtorrente@gmail.com> References: <20220121213831.47229-1-igormtorrente@gmail.com> MIME-Version: 1.0 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: hamohammed.sa@gmail.com, airlied@linux.ie, dri-devel@lists.freedesktop.org, ~lkcamp/patches@lists.sr.ht, Igor Torrente Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Currently, the memory to the composition frame is being allocated using the kzmalloc. This comes with the limitation of maximum size of one page size(which in the x86_64 is 4Kb and 4MB for default and hugepage respectively). Somes test of igt (e.g. kms_plane@pixel-format) uses more than 4MB when testing some pixel formats like ARGB16161616. This problem is addessed by allocating the memory using kvzalloc that circunvents this limitation. Signed-off-by: Igor Torrente Reviewed-by: Melissa Wen --- drivers/gpu/drm/vkms/vkms_composer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c index 9e8204be9a14..82f79e508f81 100644 --- a/drivers/gpu/drm/vkms/vkms_composer.c +++ b/drivers/gpu/drm/vkms/vkms_composer.c @@ -180,7 +180,7 @@ static int compose_active_planes(void **vaddr_out, int i; if (!*vaddr_out) { - *vaddr_out = kzalloc(gem_obj->size, GFP_KERNEL); + *vaddr_out = kvzalloc(gem_obj->size, GFP_KERNEL); if (!*vaddr_out) { DRM_ERROR("Cannot allocate memory for output frame."); return -ENOMEM; @@ -263,7 +263,7 @@ void vkms_composer_worker(struct work_struct *work) crtc_state); if (ret) { if (ret == -EINVAL && !wb_pending) - kfree(vaddr_out); + kvfree(vaddr_out); return; } @@ -275,7 +275,7 @@ void vkms_composer_worker(struct work_struct *work) crtc_state->wb_pending = false; spin_unlock_irq(&out->composer_lock); } else { - kfree(vaddr_out); + kvfree(vaddr_out); } /* From patchwork Fri Jan 21 21:38:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Matheus Andrade Torrente X-Patchwork-Id: 12720307 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 2CA8FC43219 for ; Fri, 21 Jan 2022 21:39:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7762610E460; Fri, 21 Jan 2022 21:39:13 +0000 (UTC) Received: from mail-ua1-x934.google.com (mail-ua1-x934.google.com [IPv6:2607:f8b0:4864:20::934]) by gabe.freedesktop.org (Postfix) with ESMTPS id E948510E460 for ; Fri, 21 Jan 2022 21:39:10 +0000 (UTC) Received: by mail-ua1-x934.google.com with SMTP id m90so19325153uam.2 for ; Fri, 21 Jan 2022 13:39:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YouWQBMC35hS9vP8MX9BwK7+cpKBm2hXUisuZuryQ/U=; b=IZpgBDYxlWZ18abYpGccZ8kWhXeHOM/aMY/RWvvSLykbOWSgbHDzUXmtv2qW7e/31N /kpIvIP2+y5NrhJyWXgETkZZepcsqUHKHMNMzXKmYbn8QBSljnTEXsQ7601ztssNSOYg Dm6aEW45kp4aDXDPp2XiaQLdIeUDmcFC8MWQbb1fEQ9QquD/KeAhanmyeHb6wM4eHkcH ySNDnGarQazjN8a5XYDHu50+auv9GiM/DTvBqhIV+n3EibSDGSIyJPQ/vzDLcySs01zb 1zrSY5bYp1f3igjfJm4rd4BjGvRNyfB/xTUNkmbzSmcnBwZ8TkU0RafVtRBD1fPFKSOd ipVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YouWQBMC35hS9vP8MX9BwK7+cpKBm2hXUisuZuryQ/U=; b=32YTuNNOO/5UnBE9gdNOWf4CRJ+jRNjKvWt54Je3sZHO6jGT6RSAJEyLbl3fBFGHod iha93sfF8WP2rF9/RQlsKRScJNlvG3xMk02Y3c0nfjR7bFLZqtvC6WeLIYwiBxKa7Z1M 3vXG3A4cITrL4X3XD0sZq3Pb5BDuUcsSVsvULJGfmyR3Okiee+7G1XQG0R0n/FJwRNYm BvWeYUeM0KFffNnHPW+4EPpy1KZ60l0CS7824WhMCwqdC0GEpsg7yJBf1w3kHSHxuJXk DQrO4IJSoYhxoUnI+yfVHOYWhR+xVegi66ribRrTA8JfTrVO0rhibb6/B5ULsqpbgV4m kkCQ== X-Gm-Message-State: AOAM533dQdfHbFnC3SFPOYh4QHaVdRN8a4hhR6XQ1X9RQchPvCy2rCLt sj3g6F9lxcejbK6HgDMMD74= X-Google-Smtp-Source: ABdhPJwBAhjC2EXjixsxNjI1cvrjTKTj8SACcOwiPK/cZWOzCqXUXfVDvH1BbTSfXU/hBDJoqh5CJw== X-Received: by 2002:ab0:7145:: with SMTP id k5mr2519061uao.5.1642801150109; Fri, 21 Jan 2022 13:39:10 -0800 (PST) Received: from localhost.localdomain ([2804:431:c7f4:2d80:9427:7267:dbaf:8ccf]) by smtp.googlemail.com with ESMTPSA id 29sm1633844vki.25.2022.01.21.13.39.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 13:39:09 -0800 (PST) From: Igor Torrente To: rodrigosiqueiramelo@gmail.com, melissa.srw@gmail.com, ppaalanen@gmail.com, tzimmermann@suse.de Subject: [PATCH v4 3/9] drm: vkms: Replace hardcoded value of `vkms_composer.map` to DRM_FORMAT_MAX_PLANES Date: Fri, 21 Jan 2022 18:38:25 -0300 Message-Id: <20220121213831.47229-4-igormtorrente@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220121213831.47229-1-igormtorrente@gmail.com> References: <20220121213831.47229-1-igormtorrente@gmail.com> MIME-Version: 1.0 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: hamohammed.sa@gmail.com, airlied@linux.ie, dri-devel@lists.freedesktop.org, ~lkcamp/patches@lists.sr.ht, Igor Torrente Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The `map` vector at `vkms_composer` uses a hardcoded value to define its size. If someday the maximum number of planes increases, this hardcoded value can be a problem. This value is being replaced with the DRM_FORMAT_MAX_PLANES macro. Signed-off-by: Igor Torrente Reviewed-by: Melissa Wen --- drivers/gpu/drm/vkms/vkms_drv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h index 9496fdc900b8..0eeea6f93733 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -30,7 +30,7 @@ struct vkms_writeback_job { struct vkms_composer { struct drm_framebuffer fb; struct drm_rect src, dst; - struct dma_buf_map map[4]; + struct dma_buf_map map[DRM_FORMAT_MAX_PLANES]; unsigned int offset; unsigned int pitch; unsigned int cpp; From patchwork Fri Jan 21 21:38:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Matheus Andrade Torrente X-Patchwork-Id: 12720308 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 C16B5C433F5 for ; Fri, 21 Jan 2022 21:39:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ECF4E10E447; Fri, 21 Jan 2022 21:39:16 +0000 (UTC) Received: from mail-ua1-x932.google.com (mail-ua1-x932.google.com [IPv6:2607:f8b0:4864:20::932]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6DCD610E447 for ; Fri, 21 Jan 2022 21:39:13 +0000 (UTC) Received: by mail-ua1-x932.google.com with SMTP id 2so19268619uax.10 for ; Fri, 21 Jan 2022 13:39:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SPLFJGbr5oyN/FPOLqy0b5L4M3tFQyG2i7d0/l7N0E0=; b=V12sE7kliPUhUE4UatCFVxSUcAzhZqzQLlejwa6jRn3SQkvJZYkWE+eSuP72C2PxWi 1zgWQ+NVoomz33TfZvoApK6EKuzXGYUWFWu8/TZQWBlkCvIncllsZRnfwFzEn8ZPpM/+ mbJpDFVlzSt9H6c5OKx1MNwYjy4mDtMG4i8X9u3O+vGKiyA4+4K8WAVnuQ0VB/G1rT1c c4W16zoLXzex/tP32a87c00AejVKGGEvRbuE2bGIWQm/QFlniHzgAfenb/D640kMzDPj uwBUbE/fH5pksvNaHrha9e2N6M1DBDrDBqQnRUq/bYdMrfMcojyogKx+68pW+PcKz70X 6z0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SPLFJGbr5oyN/FPOLqy0b5L4M3tFQyG2i7d0/l7N0E0=; b=XQSpM2N6H22KuqvRqG7LzzuBmhdyrOgaSzDGtFToi51Haki9VfnpTRUVZSPECoVFgo RXiyB5RAiCoLX1mUKJfgUiSa6b/pauw4Xt2EsatFyeesXE55PWnwTx/XNVXAyy7Z3keg vTFlPNtv/WE5tzTU6odL9RV46cGELXfhBpBpYZyoaU9Ir8JnDftWSNkW0lZLhJbCmWxM J4alu3F9AFBMZgOXpTU0MyVymemx1ZTw22evvfu6q8jjVybpbIWjRYMLyp6scJQ+s27n BDU0Oar0pjZgg+8i7yc5gF7PuImX2dEoBw3nP8IwlUbEewEEPIMSSDIktXHTdYxmVXlH pKVA== X-Gm-Message-State: AOAM530TR+4d96ZBjIODzIk8iTu2vqHw2OilmYF2USnCC+U1DP4YM4hG aMgW+PDjUKjWFw8wyNSDp7I= X-Google-Smtp-Source: ABdhPJwH1oktTH2nk/Nru6Vy3v997/8jiI8zxwi0PUKhmYVqxpW/jPxnyuOcztRYNVRhNU75DtwrrA== X-Received: by 2002:a67:fdc7:: with SMTP id l7mr1673956vsq.85.1642801152584; Fri, 21 Jan 2022 13:39:12 -0800 (PST) Received: from localhost.localdomain ([2804:431:c7f4:2d80:9427:7267:dbaf:8ccf]) by smtp.googlemail.com with ESMTPSA id 29sm1633844vki.25.2022.01.21.13.39.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 13:39:12 -0800 (PST) From: Igor Torrente To: rodrigosiqueiramelo@gmail.com, melissa.srw@gmail.com, ppaalanen@gmail.com, tzimmermann@suse.de Subject: [PATCH v4 4/9] drm: vkms: Rename `vkms_composer` to `vkms_frame_info` Date: Fri, 21 Jan 2022 18:38:26 -0300 Message-Id: <20220121213831.47229-5-igormtorrente@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220121213831.47229-1-igormtorrente@gmail.com> References: <20220121213831.47229-1-igormtorrente@gmail.com> MIME-Version: 1.0 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: hamohammed.sa@gmail.com, airlied@linux.ie, dri-devel@lists.freedesktop.org, ~lkcamp/patches@lists.sr.ht, Igor Torrente Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Changes the name of this struct to a more meaningful name. A name that represents better what this struct is about. Composer is the code that do the compositing of the planes. This struct is contains information of the frame that is being used in the output composition. Thus, vkms_frame_info is a better name to represent this. Signed-off-by: Igor Torrente Reviewed-by: Melissa Wen --- drivers/gpu/drm/vkms/vkms_composer.c | 87 ++++++++++++++-------------- drivers/gpu/drm/vkms/vkms_drv.h | 6 +- drivers/gpu/drm/vkms/vkms_plane.c | 38 ++++++------ 3 files changed, 66 insertions(+), 65 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c index 82f79e508f81..2d946368a561 100644 --- a/drivers/gpu/drm/vkms/vkms_composer.c +++ b/drivers/gpu/drm/vkms/vkms_composer.c @@ -11,11 +11,11 @@ #include "vkms_drv.h" static u32 get_pixel_from_buffer(int x, int y, const u8 *buffer, - const struct vkms_composer *composer) + const struct vkms_frame_info *frame_info) { u32 pixel; - int src_offset = composer->offset + (y * composer->pitch) - + (x * composer->cpp); + int src_offset = frame_info->offset + (y * frame_info->pitch) + + (x * frame_info->cpp); pixel = *(u32 *)&buffer[src_offset]; @@ -26,24 +26,24 @@ static u32 get_pixel_from_buffer(int x, int y, const u8 *buffer, * compute_crc - Compute CRC value on output frame * * @vaddr: address to final framebuffer - * @composer: framebuffer's metadata + * @frame_info: framebuffer's metadata * * returns CRC value computed using crc32 on the visible portion of * the final framebuffer at vaddr_out */ static uint32_t compute_crc(const u8 *vaddr, - const struct vkms_composer *composer) + const struct vkms_frame_info *frame_info) { int x, y; u32 crc = 0, pixel = 0; - int x_src = composer->src.x1 >> 16; - int y_src = composer->src.y1 >> 16; - int h_src = drm_rect_height(&composer->src) >> 16; - int w_src = drm_rect_width(&composer->src) >> 16; + int x_src = frame_info->src.x1 >> 16; + int y_src = frame_info->src.y1 >> 16; + int h_src = drm_rect_height(&frame_info->src) >> 16; + int w_src = drm_rect_width(&frame_info->src) >> 16; for (y = y_src; y < y_src + h_src; ++y) { for (x = x_src; x < x_src + w_src; ++x) { - pixel = get_pixel_from_buffer(x, y, vaddr, composer); + pixel = get_pixel_from_buffer(x, y, vaddr, frame_info); crc = crc32_le(crc, (void *)&pixel, sizeof(u32)); } } @@ -98,8 +98,8 @@ static void x_blend(const u8 *xrgb_src, u8 *xrgb_dst) * blend - blend value at vaddr_src with value at vaddr_dst * @vaddr_dst: destination address * @vaddr_src: source address - * @dst_composer: destination framebuffer's metadata - * @src_composer: source framebuffer's metadata + * @dst_frame_info: destination framebuffer's metadata + * @src_frame_info: source framebuffer's metadata * @pixel_blend: blending equation based on plane format * * Blend the vaddr_src value with the vaddr_dst value using a pixel blend @@ -111,33 +111,33 @@ static void x_blend(const u8 *xrgb_src, u8 *xrgb_dst) * pixel color values */ static void blend(void *vaddr_dst, void *vaddr_src, - struct vkms_composer *dst_composer, - struct vkms_composer *src_composer, + struct vkms_frame_info *dst_frame_info, + struct vkms_frame_info *src_frame_info, void (*pixel_blend)(const u8 *, u8 *)) { int i, j, j_dst, i_dst; int offset_src, offset_dst; u8 *pixel_dst, *pixel_src; - int x_src = src_composer->src.x1 >> 16; - int y_src = src_composer->src.y1 >> 16; + int x_src = src_frame_info->src.x1 >> 16; + int y_src = src_frame_info->src.y1 >> 16; - int x_dst = src_composer->dst.x1; - int y_dst = src_composer->dst.y1; - int h_dst = drm_rect_height(&src_composer->dst); - int w_dst = drm_rect_width(&src_composer->dst); + int x_dst = src_frame_info->dst.x1; + int y_dst = src_frame_info->dst.y1; + int h_dst = drm_rect_height(&src_frame_info->dst); + int w_dst = drm_rect_width(&src_frame_info->dst); int y_limit = y_src + h_dst; int x_limit = x_src + w_dst; for (i = y_src, i_dst = y_dst; i < y_limit; ++i) { for (j = x_src, j_dst = x_dst; j < x_limit; ++j) { - offset_dst = dst_composer->offset - + (i_dst * dst_composer->pitch) - + (j_dst++ * dst_composer->cpp); - offset_src = src_composer->offset - + (i * src_composer->pitch) - + (j * src_composer->cpp); + offset_dst = dst_frame_info->offset + + (i_dst * dst_frame_info->pitch) + + (j_dst++ * dst_frame_info->cpp); + offset_src = src_frame_info->offset + + (i * src_frame_info->pitch) + + (j * src_frame_info->cpp); pixel_src = (u8 *)(vaddr_src + offset_src); pixel_dst = (u8 *)(vaddr_dst + offset_dst); @@ -149,32 +149,33 @@ static void blend(void *vaddr_dst, void *vaddr_src, } } -static void compose_plane(struct vkms_composer *primary_composer, - struct vkms_composer *plane_composer, +static void compose_plane(struct vkms_frame_info *primary_plane_info, + struct vkms_frame_info *plane_frame_info, void *vaddr_out) { - struct drm_framebuffer *fb = &plane_composer->fb; + struct drm_framebuffer *fb = &plane_frame_info->fb; void *vaddr; void (*pixel_blend)(const u8 *p_src, u8 *p_dst); - if (WARN_ON(dma_buf_map_is_null(&primary_composer->map[0]))) + if (WARN_ON(dma_buf_map_is_null(&primary_plane_info->map[0]))) return; - vaddr = plane_composer->map[0].vaddr; + vaddr = plane_frame_info->map[0].vaddr; if (fb->format->format == DRM_FORMAT_ARGB8888) pixel_blend = &alpha_blend; else pixel_blend = &x_blend; - blend(vaddr_out, vaddr, primary_composer, plane_composer, pixel_blend); + blend(vaddr_out, vaddr, primary_plane_info, + plane_frame_info, pixel_blend); } static int compose_active_planes(void **vaddr_out, - struct vkms_composer *primary_composer, + struct vkms_frame_info *primary_plane_info, struct vkms_crtc_state *crtc_state) { - struct drm_framebuffer *fb = &primary_composer->fb; + struct drm_framebuffer *fb = &primary_plane_info->fb; struct drm_gem_object *gem_obj = drm_gem_fb_get_obj(fb, 0); const void *vaddr; int i; @@ -187,10 +188,10 @@ static int compose_active_planes(void **vaddr_out, } } - if (WARN_ON(dma_buf_map_is_null(&primary_composer->map[0]))) + if (WARN_ON(dma_buf_map_is_null(&primary_plane_info->map[0]))) return -EINVAL; - vaddr = primary_composer->map[0].vaddr; + vaddr = primary_plane_info->map[0].vaddr; memcpy(*vaddr_out, vaddr, gem_obj->size); @@ -199,8 +200,8 @@ static int compose_active_planes(void **vaddr_out, * ((primary <- overlay) <- cursor) */ for (i = 1; i < crtc_state->num_active_planes; i++) - compose_plane(primary_composer, - crtc_state->active_planes[i]->composer, + compose_plane(primary_plane_info, + crtc_state->active_planes[i]->frame_info, *vaddr_out); return 0; @@ -222,7 +223,7 @@ void vkms_composer_worker(struct work_struct *work) composer_work); struct drm_crtc *crtc = crtc_state->base.crtc; struct vkms_output *out = drm_crtc_to_vkms_output(crtc); - struct vkms_composer *primary_composer = NULL; + struct vkms_frame_info *primary_plane_info = NULL; struct vkms_plane_state *act_plane = NULL; bool crc_pending, wb_pending; void *vaddr_out = NULL; @@ -250,16 +251,16 @@ void vkms_composer_worker(struct work_struct *work) if (crtc_state->num_active_planes >= 1) { act_plane = crtc_state->active_planes[0]; if (act_plane->base.base.plane->type == DRM_PLANE_TYPE_PRIMARY) - primary_composer = act_plane->composer; + primary_plane_info = act_plane->frame_info; } - if (!primary_composer) + if (!primary_plane_info) return; if (wb_pending) vaddr_out = crtc_state->active_writeback->data[0].vaddr; - ret = compose_active_planes(&vaddr_out, primary_composer, + ret = compose_active_planes(&vaddr_out, primary_plane_info, crtc_state); if (ret) { if (ret == -EINVAL && !wb_pending) @@ -267,7 +268,7 @@ void vkms_composer_worker(struct work_struct *work) return; } - crc32 = compute_crc(vaddr_out, primary_composer); + crc32 = compute_crc(vaddr_out, primary_plane_info); if (wb_pending) { drm_writeback_signal_completion(&out->wb_connector, 0); diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h index 0eeea6f93733..2e6342164bef 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -27,7 +27,7 @@ struct vkms_writeback_job { struct dma_buf_map data[DRM_FORMAT_MAX_PLANES]; }; -struct vkms_composer { +struct vkms_frame_info { struct drm_framebuffer fb; struct drm_rect src, dst; struct dma_buf_map map[DRM_FORMAT_MAX_PLANES]; @@ -39,11 +39,11 @@ struct vkms_composer { /** * vkms_plane_state - Driver specific plane state * @base: base plane state - * @composer: data required for composing computation + * @frame_info: data required for composing computation */ struct vkms_plane_state { struct drm_shadow_plane_state base; - struct vkms_composer *composer; + struct vkms_frame_info *frame_info; }; struct vkms_plane { diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_plane.c index 32409e15244b..a56b0f76eddd 100644 --- a/drivers/gpu/drm/vkms/vkms_plane.c +++ b/drivers/gpu/drm/vkms/vkms_plane.c @@ -24,20 +24,20 @@ static struct drm_plane_state * vkms_plane_duplicate_state(struct drm_plane *plane) { struct vkms_plane_state *vkms_state; - struct vkms_composer *composer; + struct vkms_frame_info *frame_info; vkms_state = kzalloc(sizeof(*vkms_state), GFP_KERNEL); if (!vkms_state) return NULL; - composer = kzalloc(sizeof(*composer), GFP_KERNEL); - if (!composer) { - DRM_DEBUG_KMS("Couldn't allocate composer\n"); + frame_info = kzalloc(sizeof(*frame_info), GFP_KERNEL); + if (!frame_info) { + DRM_DEBUG_KMS("Couldn't allocate frame_info\n"); kfree(vkms_state); return NULL; } - vkms_state->composer = composer; + vkms_state->frame_info = frame_info; __drm_gem_duplicate_shadow_plane_state(plane, &vkms_state->base); @@ -54,12 +54,12 @@ static void vkms_plane_destroy_state(struct drm_plane *plane, /* dropping the reference we acquired in * vkms_primary_plane_update() */ - if (drm_framebuffer_read_refcount(&vkms_state->composer->fb)) - drm_framebuffer_put(&vkms_state->composer->fb); + if (drm_framebuffer_read_refcount(&vkms_state->frame_info->fb)) + drm_framebuffer_put(&vkms_state->frame_info->fb); } - kfree(vkms_state->composer); - vkms_state->composer = NULL; + kfree(vkms_state->frame_info); + vkms_state->frame_info = NULL; __drm_gem_destroy_shadow_plane_state(&vkms_state->base); kfree(vkms_state); @@ -99,7 +99,7 @@ static void vkms_plane_atomic_update(struct drm_plane *plane, struct vkms_plane_state *vkms_plane_state; struct drm_shadow_plane_state *shadow_plane_state; struct drm_framebuffer *fb = new_state->fb; - struct vkms_composer *composer; + struct vkms_frame_info *frame_info; if (!new_state->crtc || !fb) return; @@ -107,15 +107,15 @@ static void vkms_plane_atomic_update(struct drm_plane *plane, vkms_plane_state = to_vkms_plane_state(new_state); shadow_plane_state = &vkms_plane_state->base; - composer = vkms_plane_state->composer; - memcpy(&composer->src, &new_state->src, sizeof(struct drm_rect)); - memcpy(&composer->dst, &new_state->dst, sizeof(struct drm_rect)); - memcpy(&composer->fb, fb, sizeof(struct drm_framebuffer)); - memcpy(&composer->map, &shadow_plane_state->data, sizeof(composer->map)); - drm_framebuffer_get(&composer->fb); - composer->offset = fb->offsets[0]; - composer->pitch = fb->pitches[0]; - composer->cpp = fb->format->cpp[0]; + frame_info = vkms_plane_state->frame_info; + memcpy(&frame_info->src, &new_state->src, sizeof(struct drm_rect)); + memcpy(&frame_info->dst, &new_state->dst, sizeof(struct drm_rect)); + memcpy(&frame_info->fb, fb, sizeof(struct drm_framebuffer)); + memcpy(&frame_info->map, &shadow_plane_state->data, sizeof(frame_info->map)); + drm_framebuffer_get(&frame_info->fb); + frame_info->offset = fb->offsets[0]; + frame_info->pitch = fb->pitches[0]; + frame_info->cpp = fb->format->cpp[0]; } static int vkms_plane_atomic_check(struct drm_plane *plane, From patchwork Fri Jan 21 21:38:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Matheus Andrade Torrente X-Patchwork-Id: 12720309 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 47FFCC43219 for ; Fri, 21 Jan 2022 21:39:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7280E10E462; Fri, 21 Jan 2022 21:39:17 +0000 (UTC) Received: from mail-ua1-x92c.google.com (mail-ua1-x92c.google.com [IPv6:2607:f8b0:4864:20::92c]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0418E10E447 for ; Fri, 21 Jan 2022 21:39:15 +0000 (UTC) Received: by mail-ua1-x92c.google.com with SMTP id n15so17744886uaq.5 for ; Fri, 21 Jan 2022 13:39:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vP5kuX7mZVTY/pG9uRbevQGaPtcr9mHVd+pjSpNXL94=; b=MhsVG/mUywxmet15d9JE5ILhVD6J+Qv5OqszhuHHtitaFk1EId+YgSPsaThr4xSdFM qtbg+zrFV5jpzrWMnpvVWt2WN4C1CevMwPV8wcnox+qe6NByRncE7t501e/QfEV9GJxS 1bglH/Y6EXMKmqDK81iabjiAu7CIum41hrK/7Rvt3tAgcXU73p1PiAhrxkwzPgt5wu+r uSKgn1CWhkyy/9FsP61vtpxc+u18eVApifdv8LFnEKZJahvbpeJmXO6g7qiCCBdkj10M 3LE9FWXqPuX0IaS/GuFJWQVkzO3gnrirjw+EE515ERWz/vL6cAlgfH567ALwa6SqICar ZpLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vP5kuX7mZVTY/pG9uRbevQGaPtcr9mHVd+pjSpNXL94=; b=mJ1tN/b7B3BM3/PPrXS0QjT+WzXEIZ7XIgl1gnl8Ni6CqfpWaRw/X+9neET7AcDQJx +gubXBVQf2pE2MbkRfLNZdABcxRRwTe+s83oBBH4e9Yrq2WYmFumnlU7uSPqsj8O4QnA omFH2b/H5Ey0wa4L8L3NmpEdmDDeGjby5H1bucIMSUDaK9sFd7t2BkFuU1htHtrclrRf EyfzQPYnRTqMzRbb1fiauJkKVhDtQiQm+2slRpUdKbIG2rmxNGMk1zAxnruCCxkmHcsz QK49gDtLFLenoEGolJT9ZxCK5Q0UnAXfY5fTRZqzfyoEuXrKer+atqKkjHE6Ewqo2WwA MwgA== X-Gm-Message-State: AOAM5331RqdjvqGYoL8HQuQTv50dn1lvdA/TaCi1IE7mOo5qM0PrLUwp Snx6+mA9swxRDw5yXZC2S4o= X-Google-Smtp-Source: ABdhPJx1n+R8gQTLLjIaw52xff0S4ibZRe+lhiFwWj5UcxN2inDx4p8QJV2tfrfj1P2oCab6OUaLvQ== X-Received: by 2002:a67:c305:: with SMTP id r5mr2674702vsj.83.1642801155076; Fri, 21 Jan 2022 13:39:15 -0800 (PST) Received: from localhost.localdomain ([2804:431:c7f4:2d80:9427:7267:dbaf:8ccf]) by smtp.googlemail.com with ESMTPSA id 29sm1633844vki.25.2022.01.21.13.39.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 13:39:14 -0800 (PST) From: Igor Torrente To: rodrigosiqueiramelo@gmail.com, melissa.srw@gmail.com, ppaalanen@gmail.com, tzimmermann@suse.de Subject: [PATCH v4 5/9] drm: vkms: Add fb information to `vkms_writeback_job` Date: Fri, 21 Jan 2022 18:38:27 -0300 Message-Id: <20220121213831.47229-6-igormtorrente@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220121213831.47229-1-igormtorrente@gmail.com> References: <20220121213831.47229-1-igormtorrente@gmail.com> MIME-Version: 1.0 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: hamohammed.sa@gmail.com, airlied@linux.ie, dri-devel@lists.freedesktop.org, ~lkcamp/patches@lists.sr.ht, Igor Torrente Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This commit is the groundwork to introduce new formats to the planes and writeback buffer. As part of it, a new buffer metadata field is added to `vkms_writeback_job`, this metadata is represented by the `vkms_composer` struct. This will allow us, in the future, to have different compositing and wb format types. Signed-off-by: Igor Torrente Reviewed-by: Melissa Wen --- V2: Change the code to get the drm_framebuffer reference and not copy its contents(Thomas Zimmermann). V3: Drop the refcount in the wb code(Thomas Zimmermann). --- drivers/gpu/drm/vkms/vkms_composer.c | 4 ++-- drivers/gpu/drm/vkms/vkms_drv.h | 12 ++++++------ drivers/gpu/drm/vkms/vkms_plane.c | 10 +++++----- drivers/gpu/drm/vkms/vkms_writeback.c | 20 +++++++++++++++++--- 4 files changed, 30 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c index 2d946368a561..95029d2ebcac 100644 --- a/drivers/gpu/drm/vkms/vkms_composer.c +++ b/drivers/gpu/drm/vkms/vkms_composer.c @@ -153,7 +153,7 @@ static void compose_plane(struct vkms_frame_info *primary_plane_info, struct vkms_frame_info *plane_frame_info, void *vaddr_out) { - struct drm_framebuffer *fb = &plane_frame_info->fb; + struct drm_framebuffer *fb = plane_frame_info->fb; void *vaddr; void (*pixel_blend)(const u8 *p_src, u8 *p_dst); @@ -175,7 +175,7 @@ static int compose_active_planes(void **vaddr_out, struct vkms_frame_info *primary_plane_info, struct vkms_crtc_state *crtc_state) { - struct drm_framebuffer *fb = &primary_plane_info->fb; + struct drm_framebuffer *fb = primary_plane_info->fb; struct drm_gem_object *gem_obj = drm_gem_fb_get_obj(fb, 0); const void *vaddr; int i; diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h index 2e6342164bef..c850d755247c 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -22,13 +22,8 @@ #define NUM_OVERLAY_PLANES 8 -struct vkms_writeback_job { - struct dma_buf_map map[DRM_FORMAT_MAX_PLANES]; - struct dma_buf_map data[DRM_FORMAT_MAX_PLANES]; -}; - struct vkms_frame_info { - struct drm_framebuffer fb; + struct drm_framebuffer *fb; struct drm_rect src, dst; struct dma_buf_map map[DRM_FORMAT_MAX_PLANES]; unsigned int offset; @@ -36,6 +31,11 @@ struct vkms_frame_info { unsigned int cpp; }; +struct vkms_writeback_job { + struct dma_buf_map data[DRM_FORMAT_MAX_PLANES]; + struct vkms_frame_info frame_info; +}; + /** * vkms_plane_state - Driver specific plane state * @base: base plane state diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_plane.c index a56b0f76eddd..28752af0118c 100644 --- a/drivers/gpu/drm/vkms/vkms_plane.c +++ b/drivers/gpu/drm/vkms/vkms_plane.c @@ -50,12 +50,12 @@ static void vkms_plane_destroy_state(struct drm_plane *plane, struct vkms_plane_state *vkms_state = to_vkms_plane_state(old_state); struct drm_crtc *crtc = vkms_state->base.base.crtc; - if (crtc) { + if (crtc && vkms_state->frame_info->fb) { /* dropping the reference we acquired in * vkms_primary_plane_update() */ - if (drm_framebuffer_read_refcount(&vkms_state->frame_info->fb)) - drm_framebuffer_put(&vkms_state->frame_info->fb); + if (drm_framebuffer_read_refcount(vkms_state->frame_info->fb)) + drm_framebuffer_put(vkms_state->frame_info->fb); } kfree(vkms_state->frame_info); @@ -110,9 +110,9 @@ static void vkms_plane_atomic_update(struct drm_plane *plane, frame_info = vkms_plane_state->frame_info; memcpy(&frame_info->src, &new_state->src, sizeof(struct drm_rect)); memcpy(&frame_info->dst, &new_state->dst, sizeof(struct drm_rect)); - memcpy(&frame_info->fb, fb, sizeof(struct drm_framebuffer)); + frame_info->fb = fb; memcpy(&frame_info->map, &shadow_plane_state->data, sizeof(frame_info->map)); - drm_framebuffer_get(&frame_info->fb); + drm_framebuffer_get(frame_info->fb); frame_info->offset = fb->offsets[0]; frame_info->pitch = fb->pitches[0]; frame_info->cpp = fb->format->cpp[0]; diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/vkms_writeback.c index 8694227f555f..de379331b236 100644 --- a/drivers/gpu/drm/vkms/vkms_writeback.c +++ b/drivers/gpu/drm/vkms/vkms_writeback.c @@ -75,12 +75,15 @@ static int vkms_wb_prepare_job(struct drm_writeback_connector *wb_connector, if (!vkmsjob) return -ENOMEM; - ret = drm_gem_fb_vmap(job->fb, vkmsjob->map, vkmsjob->data); + ret = drm_gem_fb_vmap(job->fb, vkmsjob->frame_info.map, vkmsjob->data); if (ret) { DRM_ERROR("vmap failed: %d\n", ret); goto err_kfree; } + vkmsjob->frame_info.fb = job->fb; + drm_framebuffer_get(vkmsjob->frame_info.fb); + job->priv = vkmsjob; return 0; @@ -99,7 +102,9 @@ static void vkms_wb_cleanup_job(struct drm_writeback_connector *connector, if (!job->fb) return; - drm_gem_fb_vunmap(job->fb, vkmsjob->map); + drm_gem_fb_vunmap(job->fb, vkmsjob->frame_info.map); + + drm_framebuffer_put(vkmsjob->frame_info.fb); vkmsdev = drm_device_to_vkms_device(job->fb->dev); vkms_set_composer(&vkmsdev->output, false); @@ -116,14 +121,23 @@ static void vkms_wb_atomic_commit(struct drm_connector *conn, struct drm_writeback_connector *wb_conn = &output->wb_connector; struct drm_connector_state *conn_state = wb_conn->base.state; struct vkms_crtc_state *crtc_state = output->composer_state; + struct drm_framebuffer *fb = connector_state->writeback_job->fb; + struct vkms_writeback_job *active_wb; + struct vkms_frame_info *wb_frame_info; if (!conn_state) return; vkms_set_composer(&vkmsdev->output, true); + active_wb = conn_state->writeback_job->priv; + wb_frame_info = &active_wb->frame_info; + spin_lock_irq(&output->composer_lock); - crtc_state->active_writeback = conn_state->writeback_job->priv; + crtc_state->active_writeback = active_wb; + wb_frame_info->offset = fb->offsets[0]; + wb_frame_info->pitch = fb->pitches[0]; + wb_frame_info->cpp = fb->format->cpp[0]; crtc_state->wb_pending = true; spin_unlock_irq(&output->composer_lock); drm_writeback_queue_job(wb_conn, connector_state); From patchwork Fri Jan 21 21:38:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Matheus Andrade Torrente X-Patchwork-Id: 12720311 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 8EF20C433FE for ; Fri, 21 Jan 2022 21:39:25 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B755B10E469; Fri, 21 Jan 2022 21:39:22 +0000 (UTC) Received: from mail-ua1-x932.google.com (mail-ua1-x932.google.com [IPv6:2607:f8b0:4864:20::932]) by gabe.freedesktop.org (Postfix) with ESMTPS id 77FBF10E465 for ; Fri, 21 Jan 2022 21:39:18 +0000 (UTC) Received: by mail-ua1-x932.google.com with SMTP id y4so19308597uad.1 for ; Fri, 21 Jan 2022 13:39:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SQcpHZmaJt1czigYjiMAKZUcGqofvOPOM7GXfzCxagM=; b=cdkSE1suaC2oHhSzhHi0Jg1Vcp0wQL84IFUFQywG65DB7nNkP+Mel0kSQHITA0vEjP 6dF/g1SIdqrxtC1YNkOQfdWJ9tjVoMwm8UfWl3P+f2vQfPhdxWg8N1hcsWkOQsnXCvLo ISWUw4unzUBVRePbTZ0LgPm9YPEl69tkpLx+a6DwDVViKNqLpIhlh1a9JOzk8cE1ZfTf 8VGLDqTVqqm6xMfuj/9e2lN7PhrWMGmlHOMXs+v5M+6VT0f5W2da2NF7vVdVdoUpQShV AKxxFclTw0okTAbo7wa06Qa2lhmscLJ++a+wEKqxQj9xGKUqbona/9h46ul6i3YnVnk9 7a5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SQcpHZmaJt1czigYjiMAKZUcGqofvOPOM7GXfzCxagM=; b=tR9/RGMR1Bk6eUPDXTpIs+NTVQrzx0zbrXse6F6DagViKsfrbvt47JVySEujrYQeBW y+KM3Y1kgDmSu7aSDkN+jWaAMMzo+PSHOePalI2gclgm7w7IdHbbaL2pymoBKdYZGtaU q3kKk668FjRj34FSZDbEDs7HnepC3XIeKPRXuiCtegLhL/NdtNtBeQIIcMa5W0XgBapp ftzghUivKJbFQvtfh2ylYvwm2rFftXTrebv9qlEPKBX58Dje/oIHw8mxVh3jaPtXVKg5 yAk6csOZlTZRwlGjqmWIKpRJdsSE8vRT98FmlUQhQmNHduf1KIiZk+gkBcohF7aYUtiu JvoA== X-Gm-Message-State: AOAM5316VBUiHSQc7uNWlHExHyrmDSQiy4fuAZMngNfx3lRLEgqRl6nf jBp4AY39fskgKJ07nD17I44= X-Google-Smtp-Source: ABdhPJwNOvs/iSlmdQghhbb4PZev2uKvSZGPGHW6IpzVYb2jQ86BU3nJ3k6Dh/yEArMXUFz7QlVOWQ== X-Received: by 2002:a05:6102:b02:: with SMTP id b2mr2622760vst.52.1642801157606; Fri, 21 Jan 2022 13:39:17 -0800 (PST) Received: from localhost.localdomain ([2804:431:c7f4:2d80:9427:7267:dbaf:8ccf]) by smtp.googlemail.com with ESMTPSA id 29sm1633844vki.25.2022.01.21.13.39.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 13:39:17 -0800 (PST) From: Igor Torrente To: rodrigosiqueiramelo@gmail.com, melissa.srw@gmail.com, ppaalanen@gmail.com, tzimmermann@suse.de Subject: [PATCH v4 6/9] drm: drm_atomic_helper: Add a new helper to deal with the writeback connector validation Date: Fri, 21 Jan 2022 18:38:28 -0300 Message-Id: <20220121213831.47229-7-igormtorrente@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220121213831.47229-1-igormtorrente@gmail.com> References: <20220121213831.47229-1-igormtorrente@gmail.com> MIME-Version: 1.0 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: hamohammed.sa@gmail.com, airlied@linux.ie, dri-devel@lists.freedesktop.org, ~lkcamp/patches@lists.sr.ht, Igor Torrente Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Add a helper function to validate the connector configuration receive in the encoder atomic_check by the drivers. So the drivers don't need do these common validations themselves. Signed-off-by: Igor Torrente --- V2: Move the format verification to a new helper at the drm_atomic_helper.c (Thomas Zimmermann). V3: Format check improvements (Leandro Ribeiro). Minor improvements(Thomas Zimmermann). --- drivers/gpu/drm/drm_atomic_helper.c | 39 +++++++++++++++++++++++++++ drivers/gpu/drm/vkms/vkms_writeback.c | 9 +++---- include/drm/drm_atomic_helper.h | 3 +++ 3 files changed, 46 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index a7a05e1e26bb..ccb6e62bf80a 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -776,6 +776,45 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, } EXPORT_SYMBOL(drm_atomic_helper_check_modeset); +/** + * drm_atomic_helper_check_wb_connector_state() - Check writeback encoder state + * @encoder: encoder state to check + * @conn_state: connector state to check + * + * Checks if the writeback connector state is valid, and returns an error if it + * isn't. + * + * RETURNS: + * Zero for success or -errno + */ +int +drm_atomic_helper_check_wb_encoder_state(struct drm_encoder *encoder, + struct drm_connector_state *conn_state) +{ + struct drm_writeback_job *wb_job = conn_state->writeback_job; + struct drm_property_blob *pixel_format_blob; + struct drm_framebuffer *fb; + size_t i, nformats; + u32 *formats; + + if (!wb_job || !wb_job->fb) + return 0; + + pixel_format_blob = wb_job->connector->pixel_formats_blob_ptr; + nformats = pixel_format_blob->length / sizeof(u32); + formats = pixel_format_blob->data; + fb = wb_job->fb; + + for (i = 0; i < nformats; i++) + if (fb->format->format == formats[i]) + return 0; + + drm_dbg_kms(encoder->dev, "Invalid pixel format %p4cc\n", &fb->format->format); + + return -EINVAL; +} +EXPORT_SYMBOL(drm_atomic_helper_check_wb_encoder_state); + /** * drm_atomic_helper_check_plane_state() - Check plane state for validity * @plane_state: plane state to check diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/vkms_writeback.c index de379331b236..ad4bb1fb37ca 100644 --- a/drivers/gpu/drm/vkms/vkms_writeback.c +++ b/drivers/gpu/drm/vkms/vkms_writeback.c @@ -30,6 +30,7 @@ static int vkms_wb_encoder_atomic_check(struct drm_encoder *encoder, { struct drm_framebuffer *fb; const struct drm_display_mode *mode = &crtc_state->mode; + int ret; if (!conn_state->writeback_job || !conn_state->writeback_job->fb) return 0; @@ -41,11 +42,9 @@ static int vkms_wb_encoder_atomic_check(struct drm_encoder *encoder, return -EINVAL; } - if (fb->format->format != vkms_wb_formats[0]) { - DRM_DEBUG_KMS("Invalid pixel format %p4cc\n", - &fb->format->format); - return -EINVAL; - } + ret = drm_atomic_helper_check_wb_encoder_state(encoder, conn_state); + if (ret < 0) + return ret; return 0; } diff --git a/include/drm/drm_atomic_helper.h b/include/drm/drm_atomic_helper.h index 4045e2507e11..3fbf695da60f 100644 --- a/include/drm/drm_atomic_helper.h +++ b/include/drm/drm_atomic_helper.h @@ -40,6 +40,9 @@ struct drm_private_state; int drm_atomic_helper_check_modeset(struct drm_device *dev, struct drm_atomic_state *state); +int +drm_atomic_helper_check_wb_encoder_state(struct drm_encoder *encoder, + struct drm_connector_state *conn_state); int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state, const struct drm_crtc_state *crtc_state, int min_scale, From patchwork Fri Jan 21 21:38:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Matheus Andrade Torrente X-Patchwork-Id: 12720310 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 E323BC43217 for ; Fri, 21 Jan 2022 21:39:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C252C10E471; Fri, 21 Jan 2022 21:39:22 +0000 (UTC) Received: from mail-ua1-x92d.google.com (mail-ua1-x92d.google.com [IPv6:2607:f8b0:4864:20::92d]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6072C10E469 for ; Fri, 21 Jan 2022 21:39:21 +0000 (UTC) Received: by mail-ua1-x92d.google.com with SMTP id l1so17403095uap.8 for ; Fri, 21 Jan 2022 13:39:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=d2v0L8VQ942jiJiIpwbrk4LLnTqcDXRGJH/mWw9tR4Q=; b=bPTi2JykklrWdc73gQ1kgIzKy1oWRQBa7B0giVz4xG1f6oNyU3UaugwSNIltHKKZNR lYljIl05AfY5V9pPOW+69/0QrGn/ZVCpV9Q2e+zlPNkTYcr9hsQjmogDqte+Td4K7YIV RFfjqOsdlNs+iymCLiL6l5ogHPvB2XiRBWZE3A4TMy3HT0LHCoeJWFCo1B6li0Zz3YqL EOJLHDMXdkZw+3EDrJF/tBQG5zjm/hxU9C3wpy2RXhI8nNqWs01QEk4BHkoXAJL9QRqO 1zbu5ldX0uhe4JwgWN6V3SvxYEW5NIs6x/zbcInVvQFFAq1f6VHKl8YFRAlcGYkQQ4DP ubuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=d2v0L8VQ942jiJiIpwbrk4LLnTqcDXRGJH/mWw9tR4Q=; b=gvwzl0fPYW2P68zNiWd0FT1+rwlQlY4Qe4+sJDU9Efsu8YPKokUWu/W4CMQHiWhgDo 4yZVwql82dTUFBL5V3RtzRO9uBGCyG2/u456elqBp079OHJ0gopEm2PhaAvDFFvTiQYZ zOaq+dY1Son3HN0Fmc1aHdXWNqtbjStOWjKyXLHqxd3hCWjpToihVa2wLxKbIY52ldgd tzX6M1DCblPRi+O1A7j3eEyWh7rTv4HtVKbkNBvWi51bSorXjNtTK2oSF1J2m67sZfb9 6UavKFzeRkGXfwXIjqFk0tbSnz8XymuR5oRl9SRHwK7rxgUC89rD4VdjBTYVYQhzOJnx lFuQ== X-Gm-Message-State: AOAM530bVZvUSoI4rNR706lKQGkSHYf5w72P6tjAwRI/E/I2oYufhzmA kZ4HyeZXgg9/iiUhbfUUl2g= X-Google-Smtp-Source: ABdhPJxodpTbisddHjjMsJksDKkSkRE8adzemEnUG8+ZJTOQ5xO98tk/kJVfZSDzVFbwdVeXhPOHEQ== X-Received: by 2002:a67:24c3:: with SMTP id k186mr2670916vsk.74.1642801160319; Fri, 21 Jan 2022 13:39:20 -0800 (PST) Received: from localhost.localdomain ([2804:431:c7f4:2d80:9427:7267:dbaf:8ccf]) by smtp.googlemail.com with ESMTPSA id 29sm1633844vki.25.2022.01.21.13.39.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 13:39:20 -0800 (PST) From: Igor Torrente To: rodrigosiqueiramelo@gmail.com, melissa.srw@gmail.com, ppaalanen@gmail.com, tzimmermann@suse.de Subject: [PATCH v4 7/9] drm: vkms: Refactor the plane composer to accept new formats Date: Fri, 21 Jan 2022 18:38:29 -0300 Message-Id: <20220121213831.47229-8-igormtorrente@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220121213831.47229-1-igormtorrente@gmail.com> References: <20220121213831.47229-1-igormtorrente@gmail.com> MIME-Version: 1.0 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: hamohammed.sa@gmail.com, kernel test robot , airlied@linux.ie, dri-devel@lists.freedesktop.org, ~lkcamp/patches@lists.sr.ht, Igor Torrente Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Currently the blend function only accepts XRGB_8888 and ARGB_8888 as a color input. This patch refactors all the functions related to the plane composition to overcome this limitation. A new internal format(`struct pixel`) is introduced to deal with all possible inputs. It consists of 16 bits fields that represent each of the channels. The pixels blend is done using this internal format. And new handlers are being added to convert a specific format to/from this internal format. So the blend operation depends on these handlers to convert to this common format. The blended result, if necessary, is converted to the writeback buffer format. This patch introduces three major differences to the blend function. 1 - All the planes are blended at once. 2 - The blend calculus is done as per line instead of per pixel. 3 - It is responsible to calculates the CRC and writing the writeback buffer(if necessary). These changes allow us to allocate way less memory in the intermediate buffer to compute these operations. Because now we don't need to have the entire intermediate image lines at once, just one line is enough. | Memory consumption (output dimensions) | |:--------------------------------------:| | Current | This patch | |:------------------:|:-----------------:| | Width * Heigth | 2 * Width | Beyond memory, we also have a minor performance benefit from all these changes. Results running the IGT tests `*kms_cursor_crc*`: | Frametime | |:------------------------------------------:| | Implementation | Current | This commit | |:---------------:|:---------:|:------------:| | frametime range | 8~22 ms | 5~18 ms | | Average | 10.0 ms | 7.3 ms | Reported-by: kernel test robot Signed-off-by: Igor Torrente --- V2: Improves the performance drastically, by perfoming the operations per-line and not per-pixel(Pekka Paalanen). Minor improvements(Pekka Paalanen). V3: Changes the code to blend the planes all at once. This improves performance, memory consumption, and removes much of the weirdness of the V2(Pekka Paalanen and me). Minor improvements(Pekka Paalanen and me). V4: Rebase the code and adapt it to the new NUM_OVERLAY_PLANES constant. --- drivers/gpu/drm/vkms/Makefile | 1 + drivers/gpu/drm/vkms/vkms_composer.c | 335 +++++++++++++-------------- drivers/gpu/drm/vkms/vkms_formats.c | 138 +++++++++++ drivers/gpu/drm/vkms/vkms_formats.h | 31 +++ 4 files changed, 333 insertions(+), 172 deletions(-) create mode 100644 drivers/gpu/drm/vkms/vkms_formats.c create mode 100644 drivers/gpu/drm/vkms/vkms_formats.h diff --git a/drivers/gpu/drm/vkms/Makefile b/drivers/gpu/drm/vkms/Makefile index 72f779cbfedd..1b28a6a32948 100644 --- a/drivers/gpu/drm/vkms/Makefile +++ b/drivers/gpu/drm/vkms/Makefile @@ -3,6 +3,7 @@ vkms-y := \ vkms_drv.o \ vkms_plane.o \ vkms_output.o \ + vkms_formats.o \ vkms_crtc.o \ vkms_composer.o \ vkms_writeback.o diff --git a/drivers/gpu/drm/vkms/vkms_composer.c b/drivers/gpu/drm/vkms/vkms_composer.c index 95029d2ebcac..9f70fcf84fb9 100644 --- a/drivers/gpu/drm/vkms/vkms_composer.c +++ b/drivers/gpu/drm/vkms/vkms_composer.c @@ -9,202 +9,210 @@ #include #include "vkms_drv.h" +#include "vkms_formats.h" -static u32 get_pixel_from_buffer(int x, int y, const u8 *buffer, - const struct vkms_frame_info *frame_info) +static u16 pre_mul_blend_channel(u16 src, u16 dst, u16 alpha) { - u32 pixel; - int src_offset = frame_info->offset + (y * frame_info->pitch) - + (x * frame_info->cpp); + u32 new_color; - pixel = *(u32 *)&buffer[src_offset]; + new_color = (src * 0xffff + dst * (0xffff - alpha)); - return pixel; + return DIV_ROUND_UP(new_color, 0xffff); } /** - * compute_crc - Compute CRC value on output frame + * pre_mul_alpha_blend - alpha blending equation + * @src_frame_info: source framebuffer's metadata + * @stage_buffer: The line with the pixels from src_plane + * @output_buffer: A line buffer that receives all the blends output * - * @vaddr: address to final framebuffer - * @frame_info: framebuffer's metadata + * Using the information from the `frame_info`, this blends only the + * necessary pixels from the `stage_buffer` to the `output_buffer` + * using premultiplied blend formula. * - * returns CRC value computed using crc32 on the visible portion of - * the final framebuffer at vaddr_out + * The current DRM assumption is that pixel color values have been already + * pre-multiplied with the alpha channel values. See more + * drm_plane_create_blend_mode_property(). Also, this formula assumes a + * completely opaque background. */ -static uint32_t compute_crc(const u8 *vaddr, - const struct vkms_frame_info *frame_info) +static void pre_mul_alpha_blend(struct vkms_frame_info *frame_info, + struct line_buffer *stage_buffer, + struct line_buffer *output_buffer) { - int x, y; - u32 crc = 0, pixel = 0; - int x_src = frame_info->src.x1 >> 16; - int y_src = frame_info->src.y1 >> 16; - int h_src = drm_rect_height(&frame_info->src) >> 16; - int w_src = drm_rect_width(&frame_info->src) >> 16; - - for (y = y_src; y < y_src + h_src; ++y) { - for (x = x_src; x < x_src + w_src; ++x) { - pixel = get_pixel_from_buffer(x, y, vaddr, frame_info); - crc = crc32_le(crc, (void *)&pixel, sizeof(u32)); - } + int x, x_dst = frame_info->dst.x1; + int x_limit = drm_rect_width(&frame_info->dst); + struct line_buffer *out = output_buffer + x_dst; + struct line_buffer *in = stage_buffer; + + for (x = 0; x < x_limit; x++) { + out[x].a = (u16)0xffff; + out[x].r = pre_mul_blend_channel(in[x].r, out[x].r, in[x].a); + out[x].g = pre_mul_blend_channel(in[x].g, out[x].g, in[x].a); + out[x].b = pre_mul_blend_channel(in[x].b, out[x].b, in[x].a); } - - return crc; } -static u8 blend_channel(u8 src, u8 dst, u8 alpha) +static bool check_y_limit(struct vkms_frame_info *frame_info, int y) { - u32 pre_blend; - u8 new_color; - - pre_blend = (src * 255 + dst * (255 - alpha)); - - /* Faster div by 255 */ - new_color = ((pre_blend + ((pre_blend + 257) >> 8)) >> 8); + if (y >= frame_info->dst.y1 && y < frame_info->dst.y2) + return true; - return new_color; + return false; } /** - * alpha_blend - alpha blending equation - * @argb_src: src pixel on premultiplied alpha mode - * @argb_dst: dst pixel completely opaque - * - * blend pixels using premultiplied blend formula. The current DRM assumption - * is that pixel color values have been already pre-multiplied with the alpha - * channel values. See more drm_plane_create_blend_mode_property(). Also, this - * formula assumes a completely opaque background. - */ -static void alpha_blend(const u8 *argb_src, u8 *argb_dst) -{ - u8 alpha; - - alpha = argb_src[3]; - argb_dst[0] = blend_channel(argb_src[0], argb_dst[0], alpha); - argb_dst[1] = blend_channel(argb_src[1], argb_dst[1], alpha); - argb_dst[2] = blend_channel(argb_src[2], argb_dst[2], alpha); -} - -/** - * x_blend - blending equation that ignores the pixel alpha - * - * overwrites RGB color value from src pixel to dst pixel. - */ -static void x_blend(const u8 *xrgb_src, u8 *xrgb_dst) -{ - memcpy(xrgb_dst, xrgb_src, sizeof(u8) * 3); -} - -/** - * blend - blend value at vaddr_src with value at vaddr_dst - * @vaddr_dst: destination address - * @vaddr_src: source address - * @dst_frame_info: destination framebuffer's metadata - * @src_frame_info: source framebuffer's metadata - * @pixel_blend: blending equation based on plane format + * @wb_frame_info: The writeback frame buffer metadata + * @wb_fmt_func: The format tranformatio function to the wb buffer + * @crtc_state: The crtc state + * @plane_fmt_func: A format tranformation function to each plane + * @crc32: The crc output of the final frame + * @output_buffer: A buffer of a row that will receive the result of the blend(s) + * @stage_buffer: The line with the pixels from src_compositor * - * Blend the vaddr_src value with the vaddr_dst value using a pixel blend - * equation according to the supported plane formats DRM_FORMAT_(A/XRGB8888) - * and clearing alpha channel to an completely opaque background. This function - * uses buffer's metadata to locate the new composite values at vaddr_dst. + * This function blends the pixels (Using the `pre_mul_alpha_blend`) + * from all planes, calculates the crc32 of the output from the former step, + * and, if necessary, convert and store the output to the writeback buffer. * * TODO: completely clear the primary plane (a = 0xff) before starting to blend * pixel color values */ -static void blend(void *vaddr_dst, void *vaddr_src, - struct vkms_frame_info *dst_frame_info, - struct vkms_frame_info *src_frame_info, - void (*pixel_blend)(const u8 *, u8 *)) +static void blend(struct vkms_frame_info *wb_frame_info, + format_transform_func wb_fmt_func, + struct vkms_crtc_state *crtc_state, + format_transform_func *plane_fmt_func, + u32 *crc32, struct line_buffer *stage_buffer, + struct line_buffer *output_buffer, s64 row_size) { - int i, j, j_dst, i_dst; - int offset_src, offset_dst; - u8 *pixel_dst, *pixel_src; - - int x_src = src_frame_info->src.x1 >> 16; - int y_src = src_frame_info->src.y1 >> 16; - - int x_dst = src_frame_info->dst.x1; - int y_dst = src_frame_info->dst.y1; - int h_dst = drm_rect_height(&src_frame_info->dst); - int w_dst = drm_rect_width(&src_frame_info->dst); + struct vkms_plane_state **plane = crtc_state->active_planes; + struct vkms_frame_info *primary_plane_info = plane[0]->frame_info; + u32 n_active_planes = crtc_state->num_active_planes; + int y_src = primary_plane_info->dst.y1; + int h_dst = drm_rect_height(&primary_plane_info->dst); int y_limit = y_src + h_dst; - int x_limit = x_src + w_dst; - - for (i = y_src, i_dst = y_dst; i < y_limit; ++i) { - for (j = x_src, j_dst = x_dst; j < x_limit; ++j) { - offset_dst = dst_frame_info->offset - + (i_dst * dst_frame_info->pitch) - + (j_dst++ * dst_frame_info->cpp); - offset_src = src_frame_info->offset - + (i * src_frame_info->pitch) - + (j * src_frame_info->cpp); - - pixel_src = (u8 *)(vaddr_src + offset_src); - pixel_dst = (u8 *)(vaddr_dst + offset_dst); - pixel_blend(pixel_src, pixel_dst); - /* clearing alpha channel (0xff)*/ - pixel_dst[3] = 0xff; + int y, i; + + for (y = y_src; y < y_limit; y++) { + plane_fmt_func[0](primary_plane_info, y, output_buffer); + + /* If there are other planes besides primary, we consider the active + * planes should be in z-order and compose them associatively: + * ((primary <- overlay) <- cursor) + */ + for (i = 1; i < n_active_planes; i++) { + if (!check_y_limit(plane[i]->frame_info, y)) + continue; + + plane_fmt_func[i](plane[i]->frame_info, y, stage_buffer); + pre_mul_alpha_blend(plane[i]->frame_info, stage_buffer, + output_buffer); } - i_dst++; + + *crc32 = crc32_le(*crc32, (void *)output_buffer, row_size); + + if (wb_frame_info) + wb_fmt_func(wb_frame_info, y, output_buffer); } } -static void compose_plane(struct vkms_frame_info *primary_plane_info, - struct vkms_frame_info *plane_frame_info, - void *vaddr_out) +static void get_format_transform_functions(struct vkms_crtc_state *crtc_state, + format_transform_func plane_funcs[]) { - struct drm_framebuffer *fb = plane_frame_info->fb; - void *vaddr; - void (*pixel_blend)(const u8 *p_src, u8 *p_dst); + struct vkms_plane_state **active_planes = crtc_state->active_planes; + u32 n_active_planes = crtc_state->num_active_planes, s_fmt; + int i; - if (WARN_ON(dma_buf_map_is_null(&primary_plane_info->map[0]))) - return; + for (i = 0; i < n_active_planes; i++) { + s_fmt = active_planes[i]->frame_info->fb->format->format; + plane_funcs[i] = get_fmt_transform_function(s_fmt); + } +} - vaddr = plane_frame_info->map[0].vaddr; +static bool check_planes_x_bounds(struct vkms_crtc_state *crtc_state, + struct vkms_frame_info *wb_frame_info) +{ + struct vkms_plane_state **planes = crtc_state->active_planes; + struct vkms_frame_info *primary_plane_info = planes[0]->frame_info; + int line_width = drm_rect_width(&primary_plane_info->dst); + u32 n_active_planes = crtc_state->num_active_planes; + int i; - if (fb->format->format == DRM_FORMAT_ARGB8888) - pixel_blend = &alpha_blend; - else - pixel_blend = &x_blend; + for (i = 0; i < n_active_planes; i++) { + int x_dst = planes[i]->frame_info->dst.x1; + int x_src = planes[i]->frame_info->src.x1 >> 16; + int x2_src = planes[i]->frame_info->src.x2 >> 16; + int x_limit = drm_rect_width(&planes[i]->frame_info->dst); - blend(vaddr_out, vaddr, primary_plane_info, - plane_frame_info, pixel_blend); + if (x_dst + x_limit > line_width) + return false; + if (x_src + x_limit > x2_src) + return false; + } + + return true; } -static int compose_active_planes(void **vaddr_out, - struct vkms_frame_info *primary_plane_info, - struct vkms_crtc_state *crtc_state) +static int compose_active_planes(struct vkms_frame_info *wb_frame_info, + struct vkms_crtc_state *crtc_state, + u32 *crc32) { - struct drm_framebuffer *fb = primary_plane_info->fb; - struct drm_gem_object *gem_obj = drm_gem_fb_get_obj(fb, 0); - const void *vaddr; - int i; + format_transform_func plane_funcs[NUM_OVERLAY_PLANES], wb_func = NULL; + int line_width, ret = 0, pixel_size = sizeof(struct line_buffer); + struct vkms_frame_info *primary_plane_info = NULL; + struct line_buffer *output_buffer, *stage_buffer; + struct vkms_plane_state *act_plane = NULL; + u32 wb_format; - if (!*vaddr_out) { - *vaddr_out = kvzalloc(gem_obj->size, GFP_KERNEL); - if (!*vaddr_out) { - DRM_ERROR("Cannot allocate memory for output frame."); - return -ENOMEM; - } + if (WARN_ON(pixel_size != 8)) + return -EINVAL; + + if (crtc_state->num_active_planes >= 1) { + act_plane = crtc_state->active_planes[0]; + if (act_plane->base.base.plane->type == DRM_PLANE_TYPE_PRIMARY) + primary_plane_info = act_plane->frame_info; } + if (!primary_plane_info) + return -EINVAL; + if (WARN_ON(dma_buf_map_is_null(&primary_plane_info->map[0]))) return -EINVAL; - vaddr = primary_plane_info->map[0].vaddr; + if (WARN_ON(!check_planes_x_bounds(crtc_state, wb_frame_info))) + return -EINVAL; - memcpy(*vaddr_out, vaddr, gem_obj->size); + line_width = drm_rect_width(&primary_plane_info->dst); - /* If there are other planes besides primary, we consider the active - * planes should be in z-order and compose them associatively: - * ((primary <- overlay) <- cursor) - */ - for (i = 1; i < crtc_state->num_active_planes; i++) - compose_plane(primary_plane_info, - crtc_state->active_planes[i]->frame_info, - *vaddr_out); + stage_buffer = kvmalloc(line_width * pixel_size, GFP_KERNEL); + if (!stage_buffer) { + DRM_ERROR("Cannot allocate memory for the output line buffer"); + return -ENOMEM; + } - return 0; + output_buffer = kvmalloc(line_width * pixel_size, GFP_KERNEL); + if (!output_buffer) { + DRM_ERROR("Cannot allocate memory for intermediate line buffer"); + ret = -ENOMEM; + goto free_stage_buffer; + } + + get_format_transform_functions(crtc_state, plane_funcs); + + if (wb_frame_info) { + wb_format = wb_frame_info->fb->format->format; + wb_func = get_wb_fmt_transform_function(wb_format); + wb_frame_info->src = primary_plane_info->src; + wb_frame_info->dst = primary_plane_info->dst; + } + + blend(wb_frame_info, wb_func, crtc_state, plane_funcs, crc32, + stage_buffer, output_buffer, (s64)line_width * pixel_size); + + kvfree(output_buffer); +free_stage_buffer: + kvfree(stage_buffer); + + return ret; } /** @@ -222,13 +230,12 @@ void vkms_composer_worker(struct work_struct *work) struct vkms_crtc_state, composer_work); struct drm_crtc *crtc = crtc_state->base.crtc; + struct vkms_writeback_job *active_wb = crtc_state->active_writeback; + struct vkms_frame_info *wb_frame_info = &active_wb->frame_info; struct vkms_output *out = drm_crtc_to_vkms_output(crtc); - struct vkms_frame_info *primary_plane_info = NULL; - struct vkms_plane_state *act_plane = NULL; bool crc_pending, wb_pending; - void *vaddr_out = NULL; - u32 crc32 = 0; u64 frame_start, frame_end; + u32 crc32 = 0; int ret; spin_lock_irq(&out->composer_lock); @@ -248,35 +255,19 @@ void vkms_composer_worker(struct work_struct *work) if (!crc_pending) return; - if (crtc_state->num_active_planes >= 1) { - act_plane = crtc_state->active_planes[0]; - if (act_plane->base.base.plane->type == DRM_PLANE_TYPE_PRIMARY) - primary_plane_info = act_plane->frame_info; - } - - if (!primary_plane_info) - return; - if (wb_pending) - vaddr_out = crtc_state->active_writeback->data[0].vaddr; + ret = compose_active_planes(wb_frame_info, crtc_state, &crc32); + else + ret = compose_active_planes(NULL, crtc_state, &crc32); - ret = compose_active_planes(&vaddr_out, primary_plane_info, - crtc_state); - if (ret) { - if (ret == -EINVAL && !wb_pending) - kvfree(vaddr_out); + if (ret) return; - } - - crc32 = compute_crc(vaddr_out, primary_plane_info); if (wb_pending) { drm_writeback_signal_completion(&out->wb_connector, 0); spin_lock_irq(&out->composer_lock); crtc_state->wb_pending = false; spin_unlock_irq(&out->composer_lock); - } else { - kvfree(vaddr_out); } /* diff --git a/drivers/gpu/drm/vkms/vkms_formats.c b/drivers/gpu/drm/vkms/vkms_formats.c new file mode 100644 index 000000000000..0d1838d1b835 --- /dev/null +++ b/drivers/gpu/drm/vkms/vkms_formats.c @@ -0,0 +1,138 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ + +#include +#include "vkms_formats.h" + +format_transform_func get_fmt_transform_function(u32 format) +{ + if (format == DRM_FORMAT_ARGB8888) + return &ARGB8888_to_ARGB16161616; + else + return &XRGB8888_to_ARGB16161616; +} + +format_transform_func get_wb_fmt_transform_function(u32 format) +{ + if (format == DRM_FORMAT_ARGB8888) + return &convert_to_ARGB8888; + else + return &convert_to_XRGB8888; +} + +static int pixel_offset(struct vkms_frame_info *frame_info, int x, int y) +{ + return frame_info->offset + (y * frame_info->pitch) + + (x * frame_info->cpp); +} + +/* + * packed_pixels_addr - Get the pointer to pixel of a given pair of coordinates + * + * @frame_info: Buffer metadata + * @x: The x(width) coordinate of the 2D buffer + * @y: The y(Heigth) coordinate of the 2D buffer + * + * Takes the information stored in the frame_info, a pair of coordinates, and + * returns the address of the first color channel. + * This function assumes the channels are packed together, i.e. a color channel + * comes immediately after another in the memory. And therefore, this function + * doesn't work for YUV with chroma subsampling (e.g. YUV420 and NV21). + */ +static void *packed_pixels_addr(struct vkms_frame_info *frame_info, int x, int y) +{ + int offset = pixel_offset(frame_info, x, y); + + return (u8 *)frame_info->map[0].vaddr + offset; +} + +static void *get_packed_src_addr(struct vkms_frame_info *frame_info, int y) +{ + int x_src = frame_info->src.x1 >> 16; + int y_src = y - frame_info->dst.y1 + (frame_info->src.y1 >> 16); + + return packed_pixels_addr(frame_info, x_src, y_src); +} + +void ARGB8888_to_ARGB16161616(struct vkms_frame_info *frame_info, int y, + struct line_buffer *stage_buffer) +{ + u8 *src_pixels = get_packed_src_addr(frame_info, y); + int x, x_limit = drm_rect_width(&frame_info->dst); + + for (x = 0; x < x_limit; x++, src_pixels += 4) { + /* + * Organizes the channels in their respective positions and converts + * the 8 bits channel to 16. + * The 257 is the "conversion ratio". This number is obtained by the + * (2^16 - 1) / (2^8 - 1) division. Which, in this case, tries to get + * the best color value in a pixel format with more possibilities. + * And a similar idea applies to others RGB color conversions. + */ + stage_buffer[x].a = (u16)src_pixels[3] * 257; + stage_buffer[x].r = (u16)src_pixels[2] * 257; + stage_buffer[x].g = (u16)src_pixels[1] * 257; + stage_buffer[x].b = (u16)src_pixels[0] * 257; + } +} + +void XRGB8888_to_ARGB16161616(struct vkms_frame_info *frame_info, int y, + struct line_buffer *stage_buffer) +{ + u8 *src_pixels = get_packed_src_addr(frame_info, y); + int x, x_limit = drm_rect_width(&frame_info->dst); + + for (x = 0; x < x_limit; x++, src_pixels += 4) { + stage_buffer[x].a = (u16)0xffff; + stage_buffer[x].r = (u16)src_pixels[2] * 257; + stage_buffer[x].g = (u16)src_pixels[1] * 257; + stage_buffer[x].b = (u16)src_pixels[0] * 257; + } +} + +/* + * The following functions take an line of ARGB16161616 pixels from the + * src_buffer, convert them to a specific format, and store them in the + * destination. + * + * They are used in the `compose_active_planes` to convert and store a line + * from the src_buffer to the writeback buffer. + */ +void convert_to_ARGB8888(struct vkms_frame_info *frame_info, + int y, struct line_buffer *src_buffer) +{ + int x, x_dst = frame_info->dst.x1; + u8 *dst_pixels = packed_pixels_addr(frame_info, x_dst, y); + int x_limit = drm_rect_width(&frame_info->dst); + + for (x = 0; x < x_limit; x++, dst_pixels += 4) { + /* + * This sequence below is important because the format's byte order is + * in little-endian. In the case of the ARGB8888 the memory is + * organized this way: + * + * | Addr | = blue channel + * | Addr + 1 | = green channel + * | Addr + 2 | = Red channel + * | Addr + 3 | = Alpha channel + */ + dst_pixels[3] = DIV_ROUND_UP(src_buffer[x].a, 257); + dst_pixels[2] = DIV_ROUND_UP(src_buffer[x].r, 257); + dst_pixels[1] = DIV_ROUND_UP(src_buffer[x].g, 257); + dst_pixels[0] = DIV_ROUND_UP(src_buffer[x].b, 257); + } +} + +void convert_to_XRGB8888(struct vkms_frame_info *frame_info, + int y, struct line_buffer *src_buffer) +{ + int x, x_dst = frame_info->dst.x1; + u8 *dst_pixels = packed_pixels_addr(frame_info, x_dst, y); + int x_limit = drm_rect_width(&frame_info->dst); + + for (x = 0; x < x_limit; x++, dst_pixels += 4) { + dst_pixels[3] = (u8)0xff; + dst_pixels[2] = DIV_ROUND_UP(src_buffer[x].r, 257); + dst_pixels[1] = DIV_ROUND_UP(src_buffer[x].g, 257); + dst_pixels[0] = DIV_ROUND_UP(src_buffer[x].b, 257); + } +} diff --git a/drivers/gpu/drm/vkms/vkms_formats.h b/drivers/gpu/drm/vkms/vkms_formats.h new file mode 100644 index 000000000000..817e8b2124ae --- /dev/null +++ b/drivers/gpu/drm/vkms/vkms_formats.h @@ -0,0 +1,31 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ + +#ifndef _VKMS_FORMATS_H_ +#define _VKMS_FORMATS_H_ + +#include "vkms_drv.h" + +struct line_buffer { + u16 a, r, g, b; +}; + +void ARGB8888_to_ARGB16161616(struct vkms_frame_info *frame_info, int y, + struct line_buffer *stage_buffer); + +void XRGB8888_to_ARGB16161616(struct vkms_frame_info *frame_info, int y, + struct line_buffer *stage_buffer); + +void convert_to_ARGB8888(struct vkms_frame_info *frame_info, int y, + struct line_buffer *src_buffer); + +void convert_to_XRGB8888(struct vkms_frame_info *frame_info, int y, + struct line_buffer *src_buffer); + +typedef void (*format_transform_func)(struct vkms_frame_info *frame_info, int y, + struct line_buffer *buffer); + +format_transform_func get_fmt_transform_function(u32 format); + +format_transform_func get_wb_fmt_transform_function(u32 format); + +#endif /* _VKMS_FORMATS_H_ */ From patchwork Fri Jan 21 21:38:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Matheus Andrade Torrente X-Patchwork-Id: 12720313 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 AE714C433F5 for ; Fri, 21 Jan 2022 21:39:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8FD7610E49A; Fri, 21 Jan 2022 21:39:31 +0000 (UTC) Received: from mail-ua1-x932.google.com (mail-ua1-x932.google.com [IPv6:2607:f8b0:4864:20::932]) by gabe.freedesktop.org (Postfix) with ESMTPS id AB3FC10E497 for ; Fri, 21 Jan 2022 21:39:23 +0000 (UTC) Received: by mail-ua1-x932.google.com with SMTP id c36so19219731uae.13 for ; Fri, 21 Jan 2022 13:39:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=w6oRMdQdTTLRMg12EM+5r4h4w3Qz4g9vnYiSKn8PWiM=; b=khNbmuoHPhpMH/YN697MTKYbQfK7W25ceRWcwJUJf5KU86wxlg75WcYnnuR8nVZQZ2 m96wHyoyAM785LmOjzwiKEiqTzVPV6xHmZ1hS8EdTjz17VMQohQSW507yHiawbH0CDPq 1tz9+/H9Jq45wk43c+H8KKdBB/aZog4QnlGeBkETa3peUoCDl8Y1C7l2M+1JoIfeli2M FumRUz/6xnGGB+JQQ0p3gXLvWXyom7AUHO8WlzcBe0v7bhJlNjWPX172xwuAKaJ+UilC OTj5PDKYP5/FwndGQ/gX7wSICZ757p2FyM7yJGJ7Gtsd/OCN73epDNBZzDT/ag8HZdAs IP1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=w6oRMdQdTTLRMg12EM+5r4h4w3Qz4g9vnYiSKn8PWiM=; b=UrsV9Hh6SRdQEVa8jhM41HLwfO1vVuIf57BIh2pSrT8deHHckb5Qx1eYMUkl+z5GwL d3ENTSgpRdasXCHVSLl+ajB28mDmI2UEDGNQZkkOyZP24FVH9kdMfW8f+CiQ5+LZCM14 Tl+BHkNH9iYYiEcq9KLatzSzZlpYN9Wnwvg53J+KO3UsFY00OQGX5qtgSDBgdl4x5gjP EpKB0Ym6d5cLztOympLWpF/nVibM5mtya/KurY6EgdW/wMMYEIfa2PS9ocwe2I/XNBEG 8MNYkAG5gzCkpUJqHeYsmCh0jdi6XVJt7sWZjgkmOnr0YPxyd57ZCLumLcKis2ICZnYu Svxg== X-Gm-Message-State: AOAM531PKfZmm/ufFysgHho4lDZ7FVXu+ijD7Szhp8UE9QxQvYHPlm9N ZOzzy+WZmvAKWPUa7W/a6o0= X-Google-Smtp-Source: ABdhPJzrTVkDJ+4J5eQXsWaiUUjUtJKMbQy5V6vWVWYeYagHqlCpmq71tS8X4TyA/wzyonHYXnCiow== X-Received: by 2002:a67:f251:: with SMTP id y17mr387349vsm.62.1642801162878; Fri, 21 Jan 2022 13:39:22 -0800 (PST) Received: from localhost.localdomain ([2804:431:c7f4:2d80:9427:7267:dbaf:8ccf]) by smtp.googlemail.com with ESMTPSA id 29sm1633844vki.25.2022.01.21.13.39.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 13:39:22 -0800 (PST) From: Igor Torrente To: rodrigosiqueiramelo@gmail.com, melissa.srw@gmail.com, ppaalanen@gmail.com, tzimmermann@suse.de Subject: [PATCH v4 8/9] drm: vkms: Adds XRGB_16161616 and ARGB_1616161616 formats Date: Fri, 21 Jan 2022 18:38:30 -0300 Message-Id: <20220121213831.47229-9-igormtorrente@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220121213831.47229-1-igormtorrente@gmail.com> References: <20220121213831.47229-1-igormtorrente@gmail.com> MIME-Version: 1.0 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: hamohammed.sa@gmail.com, airlied@linux.ie, dri-devel@lists.freedesktop.org, ~lkcamp/patches@lists.sr.ht, Igor Torrente Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This will be useful to write tests that depends on these formats. ARGB and XRGB follows the a similar implementation of the former formats. Just adjusting for 16 bits per channel. Signed-off-by: Igor Torrente --- V3: Adapt the handlers to the new format introduced in patch 7 V3. --- drivers/gpu/drm/vkms/vkms_formats.c | 67 +++++++++++++++++++++++++++ drivers/gpu/drm/vkms/vkms_formats.h | 12 +++++ drivers/gpu/drm/vkms/vkms_plane.c | 5 +- drivers/gpu/drm/vkms/vkms_writeback.c | 2 + 4 files changed, 85 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vkms/vkms_formats.c b/drivers/gpu/drm/vkms/vkms_formats.c index 0d1838d1b835..661da39d1276 100644 --- a/drivers/gpu/drm/vkms/vkms_formats.c +++ b/drivers/gpu/drm/vkms/vkms_formats.c @@ -7,6 +7,10 @@ format_transform_func get_fmt_transform_function(u32 format) { if (format == DRM_FORMAT_ARGB8888) return &ARGB8888_to_ARGB16161616; + else if (format == DRM_FORMAT_ARGB16161616) + return &get_ARGB16161616; + else if (format == DRM_FORMAT_XRGB16161616) + return &XRGB16161616_to_ARGB16161616; else return &XRGB8888_to_ARGB16161616; } @@ -15,6 +19,10 @@ format_transform_func get_wb_fmt_transform_function(u32 format) { if (format == DRM_FORMAT_ARGB8888) return &convert_to_ARGB8888; + else if (format == DRM_FORMAT_ARGB16161616) + return &convert_to_ARGB16161616; + else if (format == DRM_FORMAT_XRGB16161616) + return &convert_to_XRGB16161616; else return &convert_to_XRGB8888; } @@ -89,6 +97,35 @@ void XRGB8888_to_ARGB16161616(struct vkms_frame_info *frame_info, int y, } } +void get_ARGB16161616(struct vkms_frame_info *frame_info, int y, + struct line_buffer *stage_buffer) +{ + u16 *src_pixels = get_packed_src_addr(frame_info, y); + int x, x_limit = drm_rect_width(&frame_info->dst); + + for (x = 0; x < x_limit; x++, src_pixels += 4) { + stage_buffer[x].a = src_pixels[3]; + stage_buffer[x].r = src_pixels[2]; + stage_buffer[x].g = src_pixels[1]; + stage_buffer[x].b = src_pixels[0]; + } +} + +void XRGB16161616_to_ARGB16161616(struct vkms_frame_info *frame_info, int y, + struct line_buffer *stage_buffer) +{ + u16 *src_pixels = get_packed_src_addr(frame_info, y); + int x, x_limit = drm_rect_width(&frame_info->dst); + + for (x = 0; x < x_limit; x++, src_pixels += 4) { + stage_buffer[x].a = (u16)0xffff; + stage_buffer[x].r = src_pixels[2]; + stage_buffer[x].g = src_pixels[1]; + stage_buffer[x].b = src_pixels[0]; + } +} + + /* * The following functions take an line of ARGB16161616 pixels from the * src_buffer, convert them to a specific format, and store them in the @@ -136,3 +173,33 @@ void convert_to_XRGB8888(struct vkms_frame_info *frame_info, dst_pixels[0] = DIV_ROUND_UP(src_buffer[x].b, 257); } } + +void convert_to_ARGB16161616(struct vkms_frame_info *frame_info, int y, + struct line_buffer *src_buffer) +{ + int x, x_dst = frame_info->dst.x1; + u16 *dst_pixels = packed_pixels_addr(frame_info, x_dst, y); + int x_limit = drm_rect_width(&frame_info->dst); + + for (x = 0; x < x_limit; x++, dst_pixels += 4) { + dst_pixels[3] = src_buffer[x].a; + dst_pixels[2] = src_buffer[x].r; + dst_pixels[1] = src_buffer[x].g; + dst_pixels[0] = src_buffer[x].b; + } +} + +void convert_to_XRGB16161616(struct vkms_frame_info *frame_info, int y, + struct line_buffer *src_buffer) +{ + int x, x_dst = frame_info->dst.x1; + u16 *dst_pixels = packed_pixels_addr(frame_info, x_dst, y); + int x_limit = drm_rect_width(&frame_info->dst); + + for (x = 0; x < x_limit; x++, dst_pixels += 4) { + dst_pixels[3] = src_buffer[x].a; + dst_pixels[2] = src_buffer[x].r; + dst_pixels[1] = src_buffer[x].g; + dst_pixels[0] = src_buffer[x].b; + } +} diff --git a/drivers/gpu/drm/vkms/vkms_formats.h b/drivers/gpu/drm/vkms/vkms_formats.h index 817e8b2124ae..22358f3a33ab 100644 --- a/drivers/gpu/drm/vkms/vkms_formats.h +++ b/drivers/gpu/drm/vkms/vkms_formats.h @@ -15,12 +15,24 @@ void ARGB8888_to_ARGB16161616(struct vkms_frame_info *frame_info, int y, void XRGB8888_to_ARGB16161616(struct vkms_frame_info *frame_info, int y, struct line_buffer *stage_buffer); +void get_ARGB16161616(struct vkms_frame_info *frame_info, int y, + struct line_buffer *stage_buffer); + +void XRGB16161616_to_ARGB16161616(struct vkms_frame_info *frame_info, int y, + struct line_buffer *stage_buffer); + void convert_to_ARGB8888(struct vkms_frame_info *frame_info, int y, struct line_buffer *src_buffer); void convert_to_XRGB8888(struct vkms_frame_info *frame_info, int y, struct line_buffer *src_buffer); +void convert_to_ARGB16161616(struct vkms_frame_info *frame_info, int y, + struct line_buffer *src_buffer); + +void convert_to_XRGB16161616(struct vkms_frame_info *frame_info, int y, + struct line_buffer *src_buffer); + typedef void (*format_transform_func)(struct vkms_frame_info *frame_info, int y, struct line_buffer *buffer); diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_plane.c index 28752af0118c..1d70c9e8f109 100644 --- a/drivers/gpu/drm/vkms/vkms_plane.c +++ b/drivers/gpu/drm/vkms/vkms_plane.c @@ -13,11 +13,14 @@ static const u32 vkms_formats[] = { DRM_FORMAT_XRGB8888, + DRM_FORMAT_XRGB16161616 }; static const u32 vkms_plane_formats[] = { DRM_FORMAT_ARGB8888, - DRM_FORMAT_XRGB8888 + DRM_FORMAT_XRGB8888, + DRM_FORMAT_XRGB16161616, + DRM_FORMAT_ARGB16161616 }; static struct drm_plane_state * diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/vkms_writeback.c index ad4bb1fb37ca..393d3fc7966f 100644 --- a/drivers/gpu/drm/vkms/vkms_writeback.c +++ b/drivers/gpu/drm/vkms/vkms_writeback.c @@ -14,6 +14,8 @@ static const u32 vkms_wb_formats[] = { DRM_FORMAT_XRGB8888, + DRM_FORMAT_XRGB16161616, + DRM_FORMAT_ARGB16161616 }; static const struct drm_connector_funcs vkms_wb_connector_funcs = { From patchwork Fri Jan 21 21:38:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Matheus Andrade Torrente X-Patchwork-Id: 12720312 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 BB0B8C433EF for ; Fri, 21 Jan 2022 21:39:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BDB7110E474; Fri, 21 Jan 2022 21:39:27 +0000 (UTC) Received: from mail-ua1-x92b.google.com (mail-ua1-x92b.google.com [IPv6:2607:f8b0:4864:20::92b]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5F17F10E474 for ; Fri, 21 Jan 2022 21:39:26 +0000 (UTC) Received: by mail-ua1-x92b.google.com with SMTP id u6so19369525uaq.0 for ; Fri, 21 Jan 2022 13:39:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KrJK7VFm/uKvpjlyM0dM7TFPOBp3BJCfN+cH4kbu3+A=; b=jgEtu9mRvt3GDciybE65XywhlH1/zs8WAMzE6KNqt5AAOAN3qyDtxBnGtdqqLdMCRV 3rrFdk3N7c7cTr+MrX4m9aKW5zPZEU37sLcFVP9ACqLJeYOTGWAXw3FKQ6o2mKEK1f2o i2CPhS1Nsk58fpC19J6dH4wdANrrOxy4ebUXIv9JAf7fMIBFB2aPIlri8Ln/d3D98C9v mD2kjKBNlCcO3DglFcz48ne5DTYdbNVVW3ae+rqtiEx/YH9Sur6fUT0gm5KEUkjBR8h0 3t8cwzdKV6G6GhSdaDicv5nx3xH8efrTMez6jHswS/LBbLInJS3BBlXnXcobBztj9Ulk U2aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KrJK7VFm/uKvpjlyM0dM7TFPOBp3BJCfN+cH4kbu3+A=; b=tccMVHKTyTvp3+Rs1CKugnmpRtFeWNztfGwRsj02BV5YsW/mF2fXXX0qXAegdKn7Uf 7hV7uE7Y9q5RILYt8V7ABd2kXXoXF8HyaCD4SX/nj+sEWjvrzTvPuKqMfy5XOQTJVLSg SMAJFxlI1um5HK2+KXi0qxj+OY9yvfXYG575TbkrGFDiXy9e1Gux6PUDauAe02hpCRPF WZf9E0P+/mz8J3e9L+7jfNUu43CIwEI6TKQtR+lm5sjC+MjocVsNG80S4TAn6jDzVGSL /0oVW5gp96ObxS42gFRbnbxvmF5HqlqGKTPsVcqtvG1Tt8zrK1snNn1Ap1YOlEsFe5s0 lvYQ== X-Gm-Message-State: AOAM533oBUasxgR6wx3RArHS2UBYj38kBwooSTd1CtpaUagIw8Kk1JII flxOCwsAIHp5sG9VyH4zlNs= X-Google-Smtp-Source: ABdhPJyer+IdvmYlfMTNlrAWyR5URDQKUTiGSRCRiOSyZQsiuMl7PJft07w/huWE9rjrp5kppGbH7Q== X-Received: by 2002:a9f:3e01:: with SMTP id o1mr2726187uai.89.1642801165539; Fri, 21 Jan 2022 13:39:25 -0800 (PST) Received: from localhost.localdomain ([2804:431:c7f4:2d80:9427:7267:dbaf:8ccf]) by smtp.googlemail.com with ESMTPSA id 29sm1633844vki.25.2022.01.21.13.39.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 13:39:25 -0800 (PST) From: Igor Torrente To: rodrigosiqueiramelo@gmail.com, melissa.srw@gmail.com, ppaalanen@gmail.com, tzimmermann@suse.de Subject: [PATCH v4 9/9] drm: vkms: Add support to the RGB565 format Date: Fri, 21 Jan 2022 18:38:31 -0300 Message-Id: <20220121213831.47229-10-igormtorrente@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220121213831.47229-1-igormtorrente@gmail.com> References: <20220121213831.47229-1-igormtorrente@gmail.com> MIME-Version: 1.0 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: hamohammed.sa@gmail.com, airlied@linux.ie, dri-devel@lists.freedesktop.org, ~lkcamp/patches@lists.sr.ht, Igor Torrente Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Adds this common format to vkms. This commit also adds new helper macros to deal with fixed-point arithmetic. It was done to improve the precision of the conversion to ARGB16161616 since the "conversion ratio" is not an integer. Signed-off-by: Igor Torrente --- V3: Adapt the handlers to the new format introduced in patch 7 V3. --- drivers/gpu/drm/vkms/vkms_formats.c | 74 +++++++++++++++++++++++++++ drivers/gpu/drm/vkms/vkms_formats.h | 6 +++ drivers/gpu/drm/vkms/vkms_plane.c | 6 ++- drivers/gpu/drm/vkms/vkms_writeback.c | 3 +- 4 files changed, 86 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_formats.c b/drivers/gpu/drm/vkms/vkms_formats.c index 661da39d1276..dc612882dd8c 100644 --- a/drivers/gpu/drm/vkms/vkms_formats.c +++ b/drivers/gpu/drm/vkms/vkms_formats.c @@ -11,6 +11,8 @@ format_transform_func get_fmt_transform_function(u32 format) return &get_ARGB16161616; else if (format == DRM_FORMAT_XRGB16161616) return &XRGB16161616_to_ARGB16161616; + else if (format == DRM_FORMAT_RGB565) + return &RGB565_to_ARGB16161616; else return &XRGB8888_to_ARGB16161616; } @@ -23,6 +25,8 @@ format_transform_func get_wb_fmt_transform_function(u32 format) return &convert_to_ARGB16161616; else if (format == DRM_FORMAT_XRGB16161616) return &convert_to_XRGB16161616; + else if (format == DRM_FORMAT_RGB565) + return &convert_to_RGB565; else return &convert_to_XRGB8888; } @@ -33,6 +37,26 @@ static int pixel_offset(struct vkms_frame_info *frame_info, int x, int y) + (x * frame_info->cpp); } +/* + * FP stands for _Fixed Point_ and **not** _Float Point_ + * LF stands for Long Float (i.e. double) + * The following macros help doing fixed point arithmetic. + */ +/* + * With FP scale 15 we have 17 and 15 bits of integer and fractional parts + * respectively. + * | 0000 0000 0000 0000 0.000 0000 0000 0000 | + * 31 0 + */ +#define FP_SCALE 15 + +#define LF_TO_FP(a) ((a) * (u64)(1 << FP_SCALE)) +#define INT_TO_FP(a) ((a) << FP_SCALE) +#define FP_MUL(a, b) ((s32)(((s64)(a) * (b)) >> FP_SCALE)) +#define FP_DIV(a, b) ((s32)(((s64)(a) << FP_SCALE) / (b))) +/* This macro converts a fixed point number to int, and round half up it */ +#define FP_TO_INT_ROUND_UP(a) (((a) + (1 << (FP_SCALE - 1))) >> FP_SCALE) + /* * packed_pixels_addr - Get the pointer to pixel of a given pair of coordinates * @@ -125,6 +149,33 @@ void XRGB16161616_to_ARGB16161616(struct vkms_frame_info *frame_info, int y, } } +void RGB565_to_ARGB16161616(struct vkms_frame_info *frame_info, int y, + struct line_buffer *stage_buffer) +{ + u16 *src_pixels = get_packed_src_addr(frame_info, y); + int x, x_limit = drm_rect_width(&frame_info->dst); + + for (x = 0; x < x_limit; x++, src_pixels++) { + u16 rgb_565 = le16_to_cpu(*src_pixels); + int fp_r = INT_TO_FP((rgb_565 >> 11) & 0x1f); + int fp_g = INT_TO_FP((rgb_565 >> 5) & 0x3f); + int fp_b = INT_TO_FP(rgb_565 & 0x1f); + + /* + * The magic constants is the "conversion ratio" and is calculated + * dividing 65535(2^16 - 1) by 31(2^5 -1) and 63(2^6 - 1) + * respectively. + */ + int fp_rb_ratio = LF_TO_FP(2114.032258065); + int fp_g_ratio = LF_TO_FP(1040.238095238); + + stage_buffer[x].a = (u16)0xffff; + stage_buffer[x].r = FP_TO_INT_ROUND_UP(FP_MUL(fp_r, fp_rb_ratio)); + stage_buffer[x].g = FP_TO_INT_ROUND_UP(FP_MUL(fp_g, fp_g_ratio)); + stage_buffer[x].b = FP_TO_INT_ROUND_UP(FP_MUL(fp_b, fp_rb_ratio)); + } +} + /* * The following functions take an line of ARGB16161616 pixels from the @@ -203,3 +254,26 @@ void convert_to_XRGB16161616(struct vkms_frame_info *frame_info, int y, dst_pixels[0] = src_buffer[x].b; } } + +void convert_to_RGB565(struct vkms_frame_info *frame_info, int y, + struct line_buffer *src_buffer) +{ + int x, x_dst = frame_info->dst.x1; + u16 *dst_pixels = packed_pixels_addr(frame_info, x_dst, y); + int x_limit = drm_rect_width(&frame_info->dst); + + for (x = 0; x < x_limit; x++, dst_pixels++) { + int fp_r = INT_TO_FP(src_buffer[x].r); + int fp_g = INT_TO_FP(src_buffer[x].g); + int fp_b = INT_TO_FP(src_buffer[x].b); + + int fp_rb_ratio = LF_TO_FP(2114.032258065); + int fp_g_ratio = LF_TO_FP(1040.238095238); + + u16 r = FP_TO_INT_ROUND_UP(FP_DIV(fp_r, fp_rb_ratio)); + u16 g = FP_TO_INT_ROUND_UP(FP_DIV(fp_g, fp_g_ratio)); + u16 b = FP_TO_INT_ROUND_UP(FP_DIV(fp_b, fp_rb_ratio)); + + *dst_pixels = cpu_to_le16(r << 11 | g << 5 | b); + } +} diff --git a/drivers/gpu/drm/vkms/vkms_formats.h b/drivers/gpu/drm/vkms/vkms_formats.h index 22358f3a33ab..836d6e43ea90 100644 --- a/drivers/gpu/drm/vkms/vkms_formats.h +++ b/drivers/gpu/drm/vkms/vkms_formats.h @@ -21,6 +21,9 @@ void get_ARGB16161616(struct vkms_frame_info *frame_info, int y, void XRGB16161616_to_ARGB16161616(struct vkms_frame_info *frame_info, int y, struct line_buffer *stage_buffer); +void RGB565_to_ARGB16161616(struct vkms_frame_info *frame_info, int y, + struct line_buffer *stage_buffer); + void convert_to_ARGB8888(struct vkms_frame_info *frame_info, int y, struct line_buffer *src_buffer); @@ -33,6 +36,9 @@ void convert_to_ARGB16161616(struct vkms_frame_info *frame_info, int y, void convert_to_XRGB16161616(struct vkms_frame_info *frame_info, int y, struct line_buffer *src_buffer); +void convert_to_RGB565(struct vkms_frame_info *frame_info, int y, + struct line_buffer *src_buffer); + typedef void (*format_transform_func)(struct vkms_frame_info *frame_info, int y, struct line_buffer *buffer); diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_plane.c index 1d70c9e8f109..4643eefcdf29 100644 --- a/drivers/gpu/drm/vkms/vkms_plane.c +++ b/drivers/gpu/drm/vkms/vkms_plane.c @@ -13,14 +13,16 @@ static const u32 vkms_formats[] = { DRM_FORMAT_XRGB8888, - DRM_FORMAT_XRGB16161616 + DRM_FORMAT_XRGB16161616, + DRM_FORMAT_RGB565 }; static const u32 vkms_plane_formats[] = { DRM_FORMAT_ARGB8888, DRM_FORMAT_XRGB8888, DRM_FORMAT_XRGB16161616, - DRM_FORMAT_ARGB16161616 + DRM_FORMAT_ARGB16161616, + DRM_FORMAT_RGB565 }; static struct drm_plane_state * diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/vkms_writeback.c index 393d3fc7966f..1aaa630090d3 100644 --- a/drivers/gpu/drm/vkms/vkms_writeback.c +++ b/drivers/gpu/drm/vkms/vkms_writeback.c @@ -15,7 +15,8 @@ static const u32 vkms_wb_formats[] = { DRM_FORMAT_XRGB8888, DRM_FORMAT_XRGB16161616, - DRM_FORMAT_ARGB16161616 + DRM_FORMAT_ARGB16161616, + DRM_FORMAT_RGB565 }; static const struct drm_connector_funcs vkms_wb_connector_funcs = {