* [meta-fsl-arm][PATCH v3 0/8] iMX6Q BSP 1.1.0 upgrade
@ 2013-02-06 18:42 Otavio Salvador
2013-02-06 18:42 ` [meta-fsl-arm][PATCH v3 1/8] gpu-viv-bin-mx6q: Upgrade to 1.1.0 Otavio Salvador
` (8 more replies)
0 siblings, 9 replies; 13+ messages in thread
From: Otavio Salvador @ 2013-02-06 18:42 UTC (permalink / raw)
To: meta-freescale Mailing List; +Cc: Otavio Salvador
Hello,
This patch series upgrades the iMX6Q BSP to 1.1.0; it also try to fix
the DRI support for it.
Please give it a try as this is a huge upgrade and we might have
regressions and pending issues still unkown. This series depends on a
cuple of patches I sent to OpenEmbeeded-Core mailing list for
xserver-xorg and mesa, please apply them before playing with this
series.
Changes for v3:
- Drop merged patches
- Add upgrade of linux-fslc kernel to 3.7.5
Changes for v2:
- Fix build error due wrong dependency order between Xorg driver and
DRI;
- Avoid installation of DRI headers as those are provided by Xorg;
- Add upgrade of linux-fslc;
- Drop merged patches.
Andrei Gherzan (2):
gpu-viv-bin-mx6q: Add dri.pc
glproto: Don't install glxtokens.h for imx6qsabrelite
Otavio Salvador (6):
gpu-viv-bin-mx6q: Upgrade to 1.1.0
xf86-video-imxfb-vivante: Upgrade to 1.1.0
linux-fslc: Update to 3.7.5 based kernel
xserver-xorg: Override PACKAGECONFIG for i.MX6 to enable DRI support
xf86-dri-vivante: Upgrade to 1.1.0
xf86-video-imxfb-vivante: Add depends/rdepends for DRI support
.../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 43 ++++---
.../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/dri.pc | 11 ++
...-mx6q_12.09.01.bb => gpu-viv-bin-mx6q_1.1.0.bb} | 5 +-
.../xf86-dri-vivante/fix-with-xorg-1-13.patch | 141 +++++++++++++++++++++
.../xorg-driver/xf86-dri-vivante_1.1.0.bb | 45 +++++++
.../xorg-driver/xf86-dri-vivante_12.09.01.bb | 36 ------
.../Makefile.am-remove-prefixed-include-path.patch | 2 +
.../fix-vivante-compile.patch | 86 ++++++-------
....09.01.bb => xf86-video-imxfb-vivante_1.1.0.bb} | 16 ++-
.../xorg-proto/glproto_1.4.16.bbappend | 8 ++
.../xorg-xserver/xserver-xorg_1.13.1.bbappend | 4 +
recipes-kernel/linux/linux-fslc_3.7.bb | 4 +-
12 files changed, 289 insertions(+), 112 deletions(-)
create mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/dri.pc
rename recipes-graphics/gpu-viv-bin-mx6q/{gpu-viv-bin-mx6q_12.09.01.bb => gpu-viv-bin-mx6q_1.1.0.bb} (51%)
create mode 100644 recipes-graphics/xorg-driver/xf86-dri-vivante/fix-with-xorg-1-13.patch
create mode 100644 recipes-graphics/xorg-driver/xf86-dri-vivante_1.1.0.bb
delete mode 100644 recipes-graphics/xorg-driver/xf86-dri-vivante_12.09.01.bb
rename recipes-graphics/xorg-driver/{xf86-video-imxfb-vivante_12.09.01.bb => xf86-video-imxfb-vivante_1.1.0.bb} (65%)
create mode 100644 recipes-graphics/xorg-proto/glproto_1.4.16.bbappend
create mode 100644 recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend
--
1.8.1
^ permalink raw reply [flat|nested] 13+ messages in thread
* [meta-fsl-arm][PATCH v3 1/8] gpu-viv-bin-mx6q: Upgrade to 1.1.0
2013-02-06 18:42 [meta-fsl-arm][PATCH v3 0/8] iMX6Q BSP 1.1.0 upgrade Otavio Salvador
@ 2013-02-06 18:42 ` Otavio Salvador
2013-02-06 18:42 ` [meta-fsl-arm][PATCH v3 2/8] xf86-video-imxfb-vivante: " Otavio Salvador
` (7 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Otavio Salvador @ 2013-02-06 18:42 UTC (permalink / raw)
To: meta-freescale Mailing List; +Cc: Otavio Salvador
This drops the DirectFB files while we do not have support for it and
ensure all packages need to choose the proper backend to link to as we
remove the generic link pointing to a default backend.
Change-Id: I6f1fa9b4426b0855b5d5ea6f04979081506e0d41
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
.../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 33 +++++++++++-----------
...-mx6q_12.09.01.bb => gpu-viv-bin-mx6q_1.1.0.bb} | 5 ++--
2 files changed, 20 insertions(+), 18 deletions(-)
rename recipes-graphics/gpu-viv-bin-mx6q/{gpu-viv-bin-mx6q_12.09.01.bb => gpu-viv-bin-mx6q_1.1.0.bb} (51%)
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
index 1f63a0b..4f584dd 100644
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
+++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
@@ -4,10 +4,10 @@
DESCRIPTION = "GPU driver and apps for imx6"
SECTION = "libs"
LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://usr/include/gc_vdk.h;endline=11;md5=092bc28e13d678ceaebe1a40559275fb"
+LIC_FILES_CHKSUM = "file://usr/include/gc_vdk.h;endline=11;md5=c831981a5cbb2673318b77fb2f07014c"
PROVIDES += "virtual/libgal-x11 virtual/egl virtual/libgles1 virtual/libgles2 libvivante-dri-mx6"
-INC_PR = "r1"
+INC_PR = "r2"
inherit fsl-eula-unpack
@@ -38,6 +38,7 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
# FIXME: The provided binary doesn't provide soname. If in future BSP
# release the libraries are fixed, we can drop this hack.
+REALSOLIBS := "${SOLIBS}"
SOLIBS = "${SOLIBSDEV}"
# FIXME: All binaries lack GNU_HASH in elf binary but as we don't have
@@ -52,16 +53,22 @@ do_install () {
install -d ${D}${libdir}/dri
install -d ${D}${includedir}
- cp ${S}/usr/lib/*.so ${D}${libdir}
- cp -axr ${S}/usr/include/* ${D}${includedir}
-
- cp -axr ${S}/opt ${D}
-
- # Move DRI library to proper path
- mv ${D}${libdir}/vivante_dri.so ${D}${libdir}/dri
+ cp -rP ${S}/usr/lib/* ${D}${libdir}
+ cp -rP ${S}/usr/include/* ${D}${includedir}
+ cp -rP ${S}/opt ${D}
find ${D}${libdir} -type f -exec chmod 644 {} \;
find ${D}${includedir} -type f -exec chmod 644 {} \;
+
+ # FIXME: Drop default library as we need to explicit link to one
+ # of supported backends
+ rm ${D}${libdir}/libEGL.so \
+ ${D}${libdir}/libGAL.so \
+ ${D}${libdir}/libVIVANTE.so
+
+ # FIXME: Drop directfb backport as 1.4 version is not supported in Yocto
+ rm -r ${D}${libdir}/directfb-1.4-0 \
+ ${D}${libdir}/*-dfb.so
}
S = "${WORKDIR}/${PN}-${PV}"
@@ -75,9 +82,7 @@ FILES_libclc-mx6 = "${libdir}/libCLC${SOLIBS}"
FILES_libclc-mx6-dev = "${includedir}/CL ${libdir}/libCLC${SOLIBSDEV}"
FILES_libclc-mx6-dbg = "${libdir}/.debug/libCLC${SOLIBS}"
-FILES_libegl-common-mx6 = "${libdir}/libEGL${SOLIBS}"
FILES_libegl-common-mx6-dev = "${includedir}/EGL ${libdir}/libEGL${SOLIBSDEV}"
-FILES_libegl-common-mx6-dbg = "${libdir}/.debug/libEGL${SOLIBS}"
FILES_libegl-fb-mx6 = "${libdir}/libEGL-fb${SOLIBS}"
FILES_libegl-fb-mx6-dev = "${libdir}/libEGL-fb${SOLIBSDEV}"
@@ -87,9 +92,7 @@ FILES_libegl-x11-mx6 = "${libdir}/libEGL-x11${SOLIBS}"
FILES_libegl-x11-mx6-dev = "${libdir}/libEGL-x11${SOLIBSDEV}"
FILES_libegl-x11-mx6-dbg = "${libdir}/.debug/libEGL-x11${SOLIBS}"
-FILES_libgal-common-mx6 = "${libdir}/libGAL${SOLIBS}"
FILES_libgal-common-mx6-dev = "${includedir}/HAL ${libdir}/libGAL${SOLIBSDEV}"
-FILES_libgal-common-mx6-dbg = "${libdir}/.debug/libGAL${SOLIBS}"
FILES_libgal-fb-mx6 = "${libdir}/libGAL-fb${SOLIBS}"
FILES_libgal-fb-mx6-dev = "${libdir}/libGAL-fb${SOLIBSDEV}"
@@ -107,7 +110,7 @@ FILES_libgles2-mx6 = "${libdir}/libGLESv2${SOLIBS}"
FILES_libgles2-mx6-dev = "${includedir}/GLES2 ${libdir}/libGLESv2${SOLIBSDEV}"
FILES_libgles2-mx6-dbg = "${libdir}/.debug/libGLESv2${SOLIBS}"
-FILES_libgl-mx6 = "${libdir}/libGL${SOLIBS}"
+FILES_libgl-mx6 = "${libdir}/libGL${REALSOLIBS}"
FILES_libgl-mx6-dev = "${includedir}/GL ${libdir}/libGL${SOLIBSDEV}"
FILES_libgl-mx6-dbg = "${libdir}/.debug/libGL${SOLIBS}"
@@ -127,9 +130,7 @@ FILES_libvdk-mx6 = "${libdir}/libVDK${SOLIBS}"
FILES_libvdk-mx6-dev = "${includedir}/*vdk.h ${libdir}/libVDK${SOLIBSDEV}"
FILES_libvdk-mx6-dbg = "${libdir}/.debug/libVDK${SOLIBS}"
-FILES_libvivante-common-mx6 = "${libdir}/libVIVANTE${SOLIBS}"
FILES_libvivante-common-mx6-dev = "${includedir}/HAL ${libdir}/libVIVANTE${SOLIBSDEV}"
-FILES_libvivante-common-mx6-dbg = "${libdir}/.debug/libVIVANTE${SOLIBS}"
FILES_libvivante-fb-mx6 = "${libdir}/libVIVANTE-fb${SOLIBS}"
FILES_libvivante-fb-mx6-dev = "${libdir}/libVIVANTE-fb${SOLIBSDEV}"
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_12.09.01.bb b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bb
similarity index 51%
rename from recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_12.09.01.bb
rename to recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bb
index c54ad19..3de9555 100644
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_12.09.01.bb
+++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_1.1.0.bb
@@ -2,8 +2,9 @@
# Released under the MIT license (see COPYING.MIT for the terms)
PR = "${INC_PR}.0"
+PE = "1"
include gpu-viv-bin-mx6q.inc
-SRC_URI[md5sum] = "9f2c43b6eae468df6cc6fd75efd00bc5"
-SRC_URI[sha256sum] = "2cec10c1d69bce75a7c2a4482eb3ed29b171578c3b01c5b4ef2cc868ca327330"
+SRC_URI[md5sum] = "60f4ba65f557fc63fde6dacfeef205a8"
+SRC_URI[sha256sum] = "4238b72a6dad2d075d159bb1e86fb68bbed7c27894ce82c546a8e7c58ae5d683"
--
1.8.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [meta-fsl-arm][PATCH v3 2/8] xf86-video-imxfb-vivante: Upgrade to 1.1.0
2013-02-06 18:42 [meta-fsl-arm][PATCH v3 0/8] iMX6Q BSP 1.1.0 upgrade Otavio Salvador
2013-02-06 18:42 ` [meta-fsl-arm][PATCH v3 1/8] gpu-viv-bin-mx6q: Upgrade to 1.1.0 Otavio Salvador
@ 2013-02-06 18:42 ` Otavio Salvador
2013-02-06 18:42 ` [meta-fsl-arm][PATCH v3 3/8] linux-fslc: Update to 3.7.5 based kernel Otavio Salvador
` (6 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Otavio Salvador @ 2013-02-06 18:42 UTC (permalink / raw)
To: meta-freescale Mailing List; +Cc: Otavio Salvador
The new version packages Xorg driver and DRI source in same source
package however for our use case this is worse so we workaround this
packaging both separate.
Change-Id: I66fdd5cd5e8b1b860bc065dd7f5f2a3cc87a43ed
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
.../Makefile.am-remove-prefixed-include-path.patch | 2 +
.../fix-vivante-compile.patch | 86 ++++++++++------------
....09.01.bb => xf86-video-imxfb-vivante_1.1.0.bb} | 12 +--
3 files changed, 48 insertions(+), 52 deletions(-)
rename recipes-graphics/xorg-driver/{xf86-video-imxfb-vivante_12.09.01.bb => xf86-video-imxfb-vivante_1.1.0.bb} (74%)
diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Makefile.am-remove-prefixed-include-path.patch b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Makefile.am-remove-prefixed-include-path.patch
index 4354ae4..c44f01a 100644
--- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Makefile.am-remove-prefixed-include-path.patch
+++ b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Makefile.am-remove-prefixed-include-path.patch
@@ -6,6 +6,8 @@ Subject: [PATCH] Makefile.am remove prefixed include path
* Remove prefixed include path, use ${STAGING_INCDIR}
to locate drm headers.
+Upstream-Status: Pending
+
Signed-off-by: Adrian Alonso <aalonso00@gmail.com>
---
src/Makefile.am | 2 +-
diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/fix-vivante-compile.patch b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/fix-vivante-compile.patch
index d92acce..bdbd2eb 100644
--- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/fix-vivante-compile.patch
+++ b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/fix-vivante-compile.patch
@@ -4,10 +4,10 @@ versions of the X server.
Upstream-Status: Pending
-Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante_dri.h
+Index: xserver-xorg-video-imx-viv-1.1.0/src/vivante_fbdev/vivante_dri.h
===================================================================
---- xserver-xorg-video-imx-viv-12.09.01.orig/src/vivante_fbdev/vivante_dri.h
-+++ xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante_dri.h
+--- xserver-xorg-video-imx-viv-1.1.0.orig/src/vivante_fbdev/vivante_dri.h
++++ xserver-xorg-video-imx-viv-1.1.0/src/vivante_fbdev/vivante_dri.h
@@ -67,7 +67,7 @@ typedef struct _vvtDeviceInfoRec {
} vvtDeviceInfo;
@@ -17,19 +17,11 @@ Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante_dri.h
Bool VivDRIFinishScreenInit(ScreenPtr pScreen);
#endif /* _VIVANTE_DRI_H_ */
-Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante_fbdev_driver.c
+Index: xserver-xorg-video-imx-viv-1.1.0/src/vivante_fbdev/vivante_fbdev_driver.c
===================================================================
---- xserver-xorg-video-imx-viv-12.09.01.orig/src/vivante_fbdev/vivante_fbdev_driver.c
-+++ xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante_fbdev_driver.c
-@@ -19,7 +19,6 @@
- *****************************************************************************/
-
-
--
- #include "vivante_common.h"
- #include "vivante.h"
- #include "vivante_exa.h"
-@@ -54,9 +53,8 @@ static const OptionInfoRec *VivAvailable
+--- xserver-xorg-video-imx-viv-1.1.0.orig/src/vivante_fbdev/vivante_fbdev_driver.c
++++ xserver-xorg-video-imx-viv-1.1.0/src/vivante_fbdev/vivante_fbdev_driver.c
+@@ -53,9 +53,8 @@ static const OptionInfoRec *VivAvailable
static void VivIdentify(int flags);
static Bool VivProbe(DriverPtr drv, int flags);
static Bool VivPreInit(ScrnInfoPtr pScrn, int flags);
@@ -41,7 +33,7 @@ Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante_fbdev_drive
static Bool VivDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op,
pointer ptr);
-@@ -178,7 +176,7 @@ VivSetup(pointer module, pointer opts, i
+@@ -175,7 +174,7 @@ VivSetup(pointer module, pointer opts, i
static Bool InitExaLayer(ScreenPtr pScreen) {
ExaDriverPtr pExa;
@@ -50,7 +42,7 @@ Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante_fbdev_drive
VivPtr pViv = GET_VIV_PTR(pScrn);
TRACE_ENTER();
-@@ -274,7 +272,7 @@ static Bool InitExaLayer(ScreenPtr pScre
+@@ -258,7 +257,7 @@ static Bool InitExaLayer(ScreenPtr pScre
}
static Bool DestroyExaLayer(ScreenPtr pScreen) {
@@ -59,7 +51,7 @@ Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante_fbdev_drive
VivPtr pViv = GET_VIV_PTR(pScrn);
TRACE_ENTER();
xf86DrvMsg(pScreen->myNum, X_INFO, "Shutdown EXA\n");
-@@ -590,7 +588,7 @@ VivPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -570,7 +569,7 @@ VivPreInit(ScrnInfoPtr pScrn, int flags)
static Bool
VivCreateScreenResources(ScreenPtr pScreen) {
PixmapPtr pPixmap;
@@ -68,7 +60,7 @@ Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante_fbdev_drive
VivPtr fPtr = GET_VIV_PTR(pScrn);
Bool ret;
-@@ -612,8 +610,8 @@ VivCreateScreenResources(ScreenPtr pScre
+@@ -592,8 +591,8 @@ VivCreateScreenResources(ScreenPtr pScre
}
static Bool
@@ -79,7 +71,7 @@ Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante_fbdev_drive
VivPtr fPtr = GET_VIV_PTR(pScrn);
VisualPtr visual;
int init_picture = 0;
-@@ -631,7 +629,7 @@ VivScreenInit(int scrnIndex, ScreenPtr p
+@@ -611,7 +610,7 @@ VivScreenInit(int scrnIndex, ScreenPtr p
/*Mapping the Video memory*/
if (NULL == (fPtr->mFB.mFBMemory = fbdevHWMapVidmem(pScrn))) {
@@ -88,7 +80,7 @@ Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante_fbdev_drive
" failed\n");
TRACE_EXIT(FALSE);
}
-@@ -647,11 +645,11 @@ VivScreenInit(int scrnIndex, ScreenPtr p
+@@ -626,17 +625,17 @@ VivScreenInit(int scrnIndex, ScreenPtr p
/*Init the hardware in current mode*/
if (!fbdevHWModeInit(pScrn, pScrn->currentMode)) {
@@ -100,9 +92,7 @@ Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante_fbdev_drive
- fbdevHWAdjustFrame(scrnIndex, 0, 0, 0);
+ fbdevHWAdjustFrame(FBDEVHWADJUSTFRAME_ARGS(0, 0));
-
-
-@@ -659,7 +657,7 @@ VivScreenInit(int scrnIndex, ScreenPtr p
+ /* mi layer */
miClearVisualTypes();
if (pScrn->bitsPerPixel > 8) {
if (!miSetVisualTypes(pScrn->depth, TrueColorMask, pScrn->rgbBits, TrueColor)) {
@@ -111,7 +101,7 @@ Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante_fbdev_drive
" for %d bits per pixel [1]\n",
pScrn->bitsPerPixel);
TRACE_EXIT(FALSE);
-@@ -668,14 +666,14 @@ VivScreenInit(int scrnIndex, ScreenPtr p
+@@ -645,14 +644,14 @@ VivScreenInit(int scrnIndex, ScreenPtr p
if (!miSetVisualTypes(pScrn->depth,
miGetDefaultVisualMask(pScrn->depth),
pScrn->rgbBits, pScrn->defaultVisual)) {
@@ -128,7 +118,7 @@ Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante_fbdev_drive
return FALSE;
}
-@@ -684,14 +682,14 @@ VivScreenInit(int scrnIndex, ScreenPtr p
+@@ -660,14 +659,14 @@ VivScreenInit(int scrnIndex, ScreenPtr p
pScrn->displayWidth = fbdevHWGetLineLength(pScrn) /
(pScrn->bitsPerPixel / 8);
if (pScrn->displayWidth != pScrn->virtualX) {
@@ -145,7 +135,7 @@ Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante_fbdev_drive
"FB Start = %p FB Base = %p FB Offset = %p\n",
fPtr->mFB.mFBStart, fPtr->mFB.mFBMemory, fPtr->mFB.mFBOffset);
-@@ -708,7 +706,7 @@ VivScreenInit(int scrnIndex, ScreenPtr p
+@@ -684,7 +683,7 @@ VivScreenInit(int scrnIndex, ScreenPtr p
init_picture = 1;
break;
default:
@@ -154,7 +144,7 @@ Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante_fbdev_drive
"internal error: invalid number of bits per"
" pixel (%d) encountered in"
" VivScreenInit()\n", pScrn->bitsPerPixel);
-@@ -740,7 +738,7 @@ VivScreenInit(int scrnIndex, ScreenPtr p
+@@ -716,7 +715,7 @@ VivScreenInit(int scrnIndex, ScreenPtr p
if (fPtr->mFakeExa.mUseExaFlag) {
TRACE_INFO("Loading EXA");
if (!InitExaLayer(pScreen)) {
@@ -163,7 +153,7 @@ Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante_fbdev_drive
"internal error: initExaLayer failed "
"in VivScreenInit()\n");
}
-@@ -759,7 +757,7 @@ VivScreenInit(int scrnIndex, ScreenPtr p
+@@ -733,7 +732,7 @@ VivScreenInit(int scrnIndex, ScreenPtr p
/* colormap */
if (!miCreateDefColormap(pScreen)) {
@@ -172,7 +162,7 @@ Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante_fbdev_drive
"internal error: miCreateDefColormap failed "
"in VivScreenInit()\n");
TRACE_EXIT(FALSE);
-@@ -799,18 +797,18 @@ VivScreenInit(int scrnIndex, ScreenPtr p
+@@ -775,20 +774,20 @@ VivScreenInit(int scrnIndex, ScreenPtr p
}
static Bool
@@ -184,8 +174,10 @@ Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante_fbdev_drive
Bool ret = FALSE;
TRACE_ENTER();
+ #ifndef DISABLE_VIVANTE_DRI
- VivDRICloseScreen(pScreen);
+ VivDRICloseScreen(CLOSE_SCREEN_ARGS);
+ #endif
if (fPtr->mFakeExa.mUseExaFlag) {
DEBUGP("UnLoading EXA");
@@ -195,7 +187,7 @@ Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante_fbdev_drive
"internal error: DestroyExaLayer failed "
"in VivCloseScreen()\n");
}
-@@ -823,7 +821,7 @@ VivCloseScreen(int scrnIndex, ScreenPtr
+@@ -801,7 +800,7 @@ VivCloseScreen(int scrnIndex, ScreenPtr
pScreen->CreateScreenResources = fPtr->CreateScreenResources;
pScreen->CloseScreen = fPtr->CloseScreen;
@@ -204,10 +196,10 @@ Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante_fbdev_drive
TRACE_EXIT(ret);
}
-Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_util/compat-api.h
+Index: xserver-xorg-video-imx-viv-1.1.0/src/vivante_util/compat-api.h
===================================================================
--- /dev/null
-+++ xserver-xorg-video-imx-viv-12.09.01/src/vivante_util/compat-api.h
++++ xserver-xorg-video-imx-viv-1.1.0/src/vivante_util/compat-api.h
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2012 Red Hat, Inc.
@@ -315,11 +307,11 @@ Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_util/compat-api.h
+#endif
+
+#endif
-Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_util/vivante_common.h
+Index: xserver-xorg-video-imx-viv-1.1.0/src/vivante_util/vivante_common.h
===================================================================
---- xserver-xorg-video-imx-viv-12.09.01.orig/src/vivante_util/vivante_common.h
-+++ xserver-xorg-video-imx-viv-12.09.01/src/vivante_util/vivante_common.h
-@@ -76,6 +76,9 @@ extern "C" {
+--- xserver-xorg-video-imx-viv-1.1.0.orig/src/vivante_util/vivante_common.h
++++ xserver-xorg-video-imx-viv-1.1.0/src/vivante_util/vivante_common.h
+@@ -69,6 +69,9 @@ extern "C" {
#include "xf86Crtc.h"
#include "cursorstr.h"
@@ -329,11 +321,11 @@ Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_util/vivante_common.h
/*Debug*/
#include "vivante_debug.h"
-Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante.h
+Index: xserver-xorg-video-imx-viv-1.1.0/src/vivante_fbdev/vivante.h
===================================================================
---- xserver-xorg-video-imx-viv-12.09.01.orig/src/vivante_fbdev/vivante.h
-+++ xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante.h
-@@ -99,11 +99,11 @@ extern "C" {
+--- xserver-xorg-video-imx-viv-1.1.0.orig/src/vivante_fbdev/vivante.h
++++ xserver-xorg-video-imx-viv-1.1.0/src/vivante_fbdev/vivante.h
+@@ -92,11 +92,11 @@ extern "C" {
#define GET_VIV_PTR(p) ((VivPtr)((p)->driverPrivate))
#define VIVPTR_FROM_PIXMAP(x) \
@@ -348,11 +340,11 @@ Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante.h
/********************************************************************************
*
-Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante_dri.c
+Index: xserver-xorg-video-imx-viv-1.1.0/src/vivante_fbdev/vivante_dri.c
===================================================================
---- xserver-xorg-video-imx-viv-12.09.01.orig/src/vivante_fbdev/vivante_dri.c
-+++ xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante_dri.c
-@@ -49,7 +49,7 @@ VivDestroyContext(ScreenPtr pScreen, drm
+--- xserver-xorg-video-imx-viv-1.1.0.orig/src/vivante_fbdev/vivante_dri.c
++++ xserver-xorg-video-imx-viv-1.1.0/src/vivante_fbdev/vivante_dri.c
+@@ -51,7 +51,7 @@ VivDestroyContext(ScreenPtr pScreen, drm
Bool
VivDRIFinishScreenInit(ScreenPtr pScreen) {
@@ -361,7 +353,7 @@ Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante_dri.c
VivPtr pViv = GET_VIV_PTR(pScrn);
DRIInfoPtr pDRIInfo = (DRIInfoPtr) pViv->pDRIInfo;
-@@ -79,7 +79,7 @@ VivDRIMoveBuffers(WindowPtr pParent, DDX
+@@ -81,7 +81,7 @@ VivDRIMoveBuffers(WindowPtr pParent, DDX
}
Bool VivDRIScreenInit(ScreenPtr pScreen) {
@@ -370,7 +362,7 @@ Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante_dri.c
DRIInfoPtr pDRIInfo;
VivPtr pViv = GET_VIV_PTR(pScrn);
-@@ -185,7 +185,7 @@ Bool VivDRIScreenInit(ScreenPtr pScreen)
+@@ -187,7 +187,7 @@ Bool VivDRIScreenInit(ScreenPtr pScreen)
}
void VivDRICloseScreen(ScreenPtr pScreen) {
diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_12.09.01.bb b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_1.1.0.bb
similarity index 74%
rename from recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_12.09.01.bb
rename to recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_1.1.0.bb
index e35080f..96fa745 100644
--- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_12.09.01.bb
+++ b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_1.1.0.bb
@@ -1,9 +1,11 @@
-# Copyright (C) 2012 Freescale Semiconductor
+# Copyright (C) 2012-2013 Freescale Semiconductor
+# Copyright (C) 2012-2013 O.S. Systems Software LTDA.
# Released under the MIT license (see COPYING.MIT for the terms)
require recipes-graphics/xorg-driver/xorg-driver-video.inc
-PR = "${INC_PR}.2"
+PE = "3"
+PR = "${INC_PR}.0"
DEPENDS += "virtual/libx11 virtual/libgal-x11 gpu-viv-bin-mx6q"
@@ -12,14 +14,14 @@ LIC_FILES_CHKSUM = "file://src/vivante_fbdev/vivante.h;endline=19;md5=93a322f91e
SRC_URI = "${FSL_MIRROR}/xserver-xorg-video-imx-viv-${PV}.tar.gz \
file://fix-vivante-compile.patch \
file://Makefile.am-remove-prefixed-include-path.patch"
-SRC_URI[md5sum] = "1948119717aa01bed1f630be9ee7a708"
-SRC_URI[sha256sum] = "5b3be4b426d2d2803554df9e4d8919d1f9d17659c3153c71c6529f43c37e6ed1"
+SRC_URI[md5sum] = "d872365c046738628a7016343ffdb79a"
+SRC_URI[sha256sum] = "d53216d5f9e3f7803983ac1577d83985dfda33145e4711300f4ad5cbbe28e32d"
EXTRA_OECONF_armv7a = " --enable-neon --disable-static"
CFLAGS += " -I${STAGING_INCDIR}/xorg -I${STAGING_INCDIR}/drm"
LDFLAGS += "-lm -ldl -lX11 -lGAL-x11"
-S = "${WORKDIR}/xserver-xorg-video-imx-viv-${PV}"
+S = "${WORKDIR}/xserver-xorg-video-imx-viv-${PV}/EXA/"
do_install_append () {
install -d ${D}${includedir}
--
1.8.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [meta-fsl-arm][PATCH v3 3/8] linux-fslc: Update to 3.7.5 based kernel
2013-02-06 18:42 [meta-fsl-arm][PATCH v3 0/8] iMX6Q BSP 1.1.0 upgrade Otavio Salvador
2013-02-06 18:42 ` [meta-fsl-arm][PATCH v3 1/8] gpu-viv-bin-mx6q: Upgrade to 1.1.0 Otavio Salvador
2013-02-06 18:42 ` [meta-fsl-arm][PATCH v3 2/8] xf86-video-imxfb-vivante: " Otavio Salvador
@ 2013-02-06 18:42 ` Otavio Salvador
2013-02-07 22:14 ` Otavio Salvador
2013-02-06 18:42 ` [meta-fsl-arm][PATCH v3 4/8] xserver-xorg: Override PACKAGECONFIG for i.MX6 to enable DRI support Otavio Salvador
` (5 subsequent siblings)
8 siblings, 1 reply; 13+ messages in thread
From: Otavio Salvador @ 2013-02-06 18:42 UTC (permalink / raw)
To: meta-freescale Mailing List; +Cc: Otavio Salvador
Change-Id: I17fdb3af808cc732cd16f2e3a7fdb485d1bf43ee
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
recipes-kernel/linux/linux-fslc_3.7.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipes-kernel/linux/linux-fslc_3.7.bb b/recipes-kernel/linux/linux-fslc_3.7.bb
index 2401823..06e9349 100644
--- a/recipes-kernel/linux/linux-fslc_3.7.bb
+++ b/recipes-kernel/linux/linux-fslc_3.7.bb
@@ -12,10 +12,10 @@ inherit kernel
require recipes-kernel/linux/linux-dtb.inc
PV = "3.7+git${SRCPV}"
-PR = "r3"
+PR = "r4"
# patches-3.7
-SRCREV = "bc2b10c4b6edf5ce1fae6f69f7651c0e8f736195"
+SRCREV = "626cacfad1430114464a20f8da32c5c6a6242c9c"
SRC_URI = "git://github.com/Freescale/linux-mainline.git \
\
--
1.8.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [meta-fsl-arm][PATCH v3 4/8] xserver-xorg: Override PACKAGECONFIG for i.MX6 to enable DRI support
2013-02-06 18:42 [meta-fsl-arm][PATCH v3 0/8] iMX6Q BSP 1.1.0 upgrade Otavio Salvador
` (2 preceding siblings ...)
2013-02-06 18:42 ` [meta-fsl-arm][PATCH v3 3/8] linux-fslc: Update to 3.7.5 based kernel Otavio Salvador
@ 2013-02-06 18:42 ` Otavio Salvador
2013-02-06 18:42 ` [meta-fsl-arm][PATCH v3 5/8] xf86-dri-vivante: Upgrade to 1.1.0 Otavio Salvador
` (4 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Otavio Salvador @ 2013-02-06 18:42 UTC (permalink / raw)
To: meta-freescale Mailing List; +Cc: Otavio Salvador
Change-Id: I5f9bafbe788e08aa14a59b5d0b5ee8fc9d9f0720
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend
new file mode 100644
index 0000000..2528031
--- /dev/null
+++ b/recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend
@@ -0,0 +1,4 @@
+PRINC := "${@int(PRINC) + 1}"
+
+PACKAGECONFIG_mx6 = "udev dri"
+PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}"
--
1.8.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [meta-fsl-arm][PATCH v3 5/8] xf86-dri-vivante: Upgrade to 1.1.0
2013-02-06 18:42 [meta-fsl-arm][PATCH v3 0/8] iMX6Q BSP 1.1.0 upgrade Otavio Salvador
` (3 preceding siblings ...)
2013-02-06 18:42 ` [meta-fsl-arm][PATCH v3 4/8] xserver-xorg: Override PACKAGECONFIG for i.MX6 to enable DRI support Otavio Salvador
@ 2013-02-06 18:42 ` Otavio Salvador
2013-02-06 18:42 ` [meta-fsl-arm][PATCH v3 6/8] xf86-video-imxfb-vivante: Add depends/rdepends for DRI support Otavio Salvador
` (3 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Otavio Salvador @ 2013-02-06 18:42 UTC (permalink / raw)
To: meta-freescale Mailing List; +Cc: Andrei Gherzan, Otavio Salvador
This upgrades to the 1.1.0 version and also include the build fix for
newer Xorg API done by Andrei Gherzan.
Change-Id: I8935341e3513bcf845478a5a54a723b96c8cdcbf
Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
.../xf86-dri-vivante/fix-with-xorg-1-13.patch | 141 +++++++++++++++++++++
.../xorg-driver/xf86-dri-vivante_1.1.0.bb | 45 +++++++
.../xorg-driver/xf86-dri-vivante_12.09.01.bb | 36 ------
3 files changed, 186 insertions(+), 36 deletions(-)
create mode 100644 recipes-graphics/xorg-driver/xf86-dri-vivante/fix-with-xorg-1-13.patch
create mode 100644 recipes-graphics/xorg-driver/xf86-dri-vivante_1.1.0.bb
delete mode 100644 recipes-graphics/xorg-driver/xf86-dri-vivante_12.09.01.bb
diff --git a/recipes-graphics/xorg-driver/xf86-dri-vivante/fix-with-xorg-1-13.patch b/recipes-graphics/xorg-driver/xf86-dri-vivante/fix-with-xorg-1-13.patch
new file mode 100644
index 0000000..0f138e9
--- /dev/null
+++ b/recipes-graphics/xorg-driver/xf86-dri-vivante/fix-with-xorg-1-13.patch
@@ -0,0 +1,141 @@
+Fix module for Xorg 1.13.
+
+Upstream-Status: Pending
+Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
+
+Index: dri-xorg-graphic-imx-viv-12.09.01/src/dri.c
+===================================================================
+--- dri-xorg-graphic-imx-viv-12.09.01.orig/src/dri.c 2012-07-02 05:25:06.000000000 +0300
++++ dri-xorg-graphic-imx-viv-12.09.01/src/dri.c 2012-12-21 11:42:09.000000000 +0200
+@@ -1675,7 +1675,7 @@
+
+ if (pDRIPriv &&
+ pDRIPriv->pDriverInfo->wrap.WakeupHandler)
+- (*pDRIPriv->pDriverInfo->wrap.WakeupHandler)(i, wakeupData,
++ (*pDRIPriv->pDriverInfo->wrap.WakeupHandler)(pScreen,
+ result, pReadmask);
+ }
+ }
+@@ -1691,16 +1691,15 @@
+
+ if (pDRIPriv &&
+ pDRIPriv->pDriverInfo->wrap.BlockHandler)
+- (*pDRIPriv->pDriverInfo->wrap.BlockHandler)(i, blockData,
++ (*pDRIPriv->pDriverInfo->wrap.BlockHandler)(pScreen,
+ pTimeout, pReadmask);
+ }
+ }
+
+ void
+-DRIDoWakeupHandler(int screenNum, pointer wakeupData,
++DRIDoWakeupHandler(ScreenPtr pScreen,
+ unsigned long result, pointer pReadmask)
+ {
+- ScreenPtr pScreen = screenInfo.screens[screenNum];
+ DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
+ DRILock(pScreen, 0);
+@@ -2383,7 +2382,7 @@
+ /* unwrap */
+ pScrn->AdjustFrame = pDRIPriv->wrap.AdjustFrame;
+ /* call lower layers */
+- (*pScrn->AdjustFrame)(scrnIndex, x, y, flags);
++ (*pScrn->AdjustFrame)(pScrn, x, y);
+ /* rewrap */
+ pDRIPriv->wrap.AdjustFrame = pScrn->AdjustFrame;
+ pScrn->AdjustFrame = DRIAdjustFrame;
+Index: dri-xorg-graphic-imx-viv-12.09.01/src/dri.h
+===================================================================
+--- dri-xorg-graphic-imx-viv-12.09.01.orig/src/dri.h 2012-07-02 05:25:06.000000000 +0300
++++ dri-xorg-graphic-imx-viv-12.09.01/src/dri.h 2012-12-21 11:42:15.000000000 +0200
+@@ -372,16 +372,14 @@
+
+ extern _X_EXPORT Bool DRIFinishScreenInit(ScreenPtr pScreen);
+
+-extern _X_EXPORT void DRIWakeupHandler(pointer wakeupData,
+- int result,
++extern _X_EXPORT void DRIWakeupHandler(pointer wakeupData, int result,
+ pointer pReadmask);
+
+ extern _X_EXPORT void DRIBlockHandler(pointer blockData,
+ OSTimePtr pTimeout,
+ pointer pReadmask);
+
+-extern _X_EXPORT void DRIDoWakeupHandler(int screenNum,
+- pointer wakeupData,
++extern _X_EXPORT void DRIDoWakeupHandler(ScreenPtr pScreen,
+ unsigned long result,
+ pointer pReadmask);
+
+Index: dri-xorg-graphic-imx-viv-12.09.01/src/xf86dri.c
+===================================================================
+--- dri-xorg-graphic-imx-viv-12.09.01.orig/src/xf86dri.c 2012-07-02 05:25:06.000000000 +0300
++++ dri-xorg-graphic-imx-viv-12.09.01/src/xf86dri.c 2012-12-21 10:27:32.000000000 +0200
+@@ -102,7 +102,6 @@
+ )
+ {
+ xXF86DRIQueryVersionReply rep;
+- register int n;
+
+ REQUEST_SIZE_MATCH(xXF86DRIQueryVersionReq);
+ rep.type = X_Reply;
+@@ -112,11 +111,11 @@
+ rep.minorVersion = SERVER_XF86DRI_MINOR_VERSION;
+ rep.patchVersion = SERVER_XF86DRI_PATCH_VERSION;
+ if (client->swapped) {
+- swaps(&rep.sequenceNumber, n);
+- swapl(&rep.length, n);
+- swaps(&rep.majorVersion, n);
+- swaps(&rep.minorVersion, n);
+- swapl(&rep.patchVersion, n);
++ swaps(&rep.sequenceNumber);
++ swapl(&rep.length);
++ swaps(&rep.majorVersion);
++ swaps(&rep.minorVersion);
++ swapl(&rep.patchVersion);
+ }
+ WriteToClient(client, sizeof(xXF86DRIQueryVersionReply), (char *)&rep);
+ return Success;
+@@ -129,7 +128,6 @@
+ {
+ xXF86DRIQueryDirectRenderingCapableReply rep;
+ Bool isCapable;
+- register int n;
+
+ REQUEST(xXF86DRIQueryDirectRenderingCapableReq);
+ REQUEST_SIZE_MATCH(xXF86DRIQueryDirectRenderingCapableReq);
+@@ -152,8 +150,8 @@
+ rep.isCapable = 0;
+
+ if (client->swapped) {
+- swaps(&rep.sequenceNumber, n);
+- swapl(&rep.length, n);
++ swaps(&rep.sequenceNumber);
++ swapl(&rep.length);
+ }
+
+ WriteToClient(client,
+@@ -611,9 +609,8 @@
+ register ClientPtr client
+ )
+ {
+- register int n;
+ REQUEST(xXF86DRIQueryVersionReq);
+- swaps(&stuff->length, n);
++ swaps(&stuff->length);
+ return ProcXF86DRIQueryVersion(client);
+ }
+
+@@ -622,10 +619,9 @@
+ register ClientPtr client
+ )
+ {
+- register int n;
+ REQUEST(xXF86DRIQueryDirectRenderingCapableReq);
+- swaps(&stuff->length, n);
+- swapl(&stuff->screen, n);
++ swaps(&stuff->length);
++ swapl(&stuff->screen);
+ return ProcXF86DRIQueryDirectRenderingCapable(client);
+ }
+
diff --git a/recipes-graphics/xorg-driver/xf86-dri-vivante_1.1.0.bb b/recipes-graphics/xorg-driver/xf86-dri-vivante_1.1.0.bb
new file mode 100644
index 0000000..aaab593
--- /dev/null
+++ b/recipes-graphics/xorg-driver/xf86-dri-vivante_1.1.0.bb
@@ -0,0 +1,45 @@
+# Copyright (C) 2012-2013 Freescale Semiconductor
+# Copyright (C) 2012-2013 O.S. Systems Software LTDA.
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+LICENSE = "MIT"
+SECTION = "x11/base"
+DEPENDS = "virtual/libx11 virtual/xserver xf86-video-imxfb-vivante"
+LIC_FILES_CHKSUM = "file://src/dri.h;enline=27;md5=c0a9f5e55df7fb9d8c7445890e52e859"
+
+SRC_URI = "${FSL_MIRROR}/xserver-xorg-video-imx-viv-${PV}.tar.gz \
+ file://fix-with-xorg-1-13.patch"
+SRC_URI[md5sum] = "d872365c046738628a7016343ffdb79a"
+SRC_URI[sha256sum] = "d53216d5f9e3f7803983ac1577d83985dfda33145e4711300f4ad5cbbe28e32d"
+
+PE = "1"
+PR = "r0"
+
+S = "${WORKDIR}/xserver-xorg-video-imx-viv-${PV}/DRI_1.10.4"
+
+inherit fsl-eula-unpack autotools pkgconfig
+
+EXTRA_OECONF_armv7a = " --enable-neon "
+CFLAGS += " -I${STAGING_INCDIR}/xorg -DXSERVER_LIBPCIACCESS"
+
+do_install_append () {
+ # Install header files
+ install -d ${D}${includedir}/xorg
+ cp -axr ${S}/src/*.h ${D}${includedir}/xorg
+ find ${D}${includedir} -type f -exec chmod 660 {} \;
+
+ # don't install libtool (*.la) archive not usefull, fix Makefile.am
+ find ${D}${libdir}/xorg/modules -regex ".*\.la$" | xargs rm -f --
+
+ # Remove files provided by xserver-xorg
+ rm ${D}${includedir}/xorg/dri.h
+ rm ${D}${includedir}/xorg/dristruct.h
+ rm ${D}${includedir}/xorg/sarea.h
+}
+
+FILES_${PN}-dev += "${includedir}/xorg/*.h"
+FILES_${PN} += " ${libdir}/xorg/modules/extensions/*.so"
+FILES_${PN}-dbg += " ${libdir}/xorg/modules/extensions/.debug"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(mx6)"
diff --git a/recipes-graphics/xorg-driver/xf86-dri-vivante_12.09.01.bb b/recipes-graphics/xorg-driver/xf86-dri-vivante_12.09.01.bb
deleted file mode 100644
index 1653029..0000000
--- a/recipes-graphics/xorg-driver/xf86-dri-vivante_12.09.01.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (C) 2012 Freescale Semiconductor
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-LICENSE = "MIT"
-SECTION = "x11/base"
-DEPENDS = "virtual/libx11 util-macros xf86-video-imxfb-vivante"
-LIC_FILES_CHKSUM = "file://src/dri.h;enline=27;md5=1d0d59e1dc96f5197ea3a8b101bf1fcc"
-
-SRC_URI = "${FSL_MIRROR}/dri-xorg-graphic-imx-viv-${PV}.bin;fsl-eula=true"
-SRC_URI[md5sum] = "8c90045cd5f4dba81095856634ba5136"
-SRC_URI[sha256sum] = "c844dc180e43901359bbdb4f797ab178b3821fbf63bdee9577e5a0afe5d7f6ad"
-
-S = "${WORKDIR}/dri-xorg-graphic-imx-viv-${PV}"
-
-PR = "r2"
-
-inherit fsl-eula-unpack autotools pkgconfig
-
-EXTRA_OECONF_armv7a = " --enable-neon "
-CFLAGS += " -I${STAGING_INCDIR}/xorg"
-
-do_install_append () {
-# Install header files
- install -d ${D}${includedir}/xorg
- cp -axr ${S}/src/*.h ${D}${includedir}/xorg
- find ${D}${includedir} -type f -exec chmod 660 {} \;
-# don't install libtool (*.la) archive not usefull, fix Makefile.am
- find ${D}${libdir}/xorg/modules -regex ".*\.la$" | xargs rm -f --
-}
-
-FILES_${PN}-dev += "${includedir}/xorg/*.h"
-FILES_${PN} += " ${libdir}/xorg/modules/extensions/*.so"
-FILES_${PN}-dbg += " ${libdir}/xorg/modules/extensions/.debug"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(mx6)"
--
1.8.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [meta-fsl-arm][PATCH v3 6/8] xf86-video-imxfb-vivante: Add depends/rdepends for DRI support
2013-02-06 18:42 [meta-fsl-arm][PATCH v3 0/8] iMX6Q BSP 1.1.0 upgrade Otavio Salvador
` (4 preceding siblings ...)
2013-02-06 18:42 ` [meta-fsl-arm][PATCH v3 5/8] xf86-dri-vivante: Upgrade to 1.1.0 Otavio Salvador
@ 2013-02-06 18:42 ` Otavio Salvador
2013-02-06 18:42 ` [meta-fsl-arm][PATCH v3 7/8] gpu-viv-bin-mx6q: Add dri.pc Otavio Salvador
` (2 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Otavio Salvador @ 2013-02-06 18:42 UTC (permalink / raw)
To: meta-freescale Mailing List; +Cc: Otavio Salvador
Change-Id: Id2227df656075f189ce7d3ca4b0ba93dea9e51d0
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_1.1.0.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_1.1.0.bb b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_1.1.0.bb
index 96fa745..8406bd6 100644
--- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_1.1.0.bb
+++ b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_1.1.0.bb
@@ -5,9 +5,9 @@
require recipes-graphics/xorg-driver/xorg-driver-video.inc
PE = "3"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
-DEPENDS += "virtual/libx11 virtual/libgal-x11 gpu-viv-bin-mx6q"
+DEPENDS += "virtual/libx11 virtual/libgal-x11 virtual/dri"
LIC_FILES_CHKSUM = "file://src/vivante_fbdev/vivante.h;endline=19;md5=93a322f91ec495569dcbcfbb2a95454a"
@@ -30,7 +30,7 @@ do_install_append () {
find ${D}${includedir} -type f -exec chmod 660 {} \;
}
-RDEPENDS_${PN} += "xserver-xorg-module-exa"
+RDEPENDS_${PN} += "xserver-xorg-module-exa xf86-dri-vivante"
PACKAGE_ARCH = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE = "(mx6)"
--
1.8.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [meta-fsl-arm][PATCH v3 7/8] gpu-viv-bin-mx6q: Add dri.pc
2013-02-06 18:42 [meta-fsl-arm][PATCH v3 0/8] iMX6Q BSP 1.1.0 upgrade Otavio Salvador
` (5 preceding siblings ...)
2013-02-06 18:42 ` [meta-fsl-arm][PATCH v3 6/8] xf86-video-imxfb-vivante: Add depends/rdepends for DRI support Otavio Salvador
@ 2013-02-06 18:42 ` Otavio Salvador
2013-02-06 18:42 ` [meta-fsl-arm][PATCH v3 8/8] glproto: Don't install glxtokens.h for imx6qsabrelite Otavio Salvador
2013-02-12 12:54 ` [meta-fsl-arm][PATCH v3 0/8] iMX6Q BSP 1.1.0 upgrade Thomas Senyk
8 siblings, 0 replies; 13+ messages in thread
From: Otavio Salvador @ 2013-02-06 18:42 UTC (permalink / raw)
To: meta-freescale Mailing List; +Cc: Andrei Gherzan
From: Andrei Gherzan <andrei.gherzan@windriver.com>
This is need when compiling packages like xserver-xorg with dri support.
Change-Id: I538c5139cd21ebed9da3061645bac6a63388af0a
Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 14 ++++++++++----
recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/dri.pc | 11 +++++++++++
2 files changed, 21 insertions(+), 4 deletions(-)
create mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/dri.pc
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
index 4f584dd..dc90369 100644
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
+++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
@@ -5,13 +5,15 @@ DESCRIPTION = "GPU driver and apps for imx6"
SECTION = "libs"
LICENSE = "Proprietary"
LIC_FILES_CHKSUM = "file://usr/include/gc_vdk.h;endline=11;md5=c831981a5cbb2673318b77fb2f07014c"
-PROVIDES += "virtual/libgal-x11 virtual/egl virtual/libgles1 virtual/libgles2 libvivante-dri-mx6"
+PROVIDES += "virtual/dri virtual/libgal-x11 virtual/egl virtual/libgles1 virtual/libgles2 libvivante-dri-mx6"
-INC_PR = "r2"
+INC_PR = "r3"
inherit fsl-eula-unpack
-SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
+SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \
+ file://dri.pc \
+ "
PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \
libegl-fb-mx6 libegl-fb-mx6-dev libegl-fb-mx6-dbg \
@@ -51,12 +53,16 @@ python __anonymous() {
do_install () {
install -d ${D}${libdir}/dri
+ install -d ${D}${libdir}/pkgconfig
install -d ${D}${includedir}
cp -rP ${S}/usr/lib/* ${D}${libdir}
cp -rP ${S}/usr/include/* ${D}${includedir}
cp -rP ${S}/opt ${D}
+ # FIXME: Install a dri.pc file
+ cp -ax ${WORKDIR}/dri.pc ${D}${libdir}/pkgconfig
+
find ${D}${libdir} -type f -exec chmod 644 {} \;
find ${D}${includedir} -type f -exec chmod 644 {} \;
@@ -141,7 +147,7 @@ FILES_libvivante-x11-mx6-dev = "${libdir}/libVIVANTE-x11${SOLIBSDEV}"
FILES_libvivante-x11-mx6-dbg = "${libdir}/.debug/libVIVANTE-x11${SOLIBS}"
FILES_libvivante-dri-mx6 = "${libdir}/dri/vivante_dri${SOLIBS}"
-FILES_libvivante-dri-mx6-dev = ""
+FILES_libvivante-dri-mx6-dev = "${libdir}/pkgconfig"
FILES_libvivante-dri-mx6-dbg = "${libdir}/dri/.debug/vivante_dri${SOLIBS}"
PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/dri.pc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/dri.pc
new file mode 100644
index 0000000..537c533
--- /dev/null
+++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/dri.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib
+includedir=/usr/include
+dridriverdir=${libdir}/dri
+
+Name: dri
+Description: Vivante Direct Rendering Infrastructure
+Version: 8.0.0
+Requires.private: libdrm >= 2.4.24
+Cflags: -I${includedir}
--
1.8.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [meta-fsl-arm][PATCH v3 8/8] glproto: Don't install glxtokens.h for imx6qsabrelite
2013-02-06 18:42 [meta-fsl-arm][PATCH v3 0/8] iMX6Q BSP 1.1.0 upgrade Otavio Salvador
` (6 preceding siblings ...)
2013-02-06 18:42 ` [meta-fsl-arm][PATCH v3 7/8] gpu-viv-bin-mx6q: Add dri.pc Otavio Salvador
@ 2013-02-06 18:42 ` Otavio Salvador
2013-02-12 12:54 ` [meta-fsl-arm][PATCH v3 0/8] iMX6Q BSP 1.1.0 upgrade Thomas Senyk
8 siblings, 0 replies; 13+ messages in thread
From: Otavio Salvador @ 2013-02-06 18:42 UTC (permalink / raw)
To: meta-freescale Mailing List; +Cc: Andrei Gherzan, Otavio Salvador
From: Andrei Gherzan <andrei.gherzan@windriver.com>
Avoid in this way duplicate file warnings in sysroot.
This header is provided by freescale.
Change-Id: I604702b1e35500ce65b8f6b16ffc9ce107908364
Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
recipes-graphics/xorg-proto/glproto_1.4.16.bbappend | 8 ++++++++
1 file changed, 8 insertions(+)
create mode 100644 recipes-graphics/xorg-proto/glproto_1.4.16.bbappend
diff --git a/recipes-graphics/xorg-proto/glproto_1.4.16.bbappend b/recipes-graphics/xorg-proto/glproto_1.4.16.bbappend
new file mode 100644
index 0000000..9be81d3
--- /dev/null
+++ b/recipes-graphics/xorg-proto/glproto_1.4.16.bbappend
@@ -0,0 +1,8 @@
+PRINC := "${@int(PRINC) + 1}"
+
+do_install_append_mx6() {
+ # This is a header provided by fsl so don't use this header
+ rm -rf ${D}${includedir}/GL/glxtokens.h
+}
+
+PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}"
--
1.8.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [meta-fsl-arm][PATCH v3 3/8] linux-fslc: Update to 3.7.5 based kernel
2013-02-06 18:42 ` [meta-fsl-arm][PATCH v3 3/8] linux-fslc: Update to 3.7.5 based kernel Otavio Salvador
@ 2013-02-07 22:14 ` Otavio Salvador
0 siblings, 0 replies; 13+ messages in thread
From: Otavio Salvador @ 2013-02-07 22:14 UTC (permalink / raw)
To: meta-freescale Mailing List; +Cc: Otavio Salvador
On Wed, Feb 6, 2013 at 4:42 PM, Otavio Salvador <otavio@ossystems.com.br> wrote:
> Change-Id: I17fdb3af808cc732cd16f2e3a7fdb485d1bf43ee
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
This specific patch has been applied in master; rest of series not yet.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [meta-fsl-arm][PATCH v3 0/8] iMX6Q BSP 1.1.0 upgrade
2013-02-06 18:42 [meta-fsl-arm][PATCH v3 0/8] iMX6Q BSP 1.1.0 upgrade Otavio Salvador
` (7 preceding siblings ...)
2013-02-06 18:42 ` [meta-fsl-arm][PATCH v3 8/8] glproto: Don't install glxtokens.h for imx6qsabrelite Otavio Salvador
@ 2013-02-12 12:54 ` Thomas Senyk
2013-02-12 17:37 ` Otavio Salvador
8 siblings, 1 reply; 13+ messages in thread
From: Thomas Senyk @ 2013-02-12 12:54 UTC (permalink / raw)
To: meta-freescale; +Cc: Otavio Salvador
Hi,
I tried the patch-set today and had several issues/problems.
Some (most?) of them are due to my own limited knowledge or my unusual setup.
This time I applied all patches of the patch-set :)
... but not the upstream openembedded-core patches as I'm building without
X11, if this is in anyway a potential cause of errors: please let me know.
(How do I find the right openembbeded patches if I'm not on their mailing-
list? .. I guess I should be? ;)
1. Generally importing patch-set from mailing-lists.
How do you do this? For me it's always troublesome and error-prone to manually
copy the patches from mail to files and apply them
... I'm sure there must be a better way of doing it?
2. recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-
to-HAL.patch
didn't apply anymore for me with following error:
NOTE: Applying patch '0001-change-header-path-to-HAL.patch' (../sources/meta-
fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-
path-to-HAL.patch)
ERROR: Command Error: exit status: 1 Output:
Applying patch 0001-change-header-path-to-HAL.patch
patching file usr/include/gc_vdk_types.h
Hunk #1 FAILED at 26.
1 out of 1 hunk FAILED -- rejects in file usr/include/gc_vdk_types.h
Patch 0001-change-header-path-to-HAL.patch does not apply (enforce with -f)
I changed the patch to:
--#include "gc_hal_eglplatform.h"
-+#include <HAL/gc_hal_eglplatform.h>
+-#include "gc_hal_eglplatform_type.h"
++#include <HAL/gc_hal_eglplatform_type.h>
... now it's building, but not sure if this was the right modification?
3. I got a different md5-hash for gc_vdk.h
I got a LIC_FILS_CHKSUM error pointing me to another hash.
I could verify this by manually running/extracting gpu-viv-bin-mx6q-1.1.0.bin
and doing:
.../gpu-viv-bin-mx6q-1.1.0/usr/include/ head -11 gc_vdk.h|md5sum
c831981a5cbb2673318b77fb2f07014c -
... I do get the felling I got a different version of the drivers then the
rest of the people :D but it does look right:
.../oe-yocto/fsl-community-bsp/downloads/ sha1sum gpu-viv-bin-mx6q-1.1.0.bin
e17d9fc743245fc270309903f5863b480ab08e71 gpu-viv-bin-mx6q-1.1.0.bin
.../temp/ wget http://download.ossystems.com.br/bsp/freescale/source/gpu-viv-bin-mx6q-1.1.0.bin
.../temp/ sha1sum gpu-viv-bin-mx6q-1.1.0.bin
e17d9fc743245fc270309903f5863b480ab08e71 gpu-viv-bin-mx6q-1.1.0.bin
4. I build without X11 in DISTRO_FEATURES
... never the less I get:
root@imx6qsabrelite:/usr/lib# ls libGAL* libEGL* -alh
-rw-r--r-- 1 root root 83.8K Feb 12 10:00 libEGL-x11.so
lrwxrwxrwx 1 root root 13 Feb 12 11:22 libEGL.so -> libEGL-
x11.so
-rw-r--r-- 1 root root 807.1K Feb 12 10:00 libGAL-x11.so
lrwxrwxrwx 1 root root 13 Feb 12 11:22 libGAL.so -> libGAL-
x11.so
their is a patch for that which never got "rebased & resend":
http://permalink.gmane.org/gmane.linux.embedded.yocto.meta-freescale/1160
... he might just wait for 'patch v3' to land
5. A similar problem within to sysroot,
Their is no libEGL.so anymore (same for libGAL.so)
... so far Qt always linked against those.
The above mentioned patch takes care about this as well by rm *-x11.so and
letting the default symlinks (libEGL.so -> libEGL-fb.so) as they are
...for the not-x11 case (the x11 solution looks strange though).
6. uname -a
Linux imx6qsabrelite 3.0.35-1.1.0+yocto+gc27cb38 #1 SMP PREEMPT Mon Feb 11
17:07:57 CET 2013 armv7l GNU/Linux
Their is a patch-set for switching to a newer 3.7 based kernel.
Can anyone clarify about the different kernels, how and why/why not switch?
... should 3.7 be default or is 3.0.35 the right one for now?
7. I still got the shader errors:
vertex shader compilation error:
fragment shader compilation error:
program link error: No vertex shader attached.
... those might be caused by one of the errors/mistakes above?
Greets
Thomas
On Wed, February 06, 2013 16:42:19 Otavio Salvador wrote:
> Hello,
>
> This patch series upgrades the iMX6Q BSP to 1.1.0; it also try to fix
> the DRI support for it.
>
> Please give it a try as this is a huge upgrade and we might have
> regressions and pending issues still unkown. This series depends on a
> cuple of patches I sent to OpenEmbeeded-Core mailing list for
> xserver-xorg and mesa, please apply them before playing with this
> series.
>
> Changes for v3:
> - Drop merged patches
> - Add upgrade of linux-fslc kernel to 3.7.5
>
> Changes for v2:
> - Fix build error due wrong dependency order between Xorg driver and
> DRI;
> - Avoid installation of DRI headers as those are provided by Xorg;
> - Add upgrade of linux-fslc;
> - Drop merged patches.
>
> Andrei Gherzan (2):
> gpu-viv-bin-mx6q: Add dri.pc
> glproto: Don't install glxtokens.h for imx6qsabrelite
>
> Otavio Salvador (6):
> gpu-viv-bin-mx6q: Upgrade to 1.1.0
> xf86-video-imxfb-vivante: Upgrade to 1.1.0
> linux-fslc: Update to 3.7.5 based kernel
> xserver-xorg: Override PACKAGECONFIG for i.MX6 to enable DRI support
> xf86-dri-vivante: Upgrade to 1.1.0
> xf86-video-imxfb-vivante: Add depends/rdepends for DRI support
>
> .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 43 ++++---
> .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/dri.pc | 11 ++
> ...-mx6q_12.09.01.bb => gpu-viv-bin-mx6q_1.1.0.bb} | 5 +-
> .../xf86-dri-vivante/fix-with-xorg-1-13.patch | 141
> +++++++++++++++++++++ .../xorg-driver/xf86-dri-vivante_1.1.0.bb |
> 45 +++++++
> .../xorg-driver/xf86-dri-vivante_12.09.01.bb | 36 ------
> .../Makefile.am-remove-prefixed-include-path.patch | 2 +
> .../fix-vivante-compile.patch | 86 ++++++-------
> ....09.01.bb => xf86-video-imxfb-vivante_1.1.0.bb} | 16 ++-
> .../xorg-proto/glproto_1.4.16.bbappend | 8 ++
> .../xorg-xserver/xserver-xorg_1.13.1.bbappend | 4 +
> recipes-kernel/linux/linux-fslc_3.7.bb | 4 +-
> 12 files changed, 289 insertions(+), 112 deletions(-)
> create mode 100644
> recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/dri.pc rename
> recipes-graphics/gpu-viv-bin-mx6q/{gpu-viv-bin-mx6q_12.09.01.bb =>
> gpu-viv-bin-mx6q_1.1.0.bb} (51%) create mode 100644
> recipes-graphics/xorg-driver/xf86-dri-vivante/fix-with-xorg-1-13.patch
> create mode 100644 recipes-graphics/xorg-driver/xf86-dri-vivante_1.1.0.bb
> delete mode 100644
> recipes-graphics/xorg-driver/xf86-dri-vivante_12.09.01.bb rename
> recipes-graphics/xorg-driver/{xf86-video-imxfb-vivante_12.09.01.bb =>
> xf86-video-imxfb-vivante_1.1.0.bb} (65%) create mode 100644
> recipes-graphics/xorg-proto/glproto_1.4.16.bbappend create mode 100644
> recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [meta-fsl-arm][PATCH v3 0/8] iMX6Q BSP 1.1.0 upgrade
2013-02-12 12:54 ` [meta-fsl-arm][PATCH v3 0/8] iMX6Q BSP 1.1.0 upgrade Thomas Senyk
@ 2013-02-12 17:37 ` Otavio Salvador
2013-02-12 17:44 ` Otavio Salvador
0 siblings, 1 reply; 13+ messages in thread
From: Otavio Salvador @ 2013-02-12 17:37 UTC (permalink / raw)
To: Thomas Senyk; +Cc: meta-freescale
On Tue, Feb 12, 2013 at 10:54 AM, Thomas Senyk
<thomas.senyk@pelagicore.com> wrote:
> Hi,
>
> I tried the patch-set today and had several issues/problems.
> Some (most?) of them are due to my own limited knowledge or my unusual setup.
This patchset is driving me crazy so don't worry ;-)
> This time I applied all patches of the patch-set :)
> ... but not the upstream openembedded-core patches as I'm building without
> X11, if this is in anyway a potential cause of errors: please let me know.
> (How do I find the right openembbeded patches if I'm not on their mailing-
> list? .. I guess I should be? ;)
You might use patchwork http://patches.openembedded.org/project/oe-core/list
> 1. Generally importing patch-set from mailing-lists.
>
> How do you do this? For me it's always troublesome and error-prone to manually
> copy the patches from mail to files and apply them
> ... I'm sure there must be a better way of doing it?
>
>
>
> 2. recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-
> to-HAL.patch
> didn't apply anymore for me with following error:
>
>
> NOTE: Applying patch '0001-change-header-path-to-HAL.patch' (../sources/meta-
> fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-
> path-to-HAL.patch)
> ERROR: Command Error: exit status: 1 Output:
> Applying patch 0001-change-header-path-to-HAL.patch
> patching file usr/include/gc_vdk_types.h
> Hunk #1 FAILED at 26.
> 1 out of 1 hunk FAILED -- rejects in file usr/include/gc_vdk_types.h
> Patch 0001-change-header-path-to-HAL.patch does not apply (enforce with -f)
>
>
> I changed the patch to:
> --#include "gc_hal_eglplatform.h"
> -+#include <HAL/gc_hal_eglplatform.h>
> +-#include "gc_hal_eglplatform_type.h"
> ++#include <HAL/gc_hal_eglplatform_type.h>
>
> ... now it's building, but not sure if this was the right modification?
>
>
>
> 3. I got a different md5-hash for gc_vdk.h
> I got a LIC_FILS_CHKSUM error pointing me to another hash.
> I could verify this by manually running/extracting gpu-viv-bin-mx6q-1.1.0.bin
> and doing:
> .../gpu-viv-bin-mx6q-1.1.0/usr/include/ head -11 gc_vdk.h|md5sum
> c831981a5cbb2673318b77fb2f07014c -
>
>
>
> ... I do get the felling I got a different version of the drivers then the
> rest of the people :D but it does look right:
>
> .../oe-yocto/fsl-community-bsp/downloads/ sha1sum gpu-viv-bin-mx6q-1.1.0.bin
> e17d9fc743245fc270309903f5863b480ab08e71 gpu-viv-bin-mx6q-1.1.0.bin
>
> .../temp/ wget http://download.ossystems.com.br/bsp/freescale/source/gpu-viv-bin-mx6q-1.1.0.bin
> .../temp/ sha1sum gpu-viv-bin-mx6q-1.1.0.bin
> e17d9fc743245fc270309903f5863b480ab08e71 gpu-viv-bin-mx6q-1.1.0.bin
>
>
>
>
>
> 4. I build without X11 in DISTRO_FEATURES
> ... never the less I get:
> root@imx6qsabrelite:/usr/lib# ls libGAL* libEGL* -alh
> -rw-r--r-- 1 root root 83.8K Feb 12 10:00 libEGL-x11.so
> lrwxrwxrwx 1 root root 13 Feb 12 11:22 libEGL.so -> libEGL-
> x11.so
> -rw-r--r-- 1 root root 807.1K Feb 12 10:00 libGAL-x11.so
> lrwxrwxrwx 1 root root 13 Feb 12 11:22 libGAL.so -> libGAL-
> x11.so
>
>
> their is a patch for that which never got "rebased & resend":
> http://permalink.gmane.org/gmane.linux.embedded.yocto.meta-freescale/1160
>
> ... he might just wait for 'patch v3' to land
>
>
>
> 5. A similar problem within to sysroot,
> Their is no libEGL.so anymore (same for libGAL.so)
> ... so far Qt always linked against those.
>
> The above mentioned patch takes care about this as well by rm *-x11.so and
> letting the default symlinks (libEGL.so -> libEGL-fb.so) as they are
> ...for the not-x11 case (the x11 solution looks strange though).
>
>
>
> 6. uname -a
> Linux imx6qsabrelite 3.0.35-1.1.0+yocto+gc27cb38 #1 SMP PREEMPT Mon Feb 11
> 17:07:57 CET 2013 armv7l GNU/Linux
>
> Their is a patch-set for switching to a newer 3.7 based kernel.
> Can anyone clarify about the different kernels, how and why/why not switch?
> ... should 3.7 be default or is 3.0.35 the right one for now?
>
>
>
> 7. I still got the shader errors:
> vertex shader compilation error:
> fragment shader compilation error:
> program link error: No vertex shader attached.
>
> ... those might be caused by one of the errors/mistakes above?
>
>
>
> Greets
> Thomas
>
>
>
>
>
>
> On Wed, February 06, 2013 16:42:19 Otavio Salvador wrote:
>> Hello,
>>
>> This patch series upgrades the iMX6Q BSP to 1.1.0; it also try to fix
>> the DRI support for it.
>>
>> Please give it a try as this is a huge upgrade and we might have
>> regressions and pending issues still unkown. This series depends on a
>> cuple of patches I sent to OpenEmbeeded-Core mailing list for
>> xserver-xorg and mesa, please apply them before playing with this
>> series.
>>
>> Changes for v3:
>> - Drop merged patches
>> - Add upgrade of linux-fslc kernel to 3.7.5
>>
>> Changes for v2:
>> - Fix build error due wrong dependency order between Xorg driver and
>> DRI;
>> - Avoid installation of DRI headers as those are provided by Xorg;
>> - Add upgrade of linux-fslc;
>> - Drop merged patches.
>>
>> Andrei Gherzan (2):
>> gpu-viv-bin-mx6q: Add dri.pc
>> glproto: Don't install glxtokens.h for imx6qsabrelite
>>
>> Otavio Salvador (6):
>> gpu-viv-bin-mx6q: Upgrade to 1.1.0
>> xf86-video-imxfb-vivante: Upgrade to 1.1.0
>> linux-fslc: Update to 3.7.5 based kernel
>> xserver-xorg: Override PACKAGECONFIG for i.MX6 to enable DRI support
>> xf86-dri-vivante: Upgrade to 1.1.0
>> xf86-video-imxfb-vivante: Add depends/rdepends for DRI support
>>
>> .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 43 ++++---
>> .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/dri.pc | 11 ++
>> ...-mx6q_12.09.01.bb => gpu-viv-bin-mx6q_1.1.0.bb} | 5 +-
>> .../xf86-dri-vivante/fix-with-xorg-1-13.patch | 141
>> +++++++++++++++++++++ .../xorg-driver/xf86-dri-vivante_1.1.0.bb |
>> 45 +++++++
>> .../xorg-driver/xf86-dri-vivante_12.09.01.bb | 36 ------
>> .../Makefile.am-remove-prefixed-include-path.patch | 2 +
>> .../fix-vivante-compile.patch | 86 ++++++-------
>> ....09.01.bb => xf86-video-imxfb-vivante_1.1.0.bb} | 16 ++-
>> .../xorg-proto/glproto_1.4.16.bbappend | 8 ++
>> .../xorg-xserver/xserver-xorg_1.13.1.bbappend | 4 +
>> recipes-kernel/linux/linux-fslc_3.7.bb | 4 +-
>> 12 files changed, 289 insertions(+), 112 deletions(-)
>> create mode 100644
>> recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/dri.pc rename
>> recipes-graphics/gpu-viv-bin-mx6q/{gpu-viv-bin-mx6q_12.09.01.bb =>
>> gpu-viv-bin-mx6q_1.1.0.bb} (51%) create mode 100644
>> recipes-graphics/xorg-driver/xf86-dri-vivante/fix-with-xorg-1-13.patch
>> create mode 100644 recipes-graphics/xorg-driver/xf86-dri-vivante_1.1.0.bb
>> delete mode 100644
>> recipes-graphics/xorg-driver/xf86-dri-vivante_12.09.01.bb rename
>> recipes-graphics/xorg-driver/{xf86-video-imxfb-vivante_12.09.01.bb =>
>> xf86-video-imxfb-vivante_1.1.0.bb} (65%) create mode 100644
>> recipes-graphics/xorg-proto/glproto_1.4.16.bbappend create mode 100644
>> recipes-graphics/xorg-xserver/xserver-xorg_1.13.1.bbappend
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [meta-fsl-arm][PATCH v3 0/8] iMX6Q BSP 1.1.0 upgrade
2013-02-12 17:37 ` Otavio Salvador
@ 2013-02-12 17:44 ` Otavio Salvador
0 siblings, 0 replies; 13+ messages in thread
From: Otavio Salvador @ 2013-02-12 17:44 UTC (permalink / raw)
To: Thomas Senyk; +Cc: meta-freescale
On Tue, Feb 12, 2013 at 3:37 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> On Tue, Feb 12, 2013 at 10:54 AM, Thomas Senyk
> <thomas.senyk@pelagicore.com> wrote:
>> Hi,
>>
>> I tried the patch-set today and had several issues/problems.
>> Some (most?) of them are due to my own limited knowledge or my unusual setup.
>
> This patchset is driving me crazy so don't worry ;-)
>
>> This time I applied all patches of the patch-set :)
>> ... but not the upstream openembedded-core patches as I'm building without
>> X11, if this is in anyway a potential cause of errors: please let me know.
>> (How do I find the right openembbeded patches if I'm not on their mailing-
>> list? .. I guess I should be? ;)
>
> You might use patchwork http://patches.openembedded.org/project/oe-core/list
Sent it too soon ... but patchwork is not updated so it is a nightmare
to find the patches.
>> 1. Generally importing patch-set from mailing-lists.
>>
>> How do you do this? For me it's always troublesome and error-prone to manually
>> copy the patches from mail to files and apply them
>> ... I'm sure there must be a better way of doing it?
It is horrible indeed. I save them using e-mail and it is boring to
do... but it is how we can do for now.
I asked OE people to setup a patchwork for us, so it'll be easier.
>> 2. recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-
>> to-HAL.patch
>> didn't apply anymore for me with following error:
Yes; the patch were send based on 12.09.01; I did update it here ...
will resend.
>> NOTE: Applying patch '0001-change-header-path-to-HAL.patch' (../sources/meta-
>> fsl-arm/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-
>> path-to-HAL.patch)
>> ERROR: Command Error: exit status: 1 Output:
>> Applying patch 0001-change-header-path-to-HAL.patch
>> patching file usr/include/gc_vdk_types.h
>> Hunk #1 FAILED at 26.
>> 1 out of 1 hunk FAILED -- rejects in file usr/include/gc_vdk_types.h
>> Patch 0001-change-header-path-to-HAL.patch does not apply (enforce with -f)
>>
>>
>> I changed the patch to:
>> --#include "gc_hal_eglplatform.h"
>> -+#include <HAL/gc_hal_eglplatform.h>
>> +-#include "gc_hal_eglplatform_type.h"
>> ++#include <HAL/gc_hal_eglplatform_type.h>
>>
>> ... now it's building, but not sure if this was the right modification?
I think so; same as I did.
>> 3. I got a different md5-hash for gc_vdk.h
>> I got a LIC_FILS_CHKSUM error pointing me to another hash.
>> I could verify this by manually running/extracting gpu-viv-bin-mx6q-1.1.0.bin
>> and doing:
>> .../gpu-viv-bin-mx6q-1.1.0/usr/include/ head -11 gc_vdk.h|md5sum
>> c831981a5cbb2673318b77fb2f07014c -
Same here.
>> ... I do get the felling I got a different version of the drivers then the
>> rest of the people :D but it does look right:
>>
>> .../oe-yocto/fsl-community-bsp/downloads/ sha1sum gpu-viv-bin-mx6q-1.1.0.bin
>> e17d9fc743245fc270309903f5863b480ab08e71 gpu-viv-bin-mx6q-1.1.0.bin
>>
>> .../temp/ wget http://download.ossystems.com.br/bsp/freescale/source/gpu-viv-bin-mx6q-1.1.0.bin
>> .../temp/ sha1sum gpu-viv-bin-mx6q-1.1.0.bin
>> e17d9fc743245fc270309903f5863b480ab08e71 gpu-viv-bin-mx6q-1.1.0.bin
it has changed indeed.
>> 4. I build without X11 in DISTRO_FEATURES
>> ... never the less I get:
>> root@imx6qsabrelite:/usr/lib# ls libGAL* libEGL* -alh
>> -rw-r--r-- 1 root root 83.8K Feb 12 10:00 libEGL-x11.so
>> lrwxrwxrwx 1 root root 13 Feb 12 11:22 libEGL.so -> libEGL-
>> x11.so
>> -rw-r--r-- 1 root root 807.1K Feb 12 10:00 libGAL-x11.so
>> lrwxrwxrwx 1 root root 13 Feb 12 11:22 libGAL.so -> libGAL-
>> x11.so
>>
>>
>> their is a patch for that which never got "rebased & resend":
>> http://permalink.gmane.org/gmane.linux.embedded.yocto.meta-freescale/1160
>>
>> ... he might just wait for 'patch v3' to land
I have it locally as well ... I will send a v3 tomorrow with all this.
>> 5. A similar problem within to sysroot,
>> Their is no libEGL.so anymore (same for libGAL.so)
>> ... so far Qt always linked against those.
>>
>> The above mentioned patch takes care about this as well by rm *-x11.so and
>> letting the default symlinks (libEGL.so -> libEGL-fb.so) as they are
>> ...for the not-x11 case (the x11 solution looks strange though).
We need to get recipes to link explicitly to fb or x11 backends or
we'll be in a nightmare. We need to patch Qt Embedded to use the fb
one.
>>
>> 6. uname -a
>> Linux imx6qsabrelite 3.0.35-1.1.0+yocto+gc27cb38 #1 SMP PREEMPT Mon Feb 11
>> 17:07:57 CET 2013 armv7l GNU/Linux
>>
>> Their is a patch-set for switching to a newer 3.7 based kernel.
>> Can anyone clarify about the different kernels, how and why/why not switch?
>> ... should 3.7 be default or is 3.0.35 the right one for now?
3.7 is for people wishing to use mainline but it lacks many features
so I think you need 3.0.35 for now.
>> 7. I still got the shader errors:
>> vertex shader compilation error:
>> fragment shader compilation error:
>> program link error: No vertex shader attached.
>>
>> ... those might be caused by one of the errors/mistakes above?
I hope not. How do you get this errors? So I might give it a try here.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2013-02-12 17:44 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-02-06 18:42 [meta-fsl-arm][PATCH v3 0/8] iMX6Q BSP 1.1.0 upgrade Otavio Salvador
2013-02-06 18:42 ` [meta-fsl-arm][PATCH v3 1/8] gpu-viv-bin-mx6q: Upgrade to 1.1.0 Otavio Salvador
2013-02-06 18:42 ` [meta-fsl-arm][PATCH v3 2/8] xf86-video-imxfb-vivante: " Otavio Salvador
2013-02-06 18:42 ` [meta-fsl-arm][PATCH v3 3/8] linux-fslc: Update to 3.7.5 based kernel Otavio Salvador
2013-02-07 22:14 ` Otavio Salvador
2013-02-06 18:42 ` [meta-fsl-arm][PATCH v3 4/8] xserver-xorg: Override PACKAGECONFIG for i.MX6 to enable DRI support Otavio Salvador
2013-02-06 18:42 ` [meta-fsl-arm][PATCH v3 5/8] xf86-dri-vivante: Upgrade to 1.1.0 Otavio Salvador
2013-02-06 18:42 ` [meta-fsl-arm][PATCH v3 6/8] xf86-video-imxfb-vivante: Add depends/rdepends for DRI support Otavio Salvador
2013-02-06 18:42 ` [meta-fsl-arm][PATCH v3 7/8] gpu-viv-bin-mx6q: Add dri.pc Otavio Salvador
2013-02-06 18:42 ` [meta-fsl-arm][PATCH v3 8/8] glproto: Don't install glxtokens.h for imx6qsabrelite Otavio Salvador
2013-02-12 12:54 ` [meta-fsl-arm][PATCH v3 0/8] iMX6Q BSP 1.1.0 upgrade Thomas Senyk
2013-02-12 17:37 ` Otavio Salvador
2013-02-12 17:44 ` Otavio Salvador
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.