[PATCH V3] dual-camera-demo: Re-enable on AM4 to run outside of Weston

[PATCH V3] dual-camera-demo: Re-enable on AM4 to run outside of Weston

[Eric Ruei]

The dual camera demo stopped working when Wayland/DRM-based graphics support
was introduced on AM4 and therefore this demo was disabled. This demo does not
work with Wayland/DRM-based graphics system because it invokes DRM APIs to
demonstrate DRM mode setings and overlay operations and those operations
are denied because there should be only one DRM master.

The simple solution is to update the demo script to run this QT5-based demo
program over linuxfb platform and therefore there is not another DRM master
running.

Signed-off-by: Eric Ruei <e-ruei1@ti.com>
---
V3 changes: Update subject per review comments

 .../dual-camera-demo/dual-camera-demo/dual_camera_qt5.sh         | 9 +++++----
 .../recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb  | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/dual_camera_qt5.sh b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/dual_camera_qt5.sh
index 9bf560b..4802337 100644
--- a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/dual_camera_qt5.sh
+++ b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/dual_camera_qt5.sh
@@ -1,12 +1,13 @@
 #!/bin/bash
 
-/etc/init.d/matrix-gui-2.0 stop
+/etc/init.d/weston stop
+sleep 1
 
 echo 0 > /sys/class/graphics/fbcon/cursor_blink
 
-dual_camera
+dual_camera -platform linuxfb
 
 echo 1 > /sys/class/graphics/fbcon/cursor_blink
 
-/etc/init.d/matrix-gui-2.0 start
-
+/etc/init.d/weston start
+sleep 1
diff --git a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb
index 43bf00d..1b1a146 100644
--- a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb
+++ b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c7ca707704d3354a64feeb4f19f52eb5"
 DEPENDS += "libdrm"
 require recipes-core/matrix/matrix-gui-paths.inc
 
-PR = "r12"
+PR = "r13"
 
 BRANCH = "drm"
 SRCREV = "3be10676149c5f6e0ef1660d6b1ee4b9165dd993"
-- 
1.9.1

Re: [PATCH V3] dual-camera-demo: Re-enable on AM4 to run outside of Weston

[Denys Dmytriyenko]

Ack

On Fri, Feb 26, 2016 at 02:45:08PM -0500, Eric Ruei wrote:
> The dual camera demo stopped working when Wayland/DRM-based graphics support
> was introduced on AM4 and therefore this demo was disabled. This demo does not
> work with Wayland/DRM-based graphics system because it invokes DRM APIs to
> demonstrate DRM mode setings and overlay operations and those operations
> are denied because there should be only one DRM master.
> 
> The simple solution is to update the demo script to run this QT5-based demo
> program over linuxfb platform and therefore there is not another DRM master
> running.
> 
> Signed-off-by: Eric Ruei <e-ruei1@ti.com>
> ---
> V3 changes: Update subject per review comments
> 
>  .../dual-camera-demo/dual-camera-demo/dual_camera_qt5.sh         | 9 +++++----
>  .../recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb  | 2 +-
>  2 files changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/dual_camera_qt5.sh b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/dual_camera_qt5.sh
> index 9bf560b..4802337 100644
> --- a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/dual_camera_qt5.sh
> +++ b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo/dual_camera_qt5.sh
> @@ -1,12 +1,13 @@
>  #!/bin/bash
>  
> -/etc/init.d/matrix-gui-2.0 stop
> +/etc/init.d/weston stop
> +sleep 1
>  
>  echo 0 > /sys/class/graphics/fbcon/cursor_blink
>  
> -dual_camera
> +dual_camera -platform linuxfb
>  
>  echo 1 > /sys/class/graphics/fbcon/cursor_blink
>  
> -/etc/init.d/matrix-gui-2.0 start
> -
> +/etc/init.d/weston start
> +sleep 1
> diff --git a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb
> index 43bf00d..1b1a146 100644
> --- a/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb
> +++ b/meta-arago-extras/recipes-multimedia/dual-camera-demo/dual-camera-demo_1.0.bb
> @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c7ca707704d3354a64feeb4f19f52eb5"
>  DEPENDS += "libdrm"
>  require recipes-core/matrix/matrix-gui-paths.inc
>  
> -PR = "r12"
> +PR = "r13"
>  
>  BRANCH = "drm"
>  SRCREV = "3be10676149c5f6e0ef1660d6b1ee4b9165dd993"
> -- 
> 1.9.1
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago