Skip to contentSkip to conversation

ti-dmai: Fixes for Display and Capture.

PATCH In review Joel A Fernandes 2 participants 2 messages Jun 25, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ti-dmai: Fixes for Display and Capture.

These patches fix issues with display and capture in ti-dmai that cause it to break with recent kernels.

---
 recipes/ti/ti-dmai.inc                             |    4 +
 ...display-Set-the-default-Display-Output-to.patch |   26 +++++
 ...o-detect-V4L2-display-device-node-to-open.patch |  109 ++++++++++++++++++++
 ...e-display-rotation-to-avoid-problems-due-.patch |   29 +++++
 ...-DMAI-Use-the-correct-capture-device-node.patch |   26 +++++
 5 files changed, 194 insertions(+), 0 deletions(-)
 create mode 100644 recipes/ti/ti-dmai/beagle/0001-DMAI-video_display-Set-the-default-Display-Output-to.patch
 create mode 100644 recipes/ti/ti-dmai/beagle/0002-DMAI-Auto-detect-V4L2-display-device-node-to-open.patch
 create mode 100644 recipes/ti/ti-dmai/beagle/0003-DMAI-Disable-display-rotation-to-avoid-problems-due-.patch
 create mode 100644 recipes/ti/ti-dmai/beagle/0004-DMAI-Use-the-correct-capture-device-node.patch
recipes/ti/ti-dmai.inc +4 -0
index c3a0f71..a5a11a1 100644
@@ -27,6 +27,10 @@ SRC_URI = "svn://gforge.ti.com/svn/dmai/;module=${DMAIBRANCH};proto=https;user=a
 		file://loadmodules-ti-dmai-ol138_al.sh \
 	    file://doxygen_templates.tar.gz \
         file://arago-tdox \
+                file://beagle/0001-DMAI-video_display-Set-the-default-Display-Output-to.patch \
+                file://beagle/0002-DMAI-Auto-detect-V4L2-display-device-node-to-open.patch \
+                file://beagle/0003-DMAI-Disable-display-rotation-to-avoid-problems-due-.patch \
+                file://beagle/0004-DMAI-Use-the-correct-capture-device-node.patch \
 	"
 
 DEPENDS = "virtual/kernel alsa-lib ti-framework-components ti-codec-engine ti-xdctools"
