Skip to contentSkip to conversation

ti-gfx: add patch to fix build failure with es5.x

PATCH New Hadrien Boutteville 3 participants 3 messages Jul 18, 2014 – Jul 19, 2014

lore
Share & tools
lore

Hadrien Boutteville

author
#0 lore raw

PATCH v2 1/1 ti-gfx: add patch to fix build failure with es5.x

Since commit a73fdc647417699833f22d0f239affe22e062827 in the kernel, omap_dss_device's 'output' is renamed 'src'.

Build with es5.x fails because ti-gfx still uses 'output'.

Fix build with at least es5.x selected (AM35xx).

Signed-off-by Hadrien Boutteville <[email protected]>
Cc Thomas Petazzoni <[email protected]>
Cc "Yann E. MORIN" <[email protected]>

---
Changes v1 -> v2:
- add a condition on LINUX_VERSION_CODE (Thomas)

---
 .../ti-gfx-0001-fix-build-omaplfb-linux.patch       | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 package/ti-gfx/ti-gfx-0001-fix-build-omaplfb-linux.patch
package/ti-gfx/ti-gfx-0001-fix-build-omaplfb-linux.patch new file +21 -0
new file mode 100644
index 0000000..002d01c
@@ -0,0 +1,21 @@
+Since commit a73fdc647417699833f22d0f239affe22e062827 in the kernel,
+omap_dss_device's 'output' is renamed 'src'.
+
+Fix build with at least es5.x selected (AM35xx).
+
+Signed-off-by: Hadrien Boutteville <[email protected]>
+
+--- a/GFX_Linux_KM/services4/3rdparty/dc_omapfb3_linux/omaplfb_linux.c
++++ b/GFX_Linux_KM/services4/3rdparty/dc_omapfb3_linux/omaplfb_linux.c
+@@ -176,8 +176,10 @@
+ #define OMAP_DSS_DRIVER(drv, dev) struct omap_dss_driver *drv = (dev) != NULL ? (dev)->driver : NULL
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0))
+ #define OMAP_DSS_MANAGER(man, dev) struct omap_overlay_manager *man = (dev) != NULL ? (dev)->manager : NULL
+-#else
++#elif (LINUX_VERSION_CODE < KERNEL_VERSION(3,12,0))
+ #define OMAP_DSS_MANAGER(man, dev) struct omap_overlay_manager *man = (dev) != NULL ? (dev)->output->manager : NULL
++#else
++#define OMAP_DSS_MANAGER(man, dev) struct omap_overlay_manager *man = (dev) != NULL ? (dev)->src->manager : NULL
+ #endif
+ 
+ #define	WAIT_FOR_VSYNC(man)	((man)->wait_for_vsync)
Signature · 1 line
2.0.1
#1 lore raw

PATCH v2 1/1 ti-gfx: add patch to fix build failure with es5.x

Hadrien, All,

On 2014-07-18 18:46 +0200, Hadrien Boutteville spake thusly:

Quoted 10 lines

Since commit a73fdc647417699833f22d0f239affe22e062827 in the kernel, omap_dss_device's 'output' is renamed 'src'.

Build with es5.x fails because ti-gfx still uses 'output'.

Fix build with at least es5.x selected (AM35xx).

Signed-off-by Hadrien Boutteville <[email protected]>
Cc Thomas Petazzoni <[email protected]>
Cc "Yann E. MORIN" <[email protected]>
Reviewed-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 38 lines

---
Changes v1 -> v2:
- add a condition on LINUX_VERSION_CODE (Thomas)

---
 .../ti-gfx-0001-fix-build-omaplfb-linux.patch       | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 package/ti-gfx/ti-gfx-0001-fix-build-omaplfb-linux.patch
package/ti-gfx/ti-gfx-0001-fix-build-omaplfb-linux.patch new file +21 -0
new file mode 100644
index 0000000..002d01c
@@ -0,0 +1,21 @@
+Since commit a73fdc647417699833f22d0f239affe22e062827 in the kernel,
+omap_dss_device's 'output' is renamed 'src'.
+
+Fix build with at least es5.x selected (AM35xx).
+
+Signed-off-by: Hadrien Boutteville <[email protected]>
+
+--- a/GFX_Linux_KM/services4/3rdparty/dc_omapfb3_linux/omaplfb_linux.c
++++ b/GFX_Linux_KM/services4/3rdparty/dc_omapfb3_linux/omaplfb_linux.c
+@@ -176,8 +176,10 @@
+ #define OMAP_DSS_DRIVER(drv, dev) struct omap_dss_driver *drv = (dev) != NULL ? (dev)->driver : NULL
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0))
+ #define OMAP_DSS_MANAGER(man, dev) struct omap_overlay_manager *man = (dev) != NULL ? (dev)->manager : NULL
+-#else
++#elif (LINUX_VERSION_CODE < KERNEL_VERSION(3,12,0))
+ #define OMAP_DSS_MANAGER(man, dev) struct omap_overlay_manager *man = (dev) != NULL ? (dev)->output->manager : NULL
++#else
++#define OMAP_DSS_MANAGER(man, dev) struct omap_overlay_manager *man = (dev) != NULL ? (dev)->src->manager : NULL
+ #endif
+ 
+ #define	WAIT_FOR_VSYNC(man)	((man)->wait_for_vsync)
Signature · 1 line
2.0.1
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
Applied
#2 lore raw

PATCH v2 1/1 ti-gfx: add patch to fix build failure with es5.x

In reply to Hadrien Boutteville

Dear Hadrien Boutteville,

Quoted 10 lines · Hadrien Boutteville

Since commit a73fdc647417699833f22d0f239affe22e062827 in the kernel, omap_dss_device's 'output' is renamed 'src'.

Build with es5.x fails because ti-gfx still uses 'output'.

Fix build with at least es5.x selected (AM35xx).

Signed-off-by Hadrien Boutteville <[email protected]>
Cc Thomas Petazzoni <[email protected]>
Cc "Yann E. MORIN" <[email protected]>

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com