All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Re-enable dual camera demo on AM4
@ 2016-02-26 16:53 Eric Ruei
  2016-02-26 19:20 ` Denys Dmytriyenko
  0 siblings, 1 reply; 5+ messages in thread
From: Eric Ruei @ 2016-02-26 16:53 UTC (permalink / raw)
  To: meta-arago

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>
---
V2 Changes: Remove DOS <CR> from dual_camera_qt5.sh

 .../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



^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH] Re-enable dual camera demo on AM4
@ 2016-02-25 19:18 Eric Ruei
  0 siblings, 0 replies; 5+ messages in thread
From: Eric Ruei @ 2016-02-25 19:18 UTC (permalink / raw)
  To: meta-arago

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>
---
 .../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..151b13b 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



^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2016-02-26 19:53 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-26 16:53 [PATCH] Re-enable dual camera demo on AM4 Eric Ruei
2016-02-26 19:20 ` Denys Dmytriyenko
2016-02-26 19:46   ` Ruei, Eric
2016-02-26 19:53     ` Denys Dmytriyenko
  -- strict thread matches above, loose matches on Subject: below --
2016-02-25 19:18 Eric Ruei

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.