recipes/ti/ti-dmai/beagle/0001-DMAI-video_display-Set-the-default-Display-Output-to.patch new file +26 -0
new file mode 100644
index 0000000..fce8272
@@ -0,0 +1,26 @@
+From c584fc4593fc95c24facc8521a8a1180a0bc7b13 Mon Sep 17 00:00:00 2001
+From: Joel <joel@chase-ubuntu.(none)>
+Date: Mon, 20 Jun 2011 16:59:54 -0500
+Subject: [PATCH 1/4] DMAI video_display: Set the default Display Output to DVI.
+
+Signed-off-by: Joel A Fernandes <[email protected]>
+---
+ apps/video_display/linux/main.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+packages/ti/sdo/dmai
+diff --git a/packages/ti/sdo/dmai/apps/video_display/linux/main.c b/packages/ti/sdo/dmai/apps/video_display/linux/main.c
+index 15182b7..496d19c 100644
+--- a/packages/ti/sdo/dmai/apps/video_display/linux/main.c
++++ b/packages/ti/sdo/dmai/apps/video_display/linux/main.c
+@@ -45,7 +45,7 @@
+ #include "../appMain.h"
+ 
+ /* Default arguments for app */
+-#define DEFAULT_ARGS { 1000, FALSE, FALSE, VideoStd_D1_NTSC, Display_Output_COMPOSITE }
++#define DEFAULT_ARGS { 1000, FALSE, FALSE, VideoStd_D1_NTSC, Display_Output_DVI }
+ 
+ /*
+  * Argument IDs for long options. They must not conflict with ASCII values,
+-- 
+1.7.0.4
+
recipes/ti/ti-dmai/beagle/0002-DMAI-Auto-detect-V4L2-display-device-node-to-open.patch new file +109 -0

109 lines not on this page · raw message

recipes/ti/ti-dmai/beagle/0003-DMAI-Disable-display-rotation-to-avoid-problems-due-.patch new file +29 -0
new file mode 100644
index 0000000..924e301
@@ -0,0 +1,29 @@
+From 46cb37b4b2efdcc8fb9d2edf8e08a3b0e1c15f80 Mon Sep 17 00:00:00 2001
+From: Joel A Fernandes <[email protected]>
+Date: Tue, 21 Jun 2011 15:53:32 -0500
+Subject: [PATCH 3/4] DMAI: Disable display rotation to avoid problems due to not passing vrfb in bootargs
+
+Disable display rotation as it is not known to be used by many users and can result
+in problems if vrfb is not passed in bootargs.
+
+Signed-off-by: Joel A Fernandes <[email protected]>
+---
+ linux/omap3530/Display_v4l2.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/packages/ti/sdo/dmai/linux/omap3530/Display_v4l2.c b/packages/ti/sdo/dmai/linux/omap3530/Display_v4l2.c
+index 61f15bb..3cfd75d 100644
+--- a/packages/ti/sdo/dmai/linux/omap3530/Display_v4l2.c
++++ b/packages/ti/sdo/dmai/linux/omap3530/Display_v4l2.c
+@@ -174,6 +174,8 @@ Display_Handle Display_v4l2_create(BufTab_Handle hBufTab, Display_Attrs *attrs)
+         return NULL;
+     }
+     
++#undef V4L2_CID_ROTATE
++
+ #if defined(V4L2_CID_ROTATE)
+     /* Make rotation by default 0 for DVI and S-video*/
+ 
+-- 
+1.7.0.4
+
recipes/ti/ti-dmai/beagle/0004-DMAI-Use-the-correct-capture-device-node.patch new file +26 -0
new file mode 100644
index 0000000..35a4043
@@ -0,0 +1,26 @@
+From 5e59be7d0d5d3d90e9bbc5d1bb5829ad8482fbf0 Mon Sep 17 00:00:00 2001
+From: Joel A Fernandes <[email protected]>
+Date: Fri, 24 Jun 2011 17:04:10 -0500
+Subject: [PATCH 4/4] DMAI: Use the correct capture device node.
+
+Signed-off-by: Joel A Fernandes <[email protected]>
+---
+ linux/Capture.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/packages/ti/sdo/dmai/linux/Capture.c b/packages/ti/sdo/dmai/linux/Capture.c
+index e7a081e..a2614e7 100644
+--- a/packages/ti/sdo/dmai/linux/Capture.c
++++ b/packages/ti/sdo/dmai/linux/Capture.c
+@@ -120,7 +120,7 @@ const Capture_Attrs Capture_Attrs_OMAP3530_DEFAULT = {
+     -1,
+     -1,
+     -1,
+-    "/dev/video0",
++    "/dev/video2",
+     FALSE,
+     VideoStd_AUTO,
+     -1,
+-- 
+1.7.0.4
+
Signature · 1 line
1.7.0.4
#1 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 1 line · Joel A Fernandes

These patches fix issues with display and capture in ti-dmai that cause it to break with recent kernels.

Thanks, I applied your patch, but one of them might need an update later on:

Quoted 13 lines
recipes/ti/ti-dmai/beagle/0004-DMAI-Use-the-correct-capture-device-node.patch new file +13 -0
+From 5e59be7d0d5d3d90e9bbc5d1bb5829ad8482fbf0 Mon Sep 17 00:00:00 2001
+From: Joel A Fernandes <[email protected]>
+Date: Fri, 24 Jun 2011 17:04:10 -0500
+Subject: [PATCH 4/4] DMAI: Use the correct capture device node.
+
+Signed-off-by: Joel A Fernandes <[email protected]>
+---
+ linux/Capture.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/packages/ti/sdo/dmai/linux/Capture.c b/packages/ti/sdo/dmai/linux/Capture.c
+index e7a081e..a2614e7 100644
+--- a/packages/ti/sdo/dmai/linux/Capture.c

recipes/ti/ti-dmai/beagle/0004-DMAI-Use-the-correct-capture-device-node.patch line 23

Quoted 10 lines
recipes/ti/ti-dmai/beagle/0004-DMAI-Use-the-correct-capture-device-node.patch new file +10 -0
++++ b/packages/ti/sdo/dmai/linux/Capture.c
+@@ -120,7 +120,7 @@ const Capture_Attrs Capture_Attrs_OMAP3530_DEFAULT = {
+     -1,
+     -1,
+     -1,
+-    "/dev/video0",
++    "/dev/video2",
+     FALSE,
+     VideoStd_AUTO,
+     -1,

This is still dependant in which order modules get loaded, so like with the output patch it would be better to iterate over

/sys/class/video4linux/video*/name

And look for the usual suspects (e.g. "OMAP3 ISP CCDC output" on omap3). I'm not sure how well that works on other platforms, which I why this patch went in as is :)

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFOBZJyMkyGM64RGpERAgcGAKCGQ/R8hzFpOLaeMQYmvsKEvu2wWACeL70H ipxR1rKruT7mLTJtpSdKHLU=
=Q0F8
-----END PGP SIGNATURE-----