xf86-video-imxfb-vivante: Upgrade to 5.0.11.p7.4 version

- License changed to MIT.
- Remove the upstreamed patch.

Signed-off-by: Neena Busireddy <neena.busireddy@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

4 files changed, 12 insertions, 150 deletions

diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc
index 9f856b3f6..aa37555a1 100644
--- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc
+++ b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante.inc
@@ -10,7 +10,7 @@ inherit autotools-brokensep update-rc.d pkgconfig
 
 DEPENDS += "virtual/xserver virtual/libx11 virtual/libgal-x11 imx-gpu-viv pixman"
 
-LIC_FILES_CHKSUM = "file://COPYING-GPL-2;md5=59530bdf33659b29e73d4adb9f9f6552"
+LIC_FILES_CHKSUM = "file://COPYING-MIT;md5=b5e9d9f5c02ea831ab3ecf802bb7c4f3"
 
 SRC_URI = "${FSL_MIRROR}/xserver-xorg-video-imx-viv-${PV}.tar.gz \
             file://rc.autohdmi"
diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/0001-MGS-907-X11-EXA-Warnings-causes-GCC5.2-build-to-fail.patch b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/0001-MGS-907-X11-EXA-Warnings-causes-GCC5.2-build-to-fail.patch
deleted file mode 100644
index cb7e43277..000000000
--- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/0001-MGS-907-X11-EXA-Warnings-causes-GCC5.2-build-to-fail.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From 194e357faf3d7433ad4f1f2cf46f79d314ea5b38 Mon Sep 17 00:00:00 2001
-From: Prabhu <prabhu.sundararaj@freescale.com>
-Date: Wed, 29 Jul 2015 15:32:01 -0500
-Subject: [PATCH] MGS-907: X11 EXA: Warnings causes GCC5.2 build to fail
-
-VIV2DGPUSurfaceReAllocNonCached and imxRefreshModes were not
-declared causing compiler warning.
-
-Upstream Status: Pending
-
-Date: July 29, 2015
-Signed-off-by: Prabhu <prabhu.sundararaj@freescale.com>
----
- EXA/src/vivante_extension/vivante_ext.c      | 4 ++--
- EXA/src/vivante_fbdev/imx_display.c          | 4 +++-
- EXA/src/vivante_fbdev/vivante_fbdev_driver.c | 2 ++
- EXA/src/vivante_gal/vivante_gal.h            | 1 +
- EXA/src/vivante_gal/vivante_gal_surface.c    | 3 ++-
- EXA/src/vivante_gal/vivante_priv.h           | 4 ++++
- 6 files changed, 14 insertions(+), 4 deletions(-)
- mode change 100755 => 100644 EXA/src/vivante_extension/vivante_ext.c
- mode change 100755 => 100644 EXA/src/vivante_gal/vivante_gal_surface.c
-
-diff --git a/EXA/src/vivante_extension/vivante_ext.c b/EXA/src/vivante_extension/vivante_ext.c
-old mode 100755
-new mode 100644
-index 4bcc5ba..0d1085b
---- a/EXA/src/vivante_extension/vivante_ext.c
-+++ b/EXA/src/vivante_extension/vivante_ext.c
-@@ -54,6 +54,7 @@
- #include "vivante.h"
- #include "vivante_priv.h"
- #include "vivante_common.h"
-+#include "imx_display.h"
- 
- static unsigned char VIVEXTReqCode = 0;
- static int VIVEXTErrorBase;
-@@ -162,8 +163,7 @@ static int ProcVIVEXTDrawableSetFlag(register ClientPtr client)
-             VivPtr pViv = VIVPTR_FROM_SCREEN(pScreen);
-             if(pViv)
-             {
--                VIVGPUPtr gpuctx = (VIVGPUPtr) pViv->mGrCtx.mGpu;
--                VIV2DGPUSurfaceReAllocNonCached(gpuctx, ppriv);
-+                VIV2DGPUSurfaceReAllocNonCached(&pViv->mGrCtx, ppriv);
-                 // set tiled if asked
-                 if(stuff->flag & VIVPIXMAP_FLAG_SHARED_TILED)
-                 {
-diff --git a/EXA/src/vivante_fbdev/imx_display.c b/EXA/src/vivante_fbdev/imx_display.c
-index 876d37e..8d4eaa0 100644
---- a/EXA/src/vivante_fbdev/imx_display.c
-+++ b/EXA/src/vivante_fbdev/imx_display.c
-@@ -27,6 +27,8 @@
- 
- #include <fcntl.h>
- #include <errno.h>
-+#include <unistd.h>
-+#include <sys/ioctl.h>
-  
- #include <linux/fb.h>
- #include "xf86DDC.h"
-@@ -83,7 +85,7 @@ GCD(int a, int b)
- }
- 
- static int
--LCM(a, b)
-+LCM(int a, int b)
- {
-        return (a * b) / GCD(a, b);
- }
-diff --git a/EXA/src/vivante_fbdev/vivante_fbdev_driver.c b/EXA/src/vivante_fbdev/vivante_fbdev_driver.c
-index ec407df..d35912a 100644
---- a/EXA/src/vivante_fbdev/vivante_fbdev_driver.c
-+++ b/EXA/src/vivante_fbdev/vivante_fbdev_driver.c
-@@ -29,8 +29,10 @@
- #include "vivante.h"
- #include "vivante_exa.h"
- #include "vivante_ext.h"
-+#include "vivante_dri.h"
- #include "imx_display.h"
- #include <errno.h>
-+#include <sys/ioctl.h>
- #include <linux/fb.h>
- #include <xorg/shmint.h>
- 
-diff --git a/EXA/src/vivante_gal/vivante_gal.h b/EXA/src/vivante_gal/vivante_gal.h
-index e186eda..332c773 100644
---- a/EXA/src/vivante_gal/vivante_gal.h
-+++ b/EXA/src/vivante_gal/vivante_gal.h
-@@ -260,6 +260,7 @@ extern "C" {
-     Bool VIV2DCacheOperation(GALINFOPTR galInfo, Viv2DPixmapPtr ppix, VIVFLUSHTYPE flush_type, int onLinearBuffer);
-     Bool VIV2DGPUUserMemMap(char* logical, unsigned int physical, unsigned int size, void ** mappingInfo, unsigned int * gpuAddress);
-     Bool VIV2DGPUUserMemUnMap(char* logical, unsigned int size, void * mappingInfo, unsigned int gpuAddress);
-+    Bool VIV2DGPUSurfaceReAllocNonCached(GALINFOPTR galInfo, Viv2DPixmapPtr ppriv);
-     Bool MapUserMemToGPU(GALINFOPTR galInfo, MemMapInfoPtr mmInfo);
-     void UnmapUserMem(GALINFOPTR galInfo, MemMapInfoPtr mmInfo);
-     /************************************************************************
-diff --git a/EXA/src/vivante_gal/vivante_gal_surface.c b/EXA/src/vivante_gal/vivante_gal_surface.c
-old mode 100755
-new mode 100644
-index 036b61b..0234814
---- a/EXA/src/vivante_gal/vivante_gal_surface.c
-+++ b/EXA/src/vivante_gal/vivante_gal_surface.c
-@@ -673,7 +673,8 @@ static gctBOOL VIV2DGPUSurfaceAlloc(VIVGPUPtr gpuctx, gctUINT alignedWidth, gctU
-     return VIV2DGPUSurfaceAllocEx(gpuctx, alignedWidth, alignedHeight, bytesPerPixel, surface, getPixmapCachePolicy());
- }
- 
--gctBOOL VIV2DGPUSurfaceReAllocNonCached(VIVGPUPtr gpuctx, Viv2DPixmapPtr ppriv) {
-+Bool VIV2DGPUSurfaceReAllocNonCached(GALINFOPTR galInfo, Viv2DPixmapPtr ppriv) {
-+    VIVGPUPtr gpuctx = (VIVGPUPtr)galInfo->mGpu;
-     GenericSurfacePtr oldSurf = gcvNULL;
-     GenericSurfacePtr newSurf = gcvNULL;
-     gctUINT32 alignedWidth;
-diff --git a/EXA/src/vivante_gal/vivante_priv.h b/EXA/src/vivante_gal/vivante_priv.h
-index e8ee3d2..05f5748 100644
---- a/EXA/src/vivante_gal/vivante_priv.h
-+++ b/EXA/src/vivante_gal/vivante_priv.h
-@@ -29,6 +29,7 @@ extern "C" {
- #include "HAL/gc_hal.h"
- #include "HAL/gc_hal_raster.h"
- #include "HAL/gc_hal_base.h"
-+#include "vivante_debug.h"
- 
-     /************************************************************************
-      * PIXMAP_HANDLING_STUFF(START)
-@@ -97,6 +98,9 @@ extern "C" {
-      * DRIVER & DEVICE  Structs (END)
-      *************************************************************************/
- 
-+    gctBOOL VIV2DGPUSurfaceAllocEx(VIVGPUPtr gpuctx, gctUINT alignedWidth, gctUINT alignedHeight,
-+        gctUINT bytesPerPixel, GenericSurfacePtr * surface, enum PixmapCachePolicy cachePolicy);
-+
- #ifdef __cplusplus
- }
- #endif
--- 
-1.8.4.5
-
diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p7.1.bb b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p7.1.bb
deleted file mode 100644
index 9fdd73afe..000000000
--- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p7.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (C) 2012-2015 Freescale Semiconductor
-# Copyright (C) 2012-2014 O.S. Systems Software LTDA.
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-require xf86-video-imxfb-vivante.inc
-
-SRC_URI += "file://0001-MGS-907-X11-EXA-Warnings-causes-GCC5.2-build-to-fail.patch \
-            file://Stop-using-Git-to-write-local-version.patch \
-            file://Remove-dix-internal-header-usage.patch"
-
-SRC_URI[md5sum] = "05c54ed6d63e2a21dc18219e70869c29"
-SRC_URI[sha256sum] = "ab6a896cafba324105d26f52b7dad2c41d04d75cc9e48b66e8041a95660a04ee"
diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p7.4.bb b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p7.4.bb
new file mode 100644
index 000000000..4c8af46ae
--- /dev/null
+++ b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_5.0.11.p7.4.bb
@@ -0,0 +1,11 @@
+# Copyright (C) 2012-2015 Freescale Semiconductor
+# Copyright (C) 2012-2014 O.S. Systems Software LTDA.
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+require xf86-video-imxfb-vivante.inc
+
+SRC_URI += "file://Stop-using-Git-to-write-local-version.patch \
+            file://Remove-dix-internal-header-usage.patch"
+
+SRC_URI[md5sum] = "6e2d8ee518e9eef8421e9dcdc1ea79c3"
+SRC_URI[sha256sum] = "3effaf42bde64da8fad2dfe0dcef12d1cfbbbe189511dbd4612442129fd832cc"