Commit cb7bb25c authored by Jérôme Pouiller's avatar Jérôme Pouiller Committed by Thomas Petazzoni
Browse files

xdriver_xf86-video-imx: new package 



X.Org driver for iMX5 GPU. Most of patches come from Yocto project.

Tested using:
    mx5loco_defconfig +
    BR2_TOOLCHAIN_EXTERNAL=y
    BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
    BR2_PACKAGE_QT5=y
    BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y
    BR2_PACKAGE_QT5BASE_EXAMPLES=y
    BR2_PACKAGE_QT5BASE_OPENGL_LIB=y
    BR2_PACKAGE_QT5BASE_XCB=y
    BR2_PACKAGE_QT5BASE_DEFAULT_QPA="xcb"
    BR2_PACKAGE_QT5BASE_GIF=y
    BR2_PACKAGE_QT5BASE_JPEG=y
    BR2_PACKAGE_QT5BASE_PNG=y
    BR2_PACKAGE_QT5QUICKCONTROLS=y
    BR2_PACKAGE_XORG7=y
    BR2_PACKAGE_XSERVER_XORG_SERVER=y
    BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR=y
    BR2_PACKAGE_XDRIVER_XF86_INPUT_EVDEV=y
    BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMX=y
    BR2_PACKAGE_FREESCALE_IMX=y
    BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53=y
    BR2_PACKAGE_GPU_AMD_BIN_MX51=y
    BR2_PACKAGE_GPU_AMD_BIN_MX51_EXAMPLES=y

[Thomas: minor tweaks to Config.in.]

Signed-off-by: default avatarJérôme Pouiller <jezz@sysmic.org>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 1814da76

package/x11r7/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ if BR2_PACKAGE_XORG7 
		source package/x11r7/xdriver_xf86-video-glide/Config.in

		source package/x11r7/xdriver_xf86-video-glint/Config.in

		source package/x11r7/xdriver_xf86-video-i128/Config.in

		source package/x11r7/xdriver_xf86-video-imx/Config.in

		source package/x11r7/xdriver_xf86-video-intel/Config.in

		source package/x11r7/xdriver_xf86-video-mach64/Config.in

		source package/x11r7/xdriver_xf86-video-mga/Config.in

package/x11r7/xdriver_xf86-video-imx/0001-Update-to-newer-swap-macros.patch

0 → 100644
+65 −0
Original line number Diff line number Diff line 
From fc7f191a1a0f290a4e808dd8f9bd58ba1dbd2be4 Mon Sep 17 00:00:00 2001

From: Otavio Salvador <otavio@ossystems.com.br>

Date: Sat, 29 Dec 2012 18:00:36 -0200

Subject: [PATCH 1/2] ext: Update to newer swap macros



The swap macros now use an internal temporary variable so we need to

adapt the code according.



Upstream-Status: Pending



Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

---

 src/imx_ext.c |   16 ++++++----------

 1 file changed, 6 insertions(+), 10 deletions(-)



diff --git a/src/imx_ext.c b/src/imx_ext.c

index f12469a..710cba4 100644

--- a/src/imx_ext.c

+++ b/src/imx_ext.c

