* [morty][PATCH V2 1/5] weston: allow visual_id to be 0 to fix EGL config failure
2017-03-09 21:27 [morty][PATCH V2 0/5] weston: re-apply multiple patches from weston 1.9 Eric Ruei
@ 2017-03-09 21:27 ` Eric Ruei
2017-03-10 17:19 ` Denys Dmytriyenko
2017-03-09 21:27 ` [morty][PATCH V2 2/5] weston: fix virtual keyboard display issue of QT5 applications Eric Ruei
` (3 subsequent siblings)
4 siblings, 1 reply; 7+ messages in thread
From: Eric Ruei @ 2017-03-09 21:27 UTC (permalink / raw)
To: meta-arago
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
...to-be-0.patch => 0002-Weston-Allow-visual_id-to-be-0.patch} | 10 +++++-----
.../recipes-graphics/wayland/weston_1.11.0.bbappend | 3 ++-
2 files changed, 7 insertions(+), 6 deletions(-)
rename meta-arago-distro/recipes-graphics/wayland/weston/{0002-Weston1.9.0-Allow-visual_id-to-be-0.patch => 0002-Weston-Allow-visual_id-to-be-0.patch} (72%)
diff --git a/meta-arago-distro/recipes-graphics/wayland/weston/0002-Weston1.9.0-Allow-visual_id-to-be-0.patch b/meta-arago-distro/recipes-graphics/wayland/weston/0002-Weston-Allow-visual_id-to-be-0.patch
similarity index 72%
rename from meta-arago-distro/recipes-graphics/wayland/weston/0002-Weston1.9.0-Allow-visual_id-to-be-0.patch
rename to meta-arago-distro/recipes-graphics/wayland/weston/0002-Weston-Allow-visual_id-to-be-0.patch
index 72d067f..39c8401 100644
--- a/meta-arago-distro/recipes-graphics/wayland/weston/0002-Weston1.9.0-Allow-visual_id-to-be-0.patch
+++ b/meta-arago-distro/recipes-graphics/wayland/weston/0002-Weston-Allow-visual_id-to-be-0.patch
@@ -1,7 +1,7 @@
-From 27cf7d0c260fa4754a021e9f6f92f83e2c99f5f4 Mon Sep 17 00:00:00 2001
+From 5b5de6a814b43ca023a92b85b407b3d061dbc64f Mon Sep 17 00:00:00 2001
From: Eric Ruei <e-ruei1@ti.com>
-Date: Mon, 11 Jan 2016 11:59:19 -0500
-Subject: [PATCH 2/2] Weston1.9.0: Allow visual_id to be 0
+Date: Thu, 9 Mar 2017 14:32:24 -0500
+Subject: [PATCH 2/4] Weston: Allow visual_id to be 0
The inquiry of visual id from egl API eglGetConfigAttrib(EGL_NATIVE_VISUAL_ID)
is an optional feature. The visual id will be set to 0 if this feature is
@@ -14,10 +14,10 @@ Signed-off-by: Eric Ruei <e-ruei1@ti.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gl-renderer.c b/src/gl-renderer.c
-index d7231f4..e1b925e 100644
+index 23c0cd7..4c1f170 100644
--- a/src/gl-renderer.c
+++ b/src/gl-renderer.c
-@@ -2194,7 +2194,7 @@ match_config_to_visual(EGLDisplay egl_display,
+@@ -2462,7 +2462,7 @@ match_config_to_visual(EGLDisplay egl_display,
&id))
continue;
diff --git a/meta-arago-distro/recipes-graphics/wayland/weston_1.11.0.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston_1.11.0.bbappend
index 60a752b..9a2c3a7 100644
--- a/meta-arago-distro/recipes-graphics/wayland/weston_1.11.0.bbappend
+++ b/meta-arago-distro/recipes-graphics/wayland/weston_1.11.0.bbappend
@@ -2,7 +2,7 @@
PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor WESTON_NATIVE_BACKEND="fbdev-backend.so",--disable-fbdev-compositor,udev mtdev"
PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev libgbm mtdev"
-PR_append = ".arago17"
+PR_append = ".arago18"
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
@@ -11,4 +11,5 @@ RDEPENDS_${PN} += "weston-conf"
SRC_URI += " \
file://0001-udev-seat-restrict-udev-enumeration-to-card0.patch \
+ file://0002-Weston-Allow-visual_id-to-be-0.patch \
"
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [morty][PATCH V2 1/5] weston: allow visual_id to be 0 to fix EGL config failure
2017-03-09 21:27 ` [morty][PATCH V2 1/5] weston: allow visual_id to be 0 to fix EGL config failure Eric Ruei
@ 2017-03-10 17:19 ` Denys Dmytriyenko
0 siblings, 0 replies; 7+ messages in thread
From: Denys Dmytriyenko @ 2017-03-10 17:19 UTC (permalink / raw)
To: Eric Ruei; +Cc: meta-arago
On Thu, Mar 09, 2017 at 04:27:33PM -0500, Eric Ruei wrote:
> Signed-off-by: Eric Ruei <e-ruei1@ti.com>
> ---
> ...to-be-0.patch => 0002-Weston-Allow-visual_id-to-be-0.patch} | 10 +++++-----
> .../recipes-graphics/wayland/weston_1.11.0.bbappend | 3 ++-
> 2 files changed, 7 insertions(+), 6 deletions(-)
> rename meta-arago-distro/recipes-graphics/wayland/weston/{0002-Weston1.9.0-Allow-visual_id-to-be-0.patch => 0002-Weston-Allow-visual_id-to-be-0.patch} (72%)
>
> diff --git a/meta-arago-distro/recipes-graphics/wayland/weston/0002-Weston1.9.0-Allow-visual_id-to-be-0.patch b/meta-arago-distro/recipes-graphics/wayland/weston/0002-Weston-Allow-visual_id-to-be-0.patch
> similarity index 72%
> rename from meta-arago-distro/recipes-graphics/wayland/weston/0002-Weston1.9.0-Allow-visual_id-to-be-0.patch
> rename to meta-arago-distro/recipes-graphics/wayland/weston/0002-Weston-Allow-visual_id-to-be-0.patch
> index 72d067f..39c8401 100644
> --- a/meta-arago-distro/recipes-graphics/wayland/weston/0002-Weston1.9.0-Allow-visual_id-to-be-0.patch
> +++ b/meta-arago-distro/recipes-graphics/wayland/weston/0002-Weston-Allow-visual_id-to-be-0.patch
> @@ -1,7 +1,7 @@
> -From 27cf7d0c260fa4754a021e9f6f92f83e2c99f5f4 Mon Sep 17 00:00:00 2001
> +From 5b5de6a814b43ca023a92b85b407b3d061dbc64f Mon Sep 17 00:00:00 2001
> From: Eric Ruei <e-ruei1@ti.com>
> -Date: Mon, 11 Jan 2016 11:59:19 -0500
> -Subject: [PATCH 2/2] Weston1.9.0: Allow visual_id to be 0
> +Date: Thu, 9 Mar 2017 14:32:24 -0500
> +Subject: [PATCH 2/4] Weston: Allow visual_id to be 0
>
> The inquiry of visual id from egl API eglGetConfigAttrib(EGL_NATIVE_VISUAL_ID)
> is an optional feature. The visual id will be set to 0 if this feature is
> @@ -14,10 +14,10 @@ Signed-off-by: Eric Ruei <e-ruei1@ti.com>
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/gl-renderer.c b/src/gl-renderer.c
> -index d7231f4..e1b925e 100644
> +index 23c0cd7..4c1f170 100644
> --- a/src/gl-renderer.c
> +++ b/src/gl-renderer.c
> -@@ -2194,7 +2194,7 @@ match_config_to_visual(EGLDisplay egl_display,
> +@@ -2462,7 +2462,7 @@ match_config_to_visual(EGLDisplay egl_display,
> &id))
> continue;
>
> diff --git a/meta-arago-distro/recipes-graphics/wayland/weston_1.11.0.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston_1.11.0.bbappend
> index 60a752b..9a2c3a7 100644
> --- a/meta-arago-distro/recipes-graphics/wayland/weston_1.11.0.bbappend
> +++ b/meta-arago-distro/recipes-graphics/wayland/weston_1.11.0.bbappend
> @@ -2,7 +2,7 @@
> PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor WESTON_NATIVE_BACKEND="fbdev-backend.so",--disable-fbdev-compositor,udev mtdev"
> PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev libgbm mtdev"
>
> -PR_append = ".arago17"
> +PR_append = ".arago18"
BTW, there's no need to bump PR in any of these cases.
In general, manual PR updates have been deprecated upstream for some time.
It's not critical one way or another - i.e. it's not technically required any
more, but it also doesn't hurt. Thus I was allowing it in patches to our
layers, as people just got used to doing it. But if you ever submit anything
upstream, you'll get asked to not bump PR.
There are still some corner cases, when it may help to do so, but in general,
a central PR Service resolves those as well...
--
Denys
> FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
>
> @@ -11,4 +11,5 @@ RDEPENDS_${PN} += "weston-conf"
>
> SRC_URI += " \
> file://0001-udev-seat-restrict-udev-enumeration-to-card0.patch \
> + file://0002-Weston-Allow-visual_id-to-be-0.patch \
> "
> --
> 1.9.1
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 7+ messages in thread
* [morty][PATCH V2 2/5] weston: fix virtual keyboard display issue of QT5 applications
2017-03-09 21:27 [morty][PATCH V2 0/5] weston: re-apply multiple patches from weston 1.9 Eric Ruei
2017-03-09 21:27 ` [morty][PATCH V2 1/5] weston: allow visual_id to be 0 to fix EGL config failure Eric Ruei
@ 2017-03-09 21:27 ` Eric Ruei
2017-03-09 21:27 ` [morty][PATCH V2 3/5] weston: fix touch screen crash issue Eric Ruei
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Eric Ruei @ 2017-03-09 21:27 UTC (permalink / raw)
To: meta-arago
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
...eston-Fix-virtual-keyboard-display-issue-for-QT5-ap.patch} | 11 +++++------
.../recipes-graphics/wayland/weston_1.11.0.bbappend | 3 ++-
2 files changed, 7 insertions(+), 7 deletions(-)
rename meta-arago-distro/recipes-graphics/wayland/weston/{0003-Weston1.9.0-Fix-virtual-keyboard-display-issue-for-Q.patch => 0003-Weston-Fix-virtual-keyboard-display-issue-for-QT5-ap.patch} (81%)
diff --git a/meta-arago-distro/recipes-graphics/wayland/weston/0003-Weston1.9.0-Fix-virtual-keyboard-display-issue-for-Q.patch b/meta-arago-distro/recipes-graphics/wayland/weston/0003-Weston-Fix-virtual-keyboard-display-issue-for-QT5-ap.patch
similarity index 81%
rename from meta-arago-distro/recipes-graphics/wayland/weston/0003-Weston1.9.0-Fix-virtual-keyboard-display-issue-for-Q.patch
rename to meta-arago-distro/recipes-graphics/wayland/weston/0003-Weston-Fix-virtual-keyboard-display-issue-for-QT5-ap.patch
index 576b37e..bdf5626 100644
--- a/meta-arago-distro/recipes-graphics/wayland/weston/0003-Weston1.9.0-Fix-virtual-keyboard-display-issue-for-Q.patch
+++ b/meta-arago-distro/recipes-graphics/wayland/weston/0003-Weston-Fix-virtual-keyboard-display-issue-for-QT5-ap.patch
@@ -1,7 +1,7 @@
-From 7d2f4a97306707fb29e743bf66a827e661aa5615 Mon Sep 17 00:00:00 2001
+From 0d15218ced5bf2e6f3d05758f0f5f21c2a0303f2 Mon Sep 17 00:00:00 2001
From: Eric Ruei <e-ruei1@ti.com>
-Date: Tue, 23 Feb 2016 18:26:57 -0500
-Subject: [PATCH 3/3] Weston1.9.0: Fix virtual keyboard display issue for QT5
+Date: Thu, 9 Mar 2017 14:33:08 -0500
+Subject: [PATCH 3/4] Weston: Fix virtual keyboard display issue for QT5
application
The virtual keyboard does pop up as expected, however, it will never hide
@@ -17,17 +17,16 @@ cannot be hidden.
It is required to set the current_panel to the text_input when the input_panel
becomes visible at the first time.
-
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
src/text-backend.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/text-backend.c b/src/text-backend.c
-index cd6c4d99..ba60949 100644
+index ab4667f..36c70a5 100644
--- a/src/text-backend.c
+++ b/src/text-backend.c
-@@ -338,6 +338,7 @@ text_input_show_input_panel(struct wl_client *client,
+@@ -337,6 +337,7 @@ text_input_show_input_panel(struct wl_client *client,
text_input->surface);
wl_signal_emit(&ec->update_input_panel_signal,
&text_input->cursor_rectangle);
diff --git a/meta-arago-distro/recipes-graphics/wayland/weston_1.11.0.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston_1.11.0.bbappend
index 9a2c3a7..f2e22ca 100644
--- a/meta-arago-distro/recipes-graphics/wayland/weston_1.11.0.bbappend
+++ b/meta-arago-distro/recipes-graphics/wayland/weston_1.11.0.bbappend
@@ -2,7 +2,7 @@
PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor WESTON_NATIVE_BACKEND="fbdev-backend.so",--disable-fbdev-compositor,udev mtdev"
PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev libgbm mtdev"
-PR_append = ".arago18"
+PR_append = ".arago19"
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
@@ -12,4 +12,5 @@ RDEPENDS_${PN} += "weston-conf"
SRC_URI += " \
file://0001-udev-seat-restrict-udev-enumeration-to-card0.patch \
file://0002-Weston-Allow-visual_id-to-be-0.patch \
+ file://0003-Weston-Fix-virtual-keyboard-display-issue-for-QT5-ap.patch \
"
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [morty][PATCH V2 3/5] weston: fix touch screen crash issue
2017-03-09 21:27 [morty][PATCH V2 0/5] weston: re-apply multiple patches from weston 1.9 Eric Ruei
2017-03-09 21:27 ` [morty][PATCH V2 1/5] weston: allow visual_id to be 0 to fix EGL config failure Eric Ruei
2017-03-09 21:27 ` [morty][PATCH V2 2/5] weston: fix virtual keyboard display issue of QT5 applications Eric Ruei
@ 2017-03-09 21:27 ` Eric Ruei
2017-03-09 21:27 ` [morty][PATCH V2 4/5] weston: fix hotplug weston termination problem Eric Ruei
2017-03-09 21:27 ` [morty][PATCH V2 5/5] weston: add RGB565 support for pixman renderer Eric Ruei
4 siblings, 0 replies; 7+ messages in thread
From: Eric Ruei @ 2017-03-09 21:27 UTC (permalink / raw)
To: meta-arago
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
...e.patch => 0004-Weston-Fix-touch-screen-crash-issue.patch} | 11 +++++------
.../recipes-graphics/wayland/weston_1.11.0.bbappend | 3 ++-
2 files changed, 7 insertions(+), 7 deletions(-)
rename meta-arago-distro/recipes-graphics/wayland/weston/{0004-Weston1.9.0-Fix-touch-screen-crash-issue.patch => 0004-Weston-Fix-touch-screen-crash-issue.patch} (79%)
diff --git a/meta-arago-distro/recipes-graphics/wayland/weston/0004-Weston1.9.0-Fix-touch-screen-crash-issue.patch b/meta-arago-distro/recipes-graphics/wayland/weston/0004-Weston-Fix-touch-screen-crash-issue.patch
similarity index 79%
rename from meta-arago-distro/recipes-graphics/wayland/weston/0004-Weston1.9.0-Fix-touch-screen-crash-issue.patch
rename to meta-arago-distro/recipes-graphics/wayland/weston/0004-Weston-Fix-touch-screen-crash-issue.patch
index c221d1c..673ca3d 100644
--- a/meta-arago-distro/recipes-graphics/wayland/weston/0004-Weston1.9.0-Fix-touch-screen-crash-issue.patch
+++ b/meta-arago-distro/recipes-graphics/wayland/weston/0004-Weston-Fix-touch-screen-crash-issue.patch
@@ -1,7 +1,7 @@
-From 9a7c0e7b6ae9700069756b33d2ea726e58b552ed Mon Sep 17 00:00:00 2001
+From 8958bf21960a475d2933e688d0da9a0d2186d509 Mon Sep 17 00:00:00 2001
From: Eric Ruei <e-ruei1@ti.com>
-Date: Wed, 16 Mar 2016 16:50:31 -0400
-Subject: [PATCH 4/4] Weston1.9.0: Fix touch screen crash issue
+Date: Thu, 9 Mar 2017 14:34:18 -0500
+Subject: [PATCH 4/4] Weston: Fix touch screen crash issue
Touch screen operation causes the weston to crash with segment fault sometimes.
The crash occurs when the coordinate (x,y) passed to the weston input module
@@ -9,17 +9,16 @@ is outside the view window, hence the weston compositor is not able to pick
up a display view and there is no code to detect this condition at function
notify_touch().
-
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
src/input.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/input.c b/src/input.c
-index e230c83..fd8e53f 100644
+index 8fe898c..0f72d23 100644
--- a/src/input.c
+++ b/src/input.c
-@@ -1566,6 +1566,12 @@ notify_touch(struct weston_seat *seat, uint32_t time, int touch_id,
+@@ -1848,6 +1848,12 @@ notify_touch(struct weston_seat *seat, uint32_t time, int touch_id,
* until all touch points are up again. */
if (touch->num_tp == 1) {
ev = weston_compositor_pick_view(ec, x, y, &sx, &sy);
diff --git a/meta-arago-distro/recipes-graphics/wayland/weston_1.11.0.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston_1.11.0.bbappend
index f2e22ca..08f2f22 100644
--- a/meta-arago-distro/recipes-graphics/wayland/weston_1.11.0.bbappend
+++ b/meta-arago-distro/recipes-graphics/wayland/weston_1.11.0.bbappend
@@ -2,7 +2,7 @@
PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor WESTON_NATIVE_BACKEND="fbdev-backend.so",--disable-fbdev-compositor,udev mtdev"
PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev libgbm mtdev"
-PR_append = ".arago19"
+PR_append = ".arago20"
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
@@ -13,4 +13,5 @@ SRC_URI += " \
file://0001-udev-seat-restrict-udev-enumeration-to-card0.patch \
file://0002-Weston-Allow-visual_id-to-be-0.patch \
file://0003-Weston-Fix-virtual-keyboard-display-issue-for-QT5-ap.patch \
+ file://0004-Weston-Fix-touch-screen-crash-issue.patch \
"
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [morty][PATCH V2 4/5] weston: fix hotplug weston termination problem
2017-03-09 21:27 [morty][PATCH V2 0/5] weston: re-apply multiple patches from weston 1.9 Eric Ruei
` (2 preceding siblings ...)
2017-03-09 21:27 ` [morty][PATCH V2 3/5] weston: fix touch screen crash issue Eric Ruei
@ 2017-03-09 21:27 ` Eric Ruei
2017-03-09 21:27 ` [morty][PATCH V2 5/5] weston: add RGB565 support for pixman renderer Eric Ruei
4 siblings, 0 replies; 7+ messages in thread
From: Eric Ruei @ 2017-03-09 21:27 UTC (permalink / raw)
To: meta-arago
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
meta-arago-distro/recipes-graphics/wayland/weston_1.11.0.bbappend | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta-arago-distro/recipes-graphics/wayland/weston_1.11.0.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston_1.11.0.bbappend
index 08f2f22..55484b7 100644
--- a/meta-arago-distro/recipes-graphics/wayland/weston_1.11.0.bbappend
+++ b/meta-arago-distro/recipes-graphics/wayland/weston_1.11.0.bbappend
@@ -2,7 +2,7 @@
PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor WESTON_NATIVE_BACKEND="fbdev-backend.so",--disable-fbdev-compositor,udev mtdev"
PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev libgbm mtdev"
-PR_append = ".arago20"
+PR_append = ".arago21"
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
@@ -14,4 +14,5 @@ SRC_URI += " \
file://0002-Weston-Allow-visual_id-to-be-0.patch \
file://0003-Weston-Fix-virtual-keyboard-display-issue-for-QT5-ap.patch \
file://0004-Weston-Fix-touch-screen-crash-issue.patch \
+ file://0001-compositor-drm-fix-hotplug-weston-termination-proble.patch \
"
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [morty][PATCH V2 5/5] weston: add RGB565 support for pixman renderer
2017-03-09 21:27 [morty][PATCH V2 0/5] weston: re-apply multiple patches from weston 1.9 Eric Ruei
` (3 preceding siblings ...)
2017-03-09 21:27 ` [morty][PATCH V2 4/5] weston: fix hotplug weston termination problem Eric Ruei
@ 2017-03-09 21:27 ` Eric Ruei
4 siblings, 0 replies; 7+ messages in thread
From: Eric Ruei @ 2017-03-09 21:27 UTC (permalink / raw)
To: meta-arago
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
...positor-drm-support-RGB565-with-pixman-renderer.patch | 16 ++++++++--------
.../recipes-graphics/wayland/weston_1.11.0.bbappend | 3 ++-
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/meta-arago-distro/recipes-graphics/wayland/weston/0001-compositor-drm-support-RGB565-with-pixman-renderer.patch b/meta-arago-distro/recipes-graphics/wayland/weston/0001-compositor-drm-support-RGB565-with-pixman-renderer.patch
index add2b48..0d77f52 100644
--- a/meta-arago-distro/recipes-graphics/wayland/weston/0001-compositor-drm-support-RGB565-with-pixman-renderer.patch
+++ b/meta-arago-distro/recipes-graphics/wayland/weston/0001-compositor-drm-support-RGB565-with-pixman-renderer.patch
@@ -1,6 +1,6 @@
-From 4d81723304c8260a295ed8be50e9b6cc6cc45543 Mon Sep 17 00:00:00 2001
+From 91b452fa515b94928d32af6e1b1b0405469747fd Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
-Date: Sat, 13 Aug 2016 21:30:23 -0400
+Date: Wed, 8 Mar 2017 13:05:38 -0500
Subject: [PATCH] compositor-drm: support RGB565 with pixman renderer
At the moment only XRGB8888 is supported when using pixman renderer.
@@ -15,10 +15,10 @@ Signed-off-by: Daniel Stone <daniels@collabora.com>
1 file changed, 55 insertions(+), 7 deletions(-)
diff --git a/src/compositor-drm.c b/src/compositor-drm.c
-index a06c98a..6485b39 100644
+index fd89627..443b69a 100644
--- a/src/compositor-drm.c
+++ b/src/compositor-drm.c
-@@ -270,10 +270,12 @@ drm_fb_destroy_callback(struct gbm_bo *bo, void *data)
+@@ -262,10 +262,12 @@ drm_fb_destroy_callback(struct gbm_bo *bo, void *data)
}
static struct drm_fb *
@@ -32,7 +32,7 @@ index a06c98a..6485b39 100644
struct drm_mode_create_dumb create_arg;
struct drm_mode_destroy_dumb destroy_arg;
-@@ -283,8 +285,20 @@ drm_fb_create_dumb(struct drm_backend *b, unsigned width, unsigned height)
+@@ -275,8 +277,20 @@ drm_fb_create_dumb(struct drm_backend *b, unsigned width, unsigned height)
if (!fb)
return NULL;
@@ -54,7 +54,7 @@ index a06c98a..6485b39 100644
create_arg.width = width;
create_arg.height = height;
-@@ -297,8 +311,29 @@ drm_fb_create_dumb(struct drm_backend *b, unsigned width, unsigned height)
+@@ -289,8 +303,29 @@ drm_fb_create_dumb(struct drm_backend *b, unsigned width, unsigned height)
fb->size = create_arg.size;
fb->fd = b->drm.fd;
@@ -86,11 +86,11 @@ index a06c98a..6485b39 100644
if (ret)
goto err_bo;
-@@ -1874,17 +1909,30 @@ drm_output_init_pixman(struct drm_output *output, struct drm_backend *b)
+@@ -1879,17 +1914,30 @@ drm_output_init_pixman(struct drm_output *output, struct drm_backend *b)
{
int w = output->base.current_mode->width;
int h = output->base.current_mode->height;
-+ uint32_t format = output->format;
++ uint32_t format = output->gbm_format;
+ uint32_t pixman_format;
unsigned int i;
diff --git a/meta-arago-distro/recipes-graphics/wayland/weston_1.11.0.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston_1.11.0.bbappend
index 55484b7..f8329c8 100644
--- a/meta-arago-distro/recipes-graphics/wayland/weston_1.11.0.bbappend
+++ b/meta-arago-distro/recipes-graphics/wayland/weston_1.11.0.bbappend
@@ -2,7 +2,7 @@
PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor WESTON_NATIVE_BACKEND="fbdev-backend.so",--disable-fbdev-compositor,udev mtdev"
PACKAGECONFIG[kms] = "--enable-drm-compositor,--disable-drm-compositor,drm udev libgbm mtdev"
-PR_append = ".arago21"
+PR_append = ".arago22"
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
@@ -15,4 +15,5 @@ SRC_URI += " \
file://0003-Weston-Fix-virtual-keyboard-display-issue-for-QT5-ap.patch \
file://0004-Weston-Fix-touch-screen-crash-issue.patch \
file://0001-compositor-drm-fix-hotplug-weston-termination-proble.patch \
+ file://0001-compositor-drm-support-RGB565-with-pixman-renderer.patch \
"
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread