From patchwork Wed Mar 20 09:55:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 41280 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 aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6FD89C54E67 for ; Wed, 20 Mar 2024 09:56:41 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by mx.groups.io with SMTP id smtpd.web10.39849.1710928590759617086 for ; Wed, 20 Mar 2024 02:56:31 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@denx.de header.s=phobos-20191101 header.b=R1kJgzg4; spf=pass (domain: denx.de, ip: 85.214.62.61, mailfrom: marex@denx.de) Received: from tr.lan (ip-86-49-120-218.bb.vodafone.cz [86.49.120.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id B62F387F8F; Wed, 20 Mar 2024 10:56:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1710928588; bh=NUk9J+LQAt3ltULalrpjkbdR2rmKKk46Bsk2nAqbwZc=; h=From:To:Cc:Subject:Date:From; b=R1kJgzg41MGHeEILegX22Uy45njyp//FAYLQ5P/Ccsfpdm7bpinmGFOwCvLEe6NpX aiS4amvmkrb9uyoJJOEASSzSqkqdIBUtEBEZtoQsb5NdehZMsHnbFnTKLIs6QfBq0Y fRD6Lp9MjsMoH3/RE5Tj/rvVeZL1i0qIlOG8+ORzuzz+wB/TzCyOrHGxwHEHybj9n/ Anh7gGCFeB0GO0D5t8Zrx83F9WemZi2fsrxm1y64YbTnmr7vnoPGMcqTHC5zxULKm1 2fUFlOasYqamjy+jKYO+8CFhWqMIbEtjofHo6hFEUx0eZR80Ynk9jjVp9fQg80juCg xja14pthY+cSA== From: Marek Vasut To: openembedded-devel@lists.openembedded.org Cc: Marek Vasut , Christophe Chapuis , Fabio Estevam , Khem Raj , Martin Jansa Subject: [meta-oe][PATCH 1/2] lvgl: Reinstate demo configuration settings Date: Wed, 20 Mar 2024 10:55:37 +0100 Message-ID: <20240320095612.176662-1-marex@denx.de> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Mar 2024 09:56:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/109487 The LVGL demo is configured slightly differently than the LVGL itself. Logging and printing is enabled, memory size is higher and compressed fonts are enabled. Reinstate the settings, otherwise the demo keeps crashing at least with SDL2 backend. Signed-off-by: Marek Vasut --- Cc: Christophe Chapuis Cc: Fabio Estevam Cc: Khem Raj Cc: Martin Jansa --- meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.0.0.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.0.0.bb b/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.0.0.bb index 5ae930f5c..308e74897 100644 --- a/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.0.0.bb +++ b/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.0.0.bb @@ -24,6 +24,10 @@ EXTRA_OEMAKE = "DESTDIR=${D}" PACKAGECONFIG ??= "drm" LVGL_CONFIG_DRM_CARD ?= "/dev/dri/card0" +LVGL_CONFIG_LV_USE_LOG = "1" +LVGL_CONFIG_LV_LOG_PRINTF = "1" +LVGL_CONFIG_LV_MEM_SIZE = "(256 * 1024U)" +LVGL_CONFIG_LV_USE_FONT_COMPRESSED = "1" require lv-conf.inc inherit cmake From patchwork Wed Mar 20 09:55:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 41279 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 aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 810F5C54E67 for ; Wed, 20 Mar 2024 09:56:31 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by mx.groups.io with SMTP id smtpd.web11.40012.1710928590078673072 for ; Wed, 20 Mar 2024 02:56:30 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@denx.de header.s=phobos-20191101 header.b=FgEiG1LC; spf=pass (domain: denx.de, ip: 85.214.62.61, mailfrom: marex@denx.de) Received: from tr.lan (ip-86-49-120-218.bb.vodafone.cz [86.49.120.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 2694C87FB8; Wed, 20 Mar 2024 10:56:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1710928588; bh=eFSkeg8L5Oipy7Jd6Tvrv1hwQbqJMqOL0MkUEKS1BRQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FgEiG1LCdEljmxVzIb+LRzvHxYLwgODlAgwCZz1KNE6kUqqfZ542SncD2KS4KeGbn 4fzjXX+hCyWAsxCJzQPgEk8smBNgW0V1TsHHJ9u9ivSHXAcsTvDFZ3mdd7LPS9uQjv nOeguJIpX3Q+CwXAr+hdrdw6V/ROW5rwyvTdd0ogqZb9vhfqzDMfoE244VCAuMRMRw QwYCOkftrwF4sY03EDGHqNeN64ewZjqy1gg0p/PnzGfnyeNP/zrru9fxhgY3jz6NLw P0/SxBmHl8xciRzejdkq0AqVwPc2aYN/OeUw48w8xchlwmdEB3sgeryclpsCOTry/b p6T3CnPBv7R5w== From: Marek Vasut To: openembedded-devel@lists.openembedded.org Cc: Marek Vasut , Christophe Chapuis , Fabio Estevam , Khem Raj , Martin Jansa Subject: [meta-oe][PATCH 2/2] lvgl: Update to 9.1.0 Date: Wed, 20 Mar 2024 10:55:38 +0100 Message-ID: <20240320095612.176662-2-marex@denx.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240320095612.176662-1-marex@denx.de> References: <20240320095612.176662-1-marex@denx.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 20 Mar 2024 09:56:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/109486 Update LVGL to final 9.1.0 . Drop the XRGB8888 fix which is part of the release. Signed-off-by: Marek Vasut --- Cc: Christophe Chapuis Cc: Fabio Estevam Cc: Khem Raj Cc: Martin Jansa --- ...-drm-Default-to-XRGB8888-framebuffer.patch | 36 ------------------- ...demo-fb_9.0.0.bb => lvgl-demo-fb_9.1.0.bb} | 3 +- .../lvgl/{lvgl_9.0.0.bb => lvgl_9.1.0.bb} | 3 +- 3 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 meta-oe/recipes-graphics/lvgl/files/0001-fix-drm-Default-to-XRGB8888-framebuffer.patch rename meta-oe/recipes-graphics/lvgl/{lvgl-demo-fb_9.0.0.bb => lvgl-demo-fb_9.1.0.bb} (92%) rename meta-oe/recipes-graphics/lvgl/{lvgl_9.0.0.bb => lvgl_9.1.0.bb} (89%) diff --git a/meta-oe/recipes-graphics/lvgl/files/0001-fix-drm-Default-to-XRGB8888-framebuffer.patch b/meta-oe/recipes-graphics/lvgl/files/0001-fix-drm-Default-to-XRGB8888-framebuffer.patch deleted file mode 100644 index 9d758cb08..000000000 --- a/meta-oe/recipes-graphics/lvgl/files/0001-fix-drm-Default-to-XRGB8888-framebuffer.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 7b89e18c2f21e4b91b461007368df724198ac904 Mon Sep 17 00:00:00 2001 -From: Marek Vasut -Date: Tue, 12 Mar 2024 03:13:33 +0100 -Subject: [PATCH 1/2] fix(drm): Default to XRGB8888 framebuffer - -The ARGB8888 framebuffer format for base canvas makes little sense -as the base canvas is unlikely to be transparent and require alpha. -Use XRGB8888 framebuffer format which is more widely supported by -DRM drivers as base plane pixel format. - -This makes e.g. i.MX8M Nano work by default. - -Upstream-Status: Submitted [https://github.com/lvgl/lvgl/pull/5851] -Signed-off-by: Marek Vasut ---- -This is identical fix to lv_drivers https://github.com/lvgl/lv_drivers/pull/282 ---- - src/drivers/display/drm/lv_linux_drm.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/drivers/display/drm/lv_linux_drm.c b/src/drivers/display/drm/lv_linux_drm.c -index c706f9cb2..faa2212bf 100644 ---- a/src/drivers/display/drm/lv_linux_drm.c -+++ b/src/drivers/display/drm/lv_linux_drm.c -@@ -24,7 +24,7 @@ - * DEFINES - *********************/ - #if LV_COLOR_DEPTH == 32 -- #define DRM_FOURCC DRM_FORMAT_ARGB8888 -+ #define DRM_FOURCC DRM_FORMAT_XRGB8888 - #elif LV_COLOR_DEPTH == 16 - #define DRM_FOURCC DRM_FORMAT_RGB565 - #else --- -2.43.0 - diff --git a/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.0.0.bb b/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.1.0.bb similarity index 92% rename from meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.0.0.bb rename to meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.1.0.bb index 308e74897..542b70ea2 100644 --- a/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.0.0.bb +++ b/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.1.0.bb @@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=802d3d83ae80ef5f343050bf96cce3a4 \ SRC_URI = "\ git://github.com/lvgl/lv_port_linux_frame_buffer.git;protocol=https;branch=master;name=demo \ git://github.com/lvgl/lvgl;protocol=https;branch=master;name=lvgl;subdir=git/lvgl \ - file://0001-fix-drm-Default-to-XRGB8888-framebuffer.patch;patchdir=lvgl \ file://0002-fix-sdl-handle-both-LV_IMAGE_SRC_FILE-and-LV_IMAGE_S.patch;patchdir=lvgl \ file://0003-Make-fbdev-device-node-runtime-configurable-via-envi.patch \ file://0004-Factor-out-fbdev-initialization-code.patch \ @@ -16,7 +15,7 @@ SRC_URI = "\ file://0007-fix-cmake-generate-versioned-shared-libraries.patch;patchdir=lvgl \ " SRCREV_demo = "dccc6a1ca48372aa993dbea7a8e17dec6f42df6a" -SRCREV_lvgl = "e29d35b43c509b6d7189f5dac87139441669ae66" +SRCREV_lvgl = "e1c0b21b2723d391b885de4b2ee5cc997eccca91" SRCREV_FORMAT = "demo_lvgl" PV .= "+git${SRCPV}" diff --git a/meta-oe/recipes-graphics/lvgl/lvgl_9.0.0.bb b/meta-oe/recipes-graphics/lvgl/lvgl_9.1.0.bb similarity index 89% rename from meta-oe/recipes-graphics/lvgl/lvgl_9.0.0.bb rename to meta-oe/recipes-graphics/lvgl/lvgl_9.1.0.bb index 0fb3ddecf..fc967e6d1 100644 --- a/meta-oe/recipes-graphics/lvgl/lvgl_9.0.0.bb +++ b/meta-oe/recipes-graphics/lvgl/lvgl_9.1.0.bb @@ -10,11 +10,10 @@ LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=bf1198c89ae87f043108cea62460b03a" SRC_URI = "\ git://github.com/lvgl/lvgl;protocol=https;branch=master \ - file://0001-fix-drm-Default-to-XRGB8888-framebuffer.patch \ file://0002-fix-sdl-handle-both-LV_IMAGE_SRC_FILE-and-LV_IMAGE_S.patch \ file://0007-fix-cmake-generate-versioned-shared-libraries.patch \ " -SRCREV = "e29d35b43c509b6d7189f5dac87139441669ae66" +SRCREV = "e1c0b21b2723d391b885de4b2ee5cc997eccca91" PV .= "+git${SRCPV}" inherit cmake