@@ -57,8 +57,6 @@ void imxExtInit()

 static int

 Proc_IMX_EXT_GetPixmapPhysAddr(ClientPtr client)

 {

-	int n;

-

 	REQUEST(xIMX_EXT_GetPixmapPhysAddrReq);

 	REQUEST_SIZE_MATCH(xIMX_EXT_GetPixmapPhysAddrReq);

 

@@ -96,10 +94,10 @@ Proc_IMX_EXT_GetPixmapPhysAddr(ClientPtr client)

 	/* Check if any reply values need byte swapping */

 	if (client->swapped) {

 

-		swaps(&rep.sequenceNumber, n);

-		swapl(&rep.length, n);

-		swapl(&rep.pixmapPhysAddr, n);

-		swapl(&rep.pixmapPitch, n);

+		swaps(&rep.sequenceNumber);

+		swapl(&rep.length);

+		swapl(&rep.pixmapPhysAddr);

+		swapl(&rep.pixmapPitch);

 	}

 

 	/* Reply to client */

@@ -123,16 +121,14 @@ Proc_IMX_EXT_Dispatch(ClientPtr client)

 static int

 SProc_IMX_EXT_GetPixmapPhysAddr(ClientPtr client)

 {

-	int n;

-

 	REQUEST(xIMX_EXT_GetPixmapPhysAddrReq);

 

 	/* Swap request message length and verify it is correct. */

-	swaps(&stuff->length, n);

+	swaps(&stuff->length);

 	REQUEST_SIZE_MATCH(xIMX_EXT_GetPixmapPhysAddrReq);

 

 	/* Swap remaining request message parameters. */

-	swapl(&stuff->pixmap, n);

+	swapl(&stuff->pixmap);

 

 	return Proc_IMX_EXT_GetPixmapPhysAddr(client);

 }

-- 

1.7.10.4

package/x11r7/xdriver_xf86-video-imx/0002-Fix-error-unknown-type-name-uint.patch

0 → 100644
+33 −0
Original line number Diff line number Diff line 
From ccdfce5e75ba707deacdd5808a8f3de8744848d0 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>

Date: Tue, 5 Feb 2013 10:57:47 +0100

Subject: [PATCH] Fix "error: unknown type name 'uint'"

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit



In file included from imx_driver.c:33:0:

.../sysroots/imx53qsb/usr/src/kernel/include/linux/mxcfb.h:107:2: error: unknown type name 'uint'



Upstream-Status: Pending



Signed-off-by: Eric Bénard <eric@eukrea.com>

---

 src/imx_driver.c |    1 +

 1 file changed, 1 insertion(+)



diff --git a/src/imx_driver.c b/src/imx_driver.c

index f4b3e38..4cf662d 100644

--- a/src/imx_driver.c

+++ b/src/imx_driver.c

@@ -29,6 +29,7 @@

 #include <errno.h>

 #include <fcntl.h>

 #include <string.h>

+#include <sys/types.h>

 #include <linux/fb.h>

 #include <linux/mxcfb.h>

 

-- 

1.7.10.4

package/x11r7/xdriver_xf86-video-imx/0003-support-glibc-2.20.patch

0 → 100644
+57 −0
Original line number Diff line number Diff line 
Fix build errors seen with glibc 2.20



/home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/imx53qsb/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__'

 strndup(const char *str, size_t n);

 ^



Signed-off-by: Khem Raj <raj.khem@gmail.com>

Upstream-Status: Pending

Index: xserver-xorg-video-imx-11.09.01/src/imx_accel.c

===================================================================

--- xserver-xorg-video-imx-11.09.01.orig/src/imx_accel.c	2011-07-26 14:22:47.000000000 -0700

+++ xserver-xorg-video-imx-11.09.01/src/imx_accel.c	2014-08-29 15:54:43.648070587 -0700

@@ -21,6 +21,7 @@

  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 

  * SOFTWARE.

  */

+#include <xorg-server.h>

 

 #include <stdint.h>

 #include "xf86.h"

Index: xserver-xorg-video-imx-11.09.01/src/imx_exa_offscreen.c

===================================================================

--- xserver-xorg-video-imx-11.09.01.orig/src/imx_exa_offscreen.c	2014-08-29 15:26:31.992070587 -0700

+++ xserver-xorg-video-imx-11.09.01/src/imx_exa_offscreen.c	2014-08-29 15:54:54.632070587 -0700

@@ -53,7 +53,7 @@

  * When allocating, the contiguous block of areas with the minimum eviction

  * cost is found and evicted in order to make room for the new allocation.

  */

-

+#include <xorg-server.h>

 

 #include "xf86.h"

 #include "exa.h"

Index: xserver-xorg-video-imx-11.09.01/src/imx_exa_z160.c

===================================================================

--- xserver-xorg-video-imx-11.09.01.orig/src/imx_exa_z160.c	2014-08-29 15:26:31.992070587 -0700

+++ xserver-xorg-video-imx-11.09.01/src/imx_exa_z160.c	2014-08-29 15:54:36.056070587 -0700

@@ -21,6 +21,7 @@

  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 

  * SOFTWARE.

  */

+#include <xorg-server.h>

 

 #include "xf86.h"

 #include "xf86_OSproc.h"

Index: xserver-xorg-video-imx-11.09.01/src/imx_ext.c

===================================================================

--- xserver-xorg-video-imx-11.09.01.orig/src/imx_ext.c	2014-08-29 15:26:32.064070587 -0700

+++ xserver-xorg-video-imx-11.09.01/src/imx_ext.c	2014-08-29 15:55:18.048070587 -0700

@@ -21,6 +21,7 @@

  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 

  * SOFTWARE.

  */

+#include <xorg-server.h>

 

 #include <X11/X.h>

 #include <X11/Xproto.h>

package/x11r7/xdriver_xf86-video-imx/0004-Make-video-API-forward-and-backward-compatible.patch

0 → 100644
+787 −0

File added.

Preview size limit exceeded, changes collapsed.