MGS-824 gpu 5.0.11.p7 kernel driver integration

Integrate 5.0.11.p7 gpu kernel driver for 3.14 kernel

Source git: gpu-viv5.git
Source branch: origin/fsl_5.0.11.p7
Source commit: 683cfd653fb350b6d6589adffd7b20a41283bc9c

Signed-off-by: Xianzhong <b07117@freescale.com>

1 files changed, 95 insertions, 61 deletions

diff --git a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h
index a38b47519a26..0c23be36cd5b 100644
--- a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h
+++ b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine_vg.h
@@ -1,20 +1,54 @@
 /****************************************************************************
 *
-*    Copyright (C) 2005 - 2015 by Vivante Corp.
+*    The MIT License (MIT)
 *
-*    This program is free software; you can redistribute it and/or modify
-*    it under the terms of the GNU General Public License as published by
-*    the Free Software Foundation; either version 2 of the license, or
-*    (at your option) any later version.
+*    Copyright (c) 2014 Vivante Corporation
+*
+*    Permission is hereby granted, free of charge, to any person obtaining a
+*    copy of this software and associated documentation files (the "Software"),
+*    to deal in the Software without restriction, including without limitation
+*    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+*    and/or sell copies of the Software, and to permit persons to whom the
+*    Software is furnished to do so, subject to the following conditions:
+*
+*    The above copyright notice and this permission notice shall be included in
+*    all copies or substantial portions of the Software.
+*
+*    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+*    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+*    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+*    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+*    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+*    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+*    DEALINGS IN THE SOFTWARE.
+*
+*****************************************************************************
+*
+*    The GPL License (GPL)
+*
+*    Copyright (C) 2014  Vivante Corporation
+*
+*    This program is free software; you can redistribute it and/or
+*    modify it under the terms of the GNU General Public License
+*    as published by the Free Software Foundation; either version 2
+*    of the License, or (at your option) any later version.
 *
 *    This program is distributed in the hope that it will be useful,
 *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 *    GNU General Public License for more details.
 *
 *    You should have received a copy of the GNU General Public License
-*    along with this program; if not write to the Free Software
-*    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*    along with this program; if not, write to the Free Software Foundation,
+*    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+*
+*****************************************************************************
+*
+*    Note: This software is released under dual MIT and GPL licenses. A
+*    recipient may use this file under the terms of either the MIT license or
+*    GPL License. If you wish to use only one license not the other, you can
+*    indicate your decision by deleting one of the above license notices in your
+*    version of this file.
 *
 *****************************************************************************/
 
