From f7195017dd439b053232759f7ce8ef297d1f3790 Mon Sep 17 00:00:00 2001 From: Neena Busireddy Date: Mon, 4 Jan 2016 20:39:20 -0600 Subject: 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 Signed-off-by: Otavio Salvador --- ...-EXA-Warnings-causes-GCC5.2-build-to-fail.patch | 137 --------------------- 1 file changed, 137 deletions(-) delete mode 100644 recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/0001-MGS-907-X11-EXA-Warnings-causes-GCC5.2-build-to-fail.patch (limited to 'recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/0001-MGS-907-X11-EXA-Warnings-causes-GCC5.2-build-to-fail.patch') 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 cb7e4327..00000000 --- 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 -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 ---- - 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 - #include -+#include -+#include - - #include - #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 -+#include - #include - #include - -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 - -- cgit v1.2.3-54-g00ecf