diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2020-06-17 14:52:14 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-06-18 16:56:01 +0200 |
| commit | 617243d922c00467e8270fc55e38a222aa6e6464 (patch) | |
| tree | 7e6f0d1abf2c6183fe3ded20354e3c13e8b7b9c6 /recipes-graphics | |
| parent | 3c5161c66d90a052ab2d8ded67fffdc88073a1ae (diff) | |
weston: patch weston imx for older nxp bsp
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'recipes-graphics')
| -rw-r--r-- | recipes-graphics/wayland/weston/0001-g2d-renderer-ignore-G2D_TILED_STATUS-if-not-defined.patch | 41 | ||||
| -rw-r--r-- | recipes-graphics/wayland/weston_8.0.0.imx.bbappend | 7 |
2 files changed, 48 insertions, 0 deletions
diff --git a/recipes-graphics/wayland/weston/0001-g2d-renderer-ignore-G2D_TILED_STATUS-if-not-defined.patch b/recipes-graphics/wayland/weston/0001-g2d-renderer-ignore-G2D_TILED_STATUS-if-not-defined.patch new file mode 100644 index 0000000..8215c4f --- /dev/null +++ b/recipes-graphics/wayland/weston/0001-g2d-renderer-ignore-G2D_TILED_STATUS-if-not-defined.patch @@ -0,0 +1,41 @@ +From d4a8be56499162d76858a3ab65053435174c48d1 Mon Sep 17 00:00:00 2001 +From: Max Krummenacher <max.krummenacher@toradex.com> +Date: Wed, 17 Jun 2020 09:14:20 +0000 +Subject: [PATCH] g2d-renderer: ignore G2D_TILED_STATUS + +weston 8.0.0.imx uses a G2D_TILED_STATUS feature which is unavailable +in older NXP BSPs. (4.14.98_2.3.0). + +Remove the relevant code from compilation. + +Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> +--- + libweston/renderer-g2d/g2d-renderer.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/libweston/renderer-g2d/g2d-renderer.c b/libweston/renderer-g2d/g2d-renderer.c +index 34a077b7..b9ede558 100644 +--- a/libweston/renderer-g2d/g2d-renderer.c ++++ b/libweston/renderer-g2d/g2d-renderer.c +@@ -477,6 +477,10 @@ get_g2dSurface(struct wl_viv_buffer *buffer, struct g2d_surfaceEx *g2dSurface) + g2dSurface->base.height = buffer->height; + g2dSurface->base.rot = G2D_ROTATION_0; + ++#if 1 ++ /* ignore tileStatus on i.MX8MM and i.MX6 */ ++ buffer->tileStatus_enabled = 0; ++#else + if(buffer->ts_addr && buffer->tileStatus_enabled) + { + g2dSurface->tiling |= G2D_TILED_STATUS; +@@ -485,6 +489,7 @@ get_g2dSurface(struct wl_viv_buffer *buffer, struct g2d_surfaceEx *g2dSurface) + g2dSurface->ts.fc_value = buffer->fcValue; + g2dSurface->ts.fc_value_upper = buffer->fcValueUpper; + } ++#endif + } + + static void +-- +2.20.1 + diff --git a/recipes-graphics/wayland/weston_8.0.0.imx.bbappend b/recipes-graphics/wayland/weston_8.0.0.imx.bbappend new file mode 100644 index 0000000..393e58c --- /dev/null +++ b/recipes-graphics/wayland/weston_8.0.0.imx.bbappend @@ -0,0 +1,7 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +# looks like weston-imx requires Vivante 6.4.0 g2d support to compile +# correctly, e.g. +# ../git/libweston/renderer-g2d/g2d-renderer.c:482:37: error: 'G2D_TILED_STATUS' undeclared (first use in this function) +# 482 | g2dSurface->tiling |= G2D_TILED_STATUS; + +SRC_URI_append = "file://0001-g2d-renderer-ignore-G2D_TILED_STATUS-if-not-defined.patch" |