summaryrefslogtreecommitdiffstats
path: root/recipes-graphics/wayland/weston
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2016-10-07 17:36:59 -0500
committerOtavio Salvador <otavio@ossystems.com.br>2016-10-18 16:26:14 -0200
commit05540d887c1c7e573a7803ca1e1720ce64325a1f (patch)
treee955515e2404741ebd9a1a0231be365519b909b1 /recipes-graphics/wayland/weston
parentb7e1c6f21721108a868e95140918d184dd0a5383 (diff)
downloadmeta-freescale-05540d887c1c7e573a7803ca1e1720ce64325a1f.tar.gz
weston: Fix weston build failed
Expose more variale to G2d compositor, because it is not easy to get the physical address in G2d compositor. Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-graphics/wayland/weston')
-rw-r--r--recipes-graphics/wayland/weston/0015-MGS-2221-imx-171-Fix-weston-build-failed.patch62
1 files changed, 62 insertions, 0 deletions
diff --git a/recipes-graphics/wayland/weston/0015-MGS-2221-imx-171-Fix-weston-build-failed.patch b/recipes-graphics/wayland/weston/0015-MGS-2221-imx-171-Fix-weston-build-failed.patch
new file mode 100644
index 00000000..3f851eed
--- /dev/null
+++ b/recipes-graphics/wayland/weston/0015-MGS-2221-imx-171-Fix-weston-build-failed.patch
@@ -0,0 +1,62 @@
1From 66a40759e44998edecf242bc100be0fcdd62937e Mon Sep 17 00:00:00 2001
2From: Yong Gan <yong.gan@nxp.com>
3Date: Thu, 1 Sep 2016 09:36:33 +0800
4Subject: [PATCH] MGS-2221 [#imx-171] Fix weston build failed
5
6Expose more variale to G2d compositor, because it is not easy to get the physical address
7in G2d compositor.
8
9Upstream Status: Inappropriate [i.MX specific]
10
11Date: Aug 31, 2016
12Signed-off-by: Yong Gan <yong.gan@nxp.com>
13---
14 src/g2d-renderer.c | 18 ++++++++++++++++--
15 1 file changed, 16 insertions(+), 2 deletions(-)
16
17diff --git a/src/g2d-renderer.c b/src/g2d-renderer.c
18index 30bf1a5..1009115 100644
19--- a/src/g2d-renderer.c
20+++ b/src/g2d-renderer.c
21@@ -48,6 +48,20 @@
22 #define BUFFER_DAMAGE_COUNT 2
23 #define ALIGN_WIDTH(a) (((a) + 15) & ~15)
24
25+struct wl_viv_buffer
26+{
27+ struct wl_resource *resource;
28+ gcoSURF surface;
29+ gctINT32 width;
30+ gctINT32 height;
31+ gctINT32 format;
32+ gctUINT alignedWidth;
33+ gctUINT alignedHeight;
34+ gctUINT32 physical[3];
35+ gctUINT32 gpuBaseAddr;
36+ gceTILING tiling;
37+};
38+
39 typedef struct _g2dRECT
40 {
41 int left;
42@@ -316,7 +330,7 @@ static void printG2dSurfaceInfo(struct g2d_surfaceEx* g2dSurface, const char* ms
43 }
44
45 static void
46-get_g2dSurface(gcsWL_VIV_BUFFER *buffer, struct g2d_surfaceEx *g2dSurface)
47+get_g2dSurface(struct wl_viv_buffer *buffer, struct g2d_surfaceEx *g2dSurface)
48 {
49 if(buffer->width < 0 || buffer->height < 0)
50 {
51@@ -687,7 +701,7 @@ g2d_renderer_repaint_output(struct weston_output *output,
52 static void
53 g2d_renderer_attach_egl(struct weston_surface *es, struct weston_buffer *buffer)
54 {
55- gcsWL_VIV_BUFFER *vivBuffer = wl_resource_get_user_data(buffer->resource);
56+ struct wl_viv_buffer *vivBuffer = wl_resource_get_user_data(buffer->resource);
57 struct g2d_surface_state *gs = get_surface_state(es);
58 buffer->width = vivBuffer->width;
59 buffer->height = vivBuffer->height;
60--
611.9.1
62