Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 72025E00D76; Mon, 14 Sep 2015 14:09:56 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-HAM-Report: * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider * (max.oss.09[at]gmail.com) * -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low * trust * [209.85.212.170 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's * domain * 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily * valid * -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com [209.85.212.170]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 04348E00BE7 for ; Mon, 14 Sep 2015 14:09:53 -0700 (PDT) Received: by wiclk2 with SMTP id lk2so1819312wic.1 for ; Mon, 14 Sep 2015 14:09:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=EIXS0xRM7SxqIX5LglNggFEwchrhsJQywa2x8RjgwMc=; b=byRwITAvt2M7hG+2Rex+9xVnITzzViZ91iB8cU85SsC+8nQQ0tN5I0UdKnanMGHYeD mijj/ugYMHkRLrKBznMles93ZrxTEGvcn6g4NYzzh6Kf+pkHOPM0lfa8XlnSnIzvPjXT m+t51wi7hPSSqE0a8ijvhQC08TauZPmShtOrpDxpmyoglG4b9Go4Pud9QxROOGXLwfow V/Q7TD7702W4l7FtYF59RalH+KAT5ZUl2dNOjvZ8tweRBa5MQ/nvr+XA2In2au85QnTU h0UsjLAppSu4350+MdQoK/47+sq0lHxsNbKjvqanjUqPYzwU24qLhcPnCSymBWmpoqut LWyg== X-Received: by 10.180.76.232 with SMTP id n8mr28247wiw.72.1442264992385; Mon, 14 Sep 2015 14:09:52 -0700 (PDT) Received: from Saturn.local.all (212-41-70-36.adsl.solnet.ch. [212.41.70.36]) by smtp.gmail.com with ESMTPSA id kb9sm17444816wjb.49.2015.09.14.14.09.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Sep 2015 14:09:51 -0700 (PDT) From: Max Krummenacher To: meta-freescale@yoctoproject.org Date: Mon, 14 Sep 2015 23:09:13 +0200 Message-Id: <1442264954-17002-1-git-send-email-max.oss.09@gmail.com> X-Mailer: git-send-email 1.8.4.5 Subject: [meta-fsl-arm][PATCH 1/2] xf86-video-imxfb-vivante: forward port GCC5.2 patch X-BeenThere: meta-freescale@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Usage and development list for the meta-fsl-* layers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Sep 2015 21:09:56 -0000 Port to 5.0.11.p6.3-beta. Signed-off-by: Max Krummenacher --- ...-EXA-Warnings-causes-GCC5.2-build-to-fail.patch | 51 ++++++++++++++++------ 1 file changed, 37 insertions(+), 14 deletions(-) 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 index bacbe13..cb7e432 100644 --- 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 @@ -1,4 +1,4 @@ -From 2d076ce73e849eae5c47941b6950efb65db498d2 Mon Sep 17 00:00:00 2001 +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 @@ -16,14 +16,15 @@ Signed-off-by: Prabhu 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 ++- - 5 files changed, 10 insertions(+), 4 deletions(-) + 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 3015d57..df6fb61 +index 4bcc5ba..0d1085b --- a/EXA/src/vivante_extension/vivante_ext.c +++ b/EXA/src/vivante_extension/vivante_ext.c @@ -54,6 +54,7 @@ @@ -41,11 +42,11 @@ index 3015d57..df6fb61 - VIVGPUPtr gpuctx = (VIVGPUPtr) pViv->mGrCtx.mGpu; - VIV2DGPUSurfaceReAllocNonCached(gpuctx, ppriv); + VIV2DGPUSurfaceReAllocNonCached(&pViv->mGrCtx, ppriv); - } - } - return 0; + // 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 d5303f9..43e9432 100644 +index 876d37e..8d4eaa0 100644 --- a/EXA/src/vivante_fbdev/imx_display.c +++ b/EXA/src/vivante_fbdev/imx_display.c @@ -27,6 +27,8 @@ @@ -67,7 +68,7 @@ index d5303f9..43e9432 100644 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 3e289ce..88de4e0 100644 +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 @@ @@ -82,11 +83,11 @@ index 3e289ce..88de4e0 100644 #include diff --git a/EXA/src/vivante_gal/vivante_gal.h b/EXA/src/vivante_gal/vivante_gal.h -index 1fccbfd..46f0479 100644 +index e186eda..332c773 100644 --- a/EXA/src/vivante_gal/vivante_gal.h +++ b/EXA/src/vivante_gal/vivante_gal.h -@@ -258,6 +258,7 @@ extern "C" { - Bool VIV2DCacheOperation(GALINFOPTR galInfo, Viv2DPixmapPtr ppix, VIVFLUSHTYPE flush_type); +@@ -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); @@ -96,10 +97,10 @@ index 1fccbfd..46f0479 100644 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 0ea67f6..f3b998d +index 036b61b..0234814 --- a/EXA/src/vivante_gal/vivante_gal_surface.c +++ b/EXA/src/vivante_gal/vivante_gal_surface.c -@@ -584,7 +584,8 @@ static gctBOOL VIV2DGPUSurfaceAlloc(VIVGPUPtr gpuctx, gctUINT alignedWidth, gctU +@@ -673,7 +673,8 @@ static gctBOOL VIV2DGPUSurfaceAlloc(VIVGPUPtr gpuctx, gctUINT alignedWidth, gctU return VIV2DGPUSurfaceAllocEx(gpuctx, alignedWidth, alignedHeight, bytesPerPixel, surface, getPixmapCachePolicy()); } @@ -109,6 +110,28 @@ index 0ea67f6..f3b998d 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 -- -2.4.5 +1.8.4.5 -- 1.8.4.5