@@ -465,7 +499,7 @@ gcsPATH_DATA;
 gceSTATUS
 gcoHAL_QueryPathStorage(
     IN gcoHAL Hal,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcoVG Vg,
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
@@ -479,7 +513,7 @@ gcoHAL_QueryPathStorage(
 gceSTATUS
 gcoHAL_AssociateCompletion(
     IN gcoHAL Hal,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcoVG Vg,
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
@@ -493,7 +527,7 @@ gcoHAL_AssociateCompletion(
 gceSTATUS
 gcoHAL_DeassociateCompletion(
     IN gcoHAL Hal,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcoVG Vg,
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
@@ -507,7 +541,7 @@ gcoHAL_DeassociateCompletion(
 gceSTATUS
 gcoHAL_CheckCompletion(
     IN gcoHAL Hal,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcoVG Vg,
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
@@ -521,7 +555,7 @@ gcoHAL_CheckCompletion(
 gceSTATUS
 gcoHAL_WaitCompletion(
     IN gcoHAL Hal,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcoVG Vg,
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
@@ -535,7 +569,7 @@ gcoHAL_WaitCompletion(
 gceSTATUS
 gcoHAL_Flush(
     IN gcoHAL Hal
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     ,
     IN gcoVG Vg,
     IN gcsPROFILERFUNCNODE *DList,
@@ -549,7 +583,7 @@ gcoHAL_Flush(
 gceSTATUS
 gcoHAL_SplitAddress(
     IN gcoHAL Hal,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcoVG Vg,
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
@@ -565,7 +599,7 @@ gcoHAL_SplitAddress(
 gceSTATUS
 gcoHAL_CombineAddress(
     IN gcoHAL Hal,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcoVG Vg,
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
@@ -581,7 +615,7 @@ gcoHAL_CombineAddress(
 gceSTATUS
 gcoHAL_ScheduleVideoMemory(
     IN gcoHAL Hal,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcoVG Vg,
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
@@ -595,7 +629,7 @@ gcoHAL_ScheduleVideoMemory(
 gceSTATUS
 gcoHAL_FreeVideoMemory(
     IN gcoHAL Hal,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcoVG Vg,
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
@@ -609,7 +643,7 @@ gcoHAL_FreeVideoMemory(
 gceSTATUS
 gcoHAL_QueryCommandBuffer(
     IN gcoHAL Hal,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcoVG Vg,
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
@@ -622,7 +656,7 @@ gcoHAL_QueryCommandBuffer(
 gceSTATUS
 gcoHAL_AllocateLinearVideoMemory(
     IN gcoHAL Hal,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcoVG Vg,
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
@@ -641,7 +675,7 @@ gcoHAL_AllocateLinearVideoMemory(
 gceSTATUS
 gcoHAL_GetAlignedSurfaceSize(
     IN gcoHAL Hal,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcoVG Vg,
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
@@ -656,7 +690,7 @@ gcoHAL_GetAlignedSurfaceSize(
 gceSTATUS
 gcoHAL_ReserveTask(
     IN gcoHAL Hal,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcoVG Vg,
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
@@ -676,7 +710,7 @@ gcoHAL_ReserveTask(
 **
 **  The gcoVG object abstracts the VG hardware pipe.
 */
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
 void
 gcoVG_ProfilerEnableDisable(
     IN gcoVG Vg,
@@ -709,7 +743,7 @@ gcoVG_ProfilerSetStates(
 
 gctBOOL
 gcoVG_IsMaskSupported(
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcoVG Vg,
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
@@ -721,7 +755,7 @@ gcoVG_IsMaskSupported(
 
 gctBOOL
 gcoVG_IsTargetSupported(
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcoVG Vg,
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
@@ -733,7 +767,7 @@ gcoVG_IsTargetSupported(
 
 gctBOOL
 gcoVG_IsImageSupported(
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcoVG Vg,
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
@@ -744,7 +778,7 @@ gcoVG_IsImageSupported(
     );
 
 gctUINT8 gcoVG_PackColorComponent(
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     gcoVG Vg,
     gcsPROFILERFUNCNODE *DList,
     gctUINT TreeDepth,
@@ -763,7 +797,7 @@ gcoVG_Construct(
 gceSTATUS
 gcoVG_Destroy(
     IN gcoVG Vg
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     ,
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
@@ -775,7 +809,7 @@ gcoVG_Destroy(
 gceSTATUS
 gcoVG_SetTarget(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,
@@ -787,7 +821,7 @@ gcoVG_SetTarget(
 gceSTATUS
 gcoVG_UnsetTarget(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,
@@ -799,7 +833,7 @@ gcoVG_UnsetTarget(
 gceSTATUS
 gcoVG_SetUserToSurface(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,
@@ -811,7 +845,7 @@ gcoVG_SetUserToSurface(
 gceSTATUS
 gcoVG_SetSurfaceToImage(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,
@@ -823,7 +857,7 @@ gcoVG_SetSurfaceToImage(
 gceSTATUS
 gcoVG_EnableMask(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,
@@ -835,7 +869,7 @@ gcoVG_EnableMask(
 gceSTATUS
 gcoVG_SetMask(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,
@@ -847,7 +881,7 @@ gcoVG_SetMask(
 gceSTATUS
 gcoVG_UnsetMask(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,
@@ -859,7 +893,7 @@ gcoVG_UnsetMask(
 gceSTATUS
 gcoVG_FlushMask(
     IN gcoVG Vg
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     ,
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
@@ -871,7 +905,7 @@ gcoVG_FlushMask(
 gceSTATUS
 gcoVG_EnableScissor(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,
@@ -883,7 +917,7 @@ gcoVG_EnableScissor(
 gceSTATUS
 gcoVG_SetScissor(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,
@@ -896,7 +930,7 @@ gcoVG_SetScissor(
 gceSTATUS
 gcoVG_EnableColorTransform(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,
@@ -908,7 +942,7 @@ gcoVG_EnableColorTransform(
 gceSTATUS
 gcoVG_SetColorTransform(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,
@@ -920,7 +954,7 @@ gcoVG_SetColorTransform(
 gceSTATUS
 gcoVG_SetTileFillColor(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,
@@ -935,7 +969,7 @@ gcoVG_SetTileFillColor(
 gceSTATUS
 gcoVG_SetSolidPaint(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,
@@ -950,7 +984,7 @@ gcoVG_SetSolidPaint(
 gceSTATUS
 gcoVG_SetLinearPaint(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,
@@ -964,7 +998,7 @@ gcoVG_SetLinearPaint(
 gceSTATUS
 gcoVG_SetRadialPaint(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,
@@ -984,7 +1018,7 @@ gcoVG_SetRadialPaint(
 gceSTATUS
 gcoVG_SetPatternPaint(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,
@@ -1002,7 +1036,7 @@ gcoVG_SetPatternPaint(
 gceSTATUS
 gcoVG_SetColorRamp(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,
@@ -1015,7 +1049,7 @@ gcoVG_SetColorRamp(
 gceSTATUS
 gcoVG_SetPattern(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,
@@ -1031,7 +1065,7 @@ gcoVG_SetPattern(
 gceSTATUS
 gcoVG_SetImageMode(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,
@@ -1043,7 +1077,7 @@ gcoVG_SetImageMode(
 gceSTATUS
 gcoVG_SetBlendMode(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,
@@ -1055,7 +1089,7 @@ gcoVG_SetBlendMode(
 gceSTATUS
 gcoVG_SetRenderingQuality(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,
@@ -1067,7 +1101,7 @@ gcoVG_SetRenderingQuality(
 gceSTATUS
 gcoVG_SetFillRule(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,
@@ -1085,7 +1119,7 @@ gcoVG_FinalizePath(
 gceSTATUS
 gcoVG_Clear(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,
@@ -1100,7 +1134,7 @@ gcoVG_Clear(
 gceSTATUS
 gcoVG_DrawPath(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,
@@ -1120,7 +1154,7 @@ gcoVG_DrawPath(
 gceSTATUS
 gcoVG_DrawImage(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,
@@ -1143,7 +1177,7 @@ gcoVG_DrawImage(
 gceSTATUS
 gcoVG_TesselateImage(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,
@@ -1164,7 +1198,7 @@ gcoVG_TesselateImage(
 gceSTATUS
 gcoVG_DrawSurfaceToImage(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,
@@ -1182,7 +1216,7 @@ gcoVG_DrawSurfaceToImage(
 gceSTATUS
 gcoVG_Blit(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,
@@ -1199,7 +1233,7 @@ gcoVG_Blit(
 gceSTATUS
 gcoVG_ColorMatrix(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,
@@ -1220,7 +1254,7 @@ gcoVG_ColorMatrix(
 gceSTATUS
 gcoVG_SeparableConvolve(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,
@@ -1251,7 +1285,7 @@ gcoVG_SeparableConvolve(
 gceSTATUS
 gcoVG_GaussianBlur(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,
@@ -1276,7 +1310,7 @@ gcoVG_GaussianBlur(
 gceSTATUS
 gcoVG_EnableDither(
     IN gcoVG Vg,
-#if GC355_PROFILER
+#if gcdGC355_PROFILER
     IN gcsPROFILERFUNCNODE *DList,
     IN gctUINT TreeDepth,
     IN gctUINT saveLayerTreeDepth,