diff options
Diffstat (limited to 'drivers/mxc/gpu-viv/hal/kernel/inc')
21 files changed, 136 insertions, 287 deletions
diff --git a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h index 5fcc4ae612b7..2800d420c5d8 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h +++ b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal.h @@ -2,7 +2,7 @@ * * The MIT License (MIT) * -* Copyright (c) 2014 Vivante Corporation +* Copyright (c) 2014 - 2015 Vivante Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -26,7 +26,7 @@ * * The GPL License (GPL) * -* Copyright (C) 2014 Vivante Corporation +* Copyright (C) 2014 - 2015 Vivante Corporation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h index 7a5cb12b5d18..0f8783533ef0 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h +++ b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_base.h @@ -2,7 +2,7 @@ * * The MIT License (MIT) * -* Copyright (c) 2014 Vivante Corporation +* Copyright (c) 2014 - 2015 Vivante Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -26,7 +26,7 @@ * * The GPL License (GPL) * -* Copyright (C) 2014 Vivante Corporation +* Copyright (C) 2014 - 2015 Vivante Corporation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -134,190 +134,6 @@ typedef struct _gcsUSER_MEMORY_DESC * gcsUSER_MEMORY_DESC_PTR; }\ } -#if defined(ANDROID) -typedef struct _gcoOS_SymbolsList gcoOS_SymbolsList; -#endif - -/******************************************************************************\ -******************************* Process local storage ************************* -\******************************************************************************/ - -typedef struct _gcsPLS * gcsPLS_PTR; - -#if gcdENABLE_3D -/****************************************************************************** -** -** Patch defines which should be moved to dedicate file later -** -** !!! ALWAYS ADD new ID in the TAIL, otherwise will break exising TRACE FILE -*******************************************************************************/ -typedef enum _gcePATCH_ID -{ - gcvPATCH_NOTINIT = -1, - gcvPATCH_INVALID = 0, - -#if gcdDEBUG_OPTION - gcvPATCH_DEBUG, -#endif - - gcvPATCH_GTFES30, - gcvPATCH_CTGL11, - gcvPATCH_CTGL20, - gcvPATCH_GLBM11, - gcvPATCH_GLBM21, - gcvPATCH_GLBM25, - gcvPATCH_GLBM27, - gcvPATCH_GLBMGUI, - gcvPATCH_GFXBENCH, - gcvPATCH_ANTUTU, /* Antutu 3.x */ - gcvPATCH_ANTUTU4X, /* Antutu 4.x */ - gcvPATCH_QUADRANT, - gcvPATCH_GPUBENCH, - gcvPATCH_DUOKAN, - gcvPATCH_GLOFTSXHM, - gcvPATCH_XRUNNER, - gcvPATCH_BUSPARKING3D, - gcvPATCH_SIEGECRAFT, - gcvPATCH_PREMIUM, - gcvPATCH_RACEILLEGAL, - gcvPATCH_MEGARUN, - gcvPATCH_BMGUI, - gcvPATCH_NENAMARK, - gcvPATCH_NENAMARK2, - gcvPATCH_FISHNOODLE, - gcvPATCH_MM06, - gcvPATCH_MM07, - gcvPATCH_BM21, - gcvPATCH_SMARTBENCH, - gcvPATCH_JPCT, - gcvPATCH_NEOCORE, - gcvPATCH_RTESTVA, - gcvPATCH_NBA2013, - gcvPATCH_BARDTALE, - gcvPATCH_F18, - gcvPATCH_CARPARK, - gcvPATCH_CARCHALLENGE, - gcvPATCH_HEROESCALL, - gcvPATCH_GLOFTF3HM, - gcvPATCH_CRAZYRACING, - gcvPATCH_FIREFOX, - gcvPATCH_CHROME, - gcvPATCH_MONOPOLY, - gcvPATCH_SNOWCOLD, - gcvPATCH_BM3, - gcvPATCH_BASEMARKX, - gcvPATCH_DEQP, - gcvPATCH_SF4, - gcePATCH_MGOHEAVEN2, - gcePATCH_SILIBILI, - gcePATCH_ELEMENTSDEF, - gcePATCH_GLOFTKRHM, - gcvPATCH_OCLCTS, - gcvPATCH_A8HP, - gcvPATCH_A8CN, - gcvPATCH_WISTONESG, - gcvPATCH_SPEEDRACE, - gcvPATCH_FSBHAWAIIF, - gcvPATCH_AIRNAVY, - gcvPATCH_F18NEW, - gcvPATCH_CKZOMBIES2, - gcvPATCH_EADGKEEPER, - gcvPATCH_BASEMARK2V2, - gcvPATCH_RIPTIDEGP2, - gcvPATCH_OESCTS, - gcvPATCH_GANGSTAR, - gcvPATCH_WHRKYZIXOVAN, - gcvPATCH_NAMESGAS, - gcvPATCH_AFTERBURNER, - gcvPATCH_UIMARK, - gcvPATCH_FM_OES_PLAYER, - gcvPATCH_SUMSUNG_BENCH, - gcvPATCH_ROCKSTAR_MAXPAYNE, - gcvPATCH_TITANPACKING, - gcvPATCH_OES20SFT, - gcvPATCH_OES30SFT, - gcvPATCH_BASEMARKOSIICN, - gcvPATCH_FRUITNINJA, - gcvPATCH_ANDROID_WEBGL, -#if defined(ANDROID) - gcePATCH_ANDROID_CTS_MEDIA_PRESENTATIONTIME, -#endif - gcvPATCH_ANDROID_COMPOSITOR, - gcvPATCH_CTS_TEXTUREVIEW, - gcvPATCH_WATER2_CHUKONG, - gcvPATCH_GOOGLEEARTH, - gcvPATCH_LEANBACK, - gcvPATCH_ANGRYBIRDS, - gcvPATCH_REALRACING, - gcvPATCH_CLASHOFCLAN, - gcvPATCH_TEMPLERUN, - gcvPATCH_SBROWSER, - - gcvPATCH_COUNT -} gcePATCH_ID; -#endif /* gcdENABLE_3D */ - -#if gcdENABLE_3D -#define gcdPROC_IS_WEBGL(patchId) ((patchId) == gcvPATCH_CHROME || (patchId) == gcvPATCH_FIREFOX || (patchId) == gcvPATCH_ANDROID_WEBGL) -#endif /* gcdENABLE_3D */ - -typedef void (* gctPLS_DESTRUCTOR) ( - gcsPLS_PTR - ); - -typedef struct _gcsPLS -{ - /* Global objects. */ - gcoOS os; - gcoHAL hal; - - /* Internal memory pool. */ - gctSIZE_T internalSize; - gctPHYS_ADDR internalPhysical; - gctPOINTER internalLogical; - - /* External memory pool. */ - gctSIZE_T externalSize; - gctPHYS_ADDR externalPhysical; - gctPOINTER externalLogical; - - /* Contiguous memory pool. */ - gctSIZE_T contiguousSize; - gctPHYS_ADDR contiguousPhysical; - gctPOINTER contiguousLogical; - - /* EGL-specific process-wide objects. */ - gctPOINTER eglDisplayInfo; - gctPOINTER eglSurfaceInfo; - gceSURF_FORMAT eglConfigFormat; - - /* PLS reference count */ - gcsATOM_PTR reference; - - /* PorcessID of the constrcutor process */ - gctUINT32 processID; - - /* ThreadID of the constrcutor process. */ - gctSIZE_T threadID; - /* Flag for calling module destructor. */ - gctBOOL exiting; - - gctBOOL bNeedSupportNP2Texture; - - gctPLS_DESTRUCTOR destructor; - /* Mutex to guard PLS access. currently it's for EGL. - ** We can use this mutex for every PLS access. - */ - gctPOINTER accessLock; -#if gcdENABLE_3D - /* Global patchID to overwrite the detection */ - gcePATCH_ID patchID; -#endif -} -gcsPLS; - -extern gcsPLS gcPLS; - #if gcdENABLE_3D #define gcPLS_INITIALIZER \ { \ @@ -967,26 +783,6 @@ gcoHAL_GetDump( OUT gcoDUMP * Dump ); -#if gcdENABLE_3D -gceSTATUS -gcoHAL_SetPatchID( - IN gcoHAL Hal, - IN gcePATCH_ID PatchID - ); - -/* Get Patch ID based on process name */ -gceSTATUS -gcoHAL_GetPatchID( - IN gcoHAL Hal, - OUT gcePATCH_ID * PatchID - ); - -gceSTATUS -gcoHAL_SetGlobalPatchID( - IN gcoHAL Hal, - IN gcePATCH_ID PatchID - ); -#endif /* gcdENABLE_3D */ /* Call the kernel HAL layer. */ gceSTATUS gcoHAL_Call( @@ -1747,24 +1543,6 @@ gcoOS_QueryCurrentProcessName( IN gctSIZE_T Size ); -/* Detect if the current process is the executable specified. */ -gceSTATUS -gcoOS_DetectProcessByName( - IN gctCONST_STRING Name - ); - -gceSTATUS -gcoOS_DetectProcessByEncryptedName( - IN gctCONST_STRING Name - ); - -#if defined(ANDROID) -gceSTATUS -gcoOS_DetectProgrameByEncryptedSymbols( - IN gcoOS_SymbolsList Symbols - ); -#endif - /*----------------------------------------------------------------------------*/ /*----- Atoms ----------------------------------------------------------------*/ @@ -2684,6 +2462,14 @@ gcoSURF_Lock( IN OUT gctPOINTER * Memory ); +gceSTATUS +gcoSURF_LockEx( + IN gcoSURF Surface, + OPTIONAL OUT gctUINT32 * Address, + OPTIONAL OUT gctPOINTER * Memory, + OPTIONAL OUT gctPHYS_ADDR_T *BusAddress + ); + /* Unlock the surface. */ gceSTATUS gcoSURF_Unlock( @@ -4949,15 +4735,6 @@ gcGetUserDebugOption( void ); -#if defined(ANDROID) -struct _gcoOS_SymbolsList -{ -#if gcdENABLE_3D - gcePATCH_ID patchId; -#endif - const char * symList[10]; -}; -#endif #if gcdHAS_ELLIPSIS #define gcmUSER_DEBUG_MSG(level, ...) \ diff --git a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h index 8a4be08b8404..89a655836085 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h +++ b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver.h @@ -2,7 +2,7 @@ * * The MIT License (MIT) * -* Copyright (c) 2014 Vivante Corporation +* Copyright (c) 2014 - 2015 Vivante Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -26,7 +26,7 @@ * * The GPL License (GPL) * -* Copyright (C) 2014 Vivante Corporation +* Copyright (C) 2014 - 2015 Vivante Corporation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h index f23139ced20f..2a8e798af101 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h +++ b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_driver_vg.h @@ -2,7 +2,7 @@ * * The MIT License (MIT) * -* Copyright (c) 2014 Vivante Corporation +* Copyright (c) 2014 - 2015 Vivante Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -26,7 +26,7 @@ * * The GPL License (GPL) * -* Copyright (C) 2014 Vivante Corporation +* Copyright (C) 2014 - 2015 Vivante Corporation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h index b203f8f7e309..17de8d5fd2f4 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h +++ b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_dump.h @@ -2,7 +2,7 @@ * * The MIT License (MIT) * -* Copyright (c) 2014 Vivante Corporation +* Copyright (c) 2014 - 2015 Vivante Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -26,7 +26,7 @@ * * The GPL License (GPL) * -* Copyright (C) 2014 Vivante Corporation +* Copyright (C) 2014 - 2015 Vivante Corporation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h index 5fdc54aa4e60..dc982c31e138 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h +++ b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform.h @@ -2,7 +2,7 @@ * * The MIT License (MIT) * -* Copyright (c) 2014 Vivante Corporation +* Copyright (c) 2014 - 2015 Vivante Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -26,7 +26,7 @@ * * The GPL License (GPL) * -* Copyright (C) 2014 Vivante Corporation +* Copyright (C) 2014 - 2015 Vivante Corporation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -93,9 +93,15 @@ typedef struct _DFBPixmap * HALNativePixmapType; /* Wayland platform. */ #include <wayland-egl.h> +#include <pthread.h> + #define WL_COMPOSITOR_SIGNATURE (0x31415926) +#define WL_CLIENT_SIGNATURE (0x27182818) + +#define WL_LOCAL_DISPLAY_SIGNATURE (0x27182991) + typedef struct _gcsWL_VIV_BUFFER { struct wl_resource *wl_buffer; @@ -114,6 +120,12 @@ typedef struct _gcsWL_EGL_DISPLAY gctINT file; } gcsWL_EGL_DISPLAY; +typedef struct _gcsWL_LOCAL_DISPLAY +{ + gctUINT wl_signature; + gctPOINTER localInfo; +} gcsWL_LOCAL_DISPLAY; + typedef struct _gcsWL_EGL_BUFFER_INFO { gctINT32 width; @@ -125,16 +137,17 @@ typedef struct _gcsWL_EGL_BUFFER_INFO gcePOOL pool; gctUINT bytes; gcoSURF surface; - gcoSURF attached_surface; gctINT32 invalidate; gctBOOL locked; } gcsWL_EGL_BUFFER_INFO; typedef struct _gcsWL_EGL_BUFFER { - struct wl_buffer* wl_buffer; + gctUINT wl_signature; gcsWL_EGL_BUFFER_INFO info; + struct wl_buffer* wl_buffer; struct wl_callback* frame_callback; + struct wl_list link; } gcsWL_EGL_BUFFER; typedef struct _gcsWL_EGL_WINDOW_INFO @@ -151,13 +164,17 @@ typedef struct _gcsWL_EGL_WINDOW_INFO struct wl_egl_window { + gctUINT wl_signature; gcsWL_EGL_DISPLAY* display; gcsWL_EGL_BUFFER **backbuffers; gcsWL_EGL_WINDOW_INFO* info; gctINT noResolve; gctINT32 attached_width; gctINT32 attached_height; + gcsATOM_PTR reference; + pthread_mutex_t window_mutex; struct wl_surface* surface; + struct wl_list link; }; typedef void* HALNativeDisplayType; @@ -677,8 +694,8 @@ gcoOS_ResizeWindow( IN gctPOINTER localDisplay, IN HALNativeWindowType Drawable, IN gctUINT Width, - IN gctUINT Height) - ; + IN gctUINT Height + ); #ifdef USE_FREESCALE_EGL_ACCEL gceSTATUS diff --git a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h index 3a79ae4eb713..d588cd32b1fb 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h +++ b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_eglplatform_type.h @@ -2,7 +2,7 @@ * * The MIT License (MIT) * -* Copyright (c) 2014 Vivante Corporation +* Copyright (c) 2014 - 2015 Vivante Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -26,7 +26,7 @@ * * The GPL License (GPL) * -* Copyright (C) 2014 Vivante Corporation +* Copyright (C) 2014 - 2015 Vivante Corporation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h index 220601a54d90..e5adf8a09efe 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h +++ b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_engine.h @@ -2,7 +2,7 @@ * * The MIT License (MIT) * -* Copyright (c) 2014 Vivante Corporation +* Copyright (c) 2014 - 2015 Vivante Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -26,7 +26,7 @@ * * The GPL License (GPL) * -* Copyright (C) 2014 Vivante Corporation +* Copyright (C) 2014 - 2015 Vivante Corporation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License 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 0c23be36cd5b..152cb9e55fef 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 @@ -2,7 +2,7 @@ * * The MIT License (MIT) * -* Copyright (c) 2014 Vivante Corporation +* Copyright (c) 2014 - 2015 Vivante Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -26,7 +26,7 @@ * * The GPL License (GPL) * -* Copyright (C) 2014 Vivante Corporation +* Copyright (C) 2014 - 2015 Vivante Corporation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h index a6062dfb6db7..cf85fdca5e35 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h +++ b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h @@ -2,7 +2,7 @@ * * The MIT License (MIT) * -* Copyright (c) 2014 Vivante Corporation +* Copyright (c) 2014 - 2015 Vivante Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -26,7 +26,7 @@ * * The GPL License (GPL) * -* Copyright (C) 2014 Vivante Corporation +* Copyright (C) 2014 - 2015 Vivante Corporation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -237,10 +237,14 @@ typedef enum _gceFEATURE gcvFEATURE_2D_OPF_YUV_OUTPUT, gcvFEATURE_2D_FILTERBLIT_A8_ALPHA, gcvFEATURE_2D_MULTI_SRC_BLT_TO_UNIFIED_DST_RECT, + gcvFEATURE_2D_MULTI_SRC_BLT_BILINEAR_FILTER, gcvFEATURE_V2_COMPRESSION_Z16_FIX, gcvFEATURE_VERTEX_INST_ID_AS_INTEGER, gcvFEATURE_2D_YUV_MODE, + gcvFEATURE_2D_CACHE_128B256BPERLINE, + gcvFEATURE_2D_MAJOR_SUPER_TILE, + gcvFEATURE_2D_V4COMPRESSION, gcvFEATURE_ACE, gcvFEATURE_COLOR_COMPRESSION, @@ -315,6 +319,8 @@ typedef enum _gceFEATURE gcvFEATURE_MSAA_FRAGMENT_OPERATION, gcvFEATURE_ZERO_ATTRIB_SUPPORT, gcvFEATURE_TEX_CACHE_FLUSH_FIX, + gcvFEATURE_PE_DITHER_FIX2, + gcvFEATURE_LOD_FIX_FOR_BASELEVEL, /* Insert features above this comment only. */ gcvFEATURE_COUNT /* Not a feature. */ @@ -1093,6 +1099,19 @@ typedef enum _gce2D_YUV_COLOR_MODE } gce2D_YUV_COLOR_MODE; +/* Nature rotation rules. */ +typedef enum _gce2D_NATURE_ROTATION +{ + gcvNR_0_DEGREE = 0, + gcvNR_LEFT_90_DEGREE, + gcvNR_RIGHT_90_DEGREE, + gcvNR_180_DEGREE, + gcvNR_FLIP_X, + gcvNR_FLIP_Y, + gcvNR_TOTAL_RULE, +} +gce2D_NATURE_ROTATION; + typedef enum _gce2D_COMMAND { gcv2D_CLEAR = 0, @@ -1119,6 +1138,9 @@ typedef enum _gce2D_TILE_STATUS_CONFIG gcv2D_TSC_DEC_TPC = 0x00000040, gcv2D_TSC_DEC_TPC_COMPRESSED = 0x00000080, + gcv2D_TSC_V4_COMPRESSED = 0x00000100, + gcv2D_TSC_V4_COMPRESSED_256B = 0x00000200 | gcv2D_TSC_V4_COMPRESSED, + gcv2D_TSC_DEC_TPC_TILED = gcv2D_TSC_DEC_COMPRESSED | gcv2D_TSC_DEC_TPC, gcv2D_TSC_DEC_TPC_TILED_COMPRESSED = gcv2D_TSC_DEC_TPC_TILED | gcv2D_TSC_DEC_TPC_COMPRESSED, } @@ -1148,6 +1170,7 @@ typedef enum _gce2D_STATE gcv2D_STATE_EN_GAMMA, gcv2D_STATE_DE_GAMMA, gcv2D_STATE_MULTI_SRC_BLIT_UNIFIED_DST_RECT, + gcv2D_STATE_MULTI_SRC_BLIT_BILINEAR_FILTER, gcv2D_STATE_PROFILE_ENABLE, gcv2D_STATE_XRGB_ENABLE, @@ -1259,6 +1282,7 @@ typedef enum _gceTILING /* Tiling special layouts. */ gcvTILING_SPLIT_BUFFER = 0x100, + gcvTILING_Y_MAJOR = 0x200, /* Tiling combination layouts. */ gcvMULTI_TILED = gcvTILED @@ -1266,6 +1290,9 @@ typedef enum _gceTILING gcvMULTI_SUPERTILED = gcvSUPERTILED | gcvTILING_SPLIT_BUFFER, + + gcvYMAJOR_SUPERTILED = gcvSUPERTILED + | gcvTILING_Y_MAJOR, } gceTILING; diff --git a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h index 8b71fc13e5cd..7ff9f637e960 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h +++ b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_kernel_buffer.h @@ -2,7 +2,7 @@ * * The MIT License (MIT) * -* Copyright (c) 2014 Vivante Corporation +* Copyright (c) 2014 - 2015 Vivante Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -26,7 +26,7 @@ * * The GPL License (GPL) * -* Copyright (C) 2014 Vivante Corporation +* Copyright (C) 2014 - 2015 Vivante Corporation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h index ec6d0f3bf501..4221f0ecadaa 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h +++ b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_mem.h @@ -2,7 +2,7 @@ * * The MIT License (MIT) * -* Copyright (c) 2014 Vivante Corporation +* Copyright (c) 2014 - 2015 Vivante Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -26,7 +26,7 @@ * * The GPL License (GPL) * -* Copyright (C) 2014 Vivante Corporation +* Copyright (C) 2014 - 2015 Vivante Corporation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h index a653d7d7042f..3858b999c9c9 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h +++ b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_options.h @@ -2,7 +2,7 @@ * * The MIT License (MIT) * -* Copyright (c) 2014 Vivante Corporation +* Copyright (c) 2014 - 2015 Vivante Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -26,7 +26,7 @@ * * The GPL License (GPL) * -* Copyright (C) 2014 Vivante Corporation +* Copyright (C) 2014 - 2015 Vivante Corporation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -435,6 +435,10 @@ #endif #endif +#ifndef gcdGC355_VGMMU_MEMORY_SIZE_KB +# define gcdGC355_VGMMU_MEMORY_SIZE_KB 32 +#endif + /* gcdSECURE_USER @@ -532,14 +536,30 @@ #ifndef gcdGPU_TIMEOUT #if gcdFPGA_BUILD # define gcdGPU_TIMEOUT 0 -# define gcdGPU_2D_TIMEOUT 0 # else # define gcdGPU_TIMEOUT 20000 -# define gcdGPU_2D_TIMEOUT 20000 # endif #endif /* + gcdGPU_2D_TIMEOUT + + This define specified the number of milliseconds the system will wait + before it broadcasts the 2D GPU is stuck. In other words, it will define + the timeout of any operation that needs to wait for the GPU. + + If the value is 0, no timeout will be checked for. +*/ +#ifndef gcdGPU_2D_TIMEOUT +#if gcdFPGA_BUILD +# define gcdGPU_2D_TIMEOUT 0 +# else +# define gcdGPU_2D_TIMEOUT 4000 +# endif +#endif + + +/* gcdGPU_ADVANCETIMER it is advance timer. diff --git a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h index fee3c31b10c0..c63a55a372ef 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h +++ b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_profiler.h @@ -2,7 +2,7 @@ * * The MIT License (MIT) * -* Copyright (c) 2014 Vivante Corporation +* Copyright (c) 2014 - 2015 Vivante Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -26,7 +26,7 @@ * * The GPL License (GPL) * -* Copyright (C) 2014 Vivante Corporation +* Copyright (C) 2014 - 2015 Vivante Corporation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h index 03d170f509fd..4b2fd54b52f7 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h +++ b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_raster.h @@ -2,7 +2,7 @@ * * The MIT License (MIT) * -* Copyright (c) 2014 Vivante Corporation +* Copyright (c) 2014 - 2015 Vivante Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -26,7 +26,7 @@ * * The GPL License (GPL) * -* Copyright (C) 2014 Vivante Corporation +* Copyright (C) 2014 - 2015 Vivante Corporation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -1071,6 +1071,20 @@ gco2D_Commit( IN gctBOOL Stall ); +gceSTATUS +gco2D_NatureRotateTranslation( + IN gctBOOL IsSrcRot, + IN gce2D_NATURE_ROTATION NatureRotation, + IN gctINT32 SrcSurfaceWidth, + IN gctINT32 SrcSurfaceHeight, + IN gctINT32 DstSurfaceWidth, + IN gctINT32 DstSurfaceHeight, + IN OUT gcsRECT_PTR SrcRect, + IN OUT gcsRECT_PTR DstRect, + OUT gceSURF_ROTATION * SrcRotation, + OUT gceSURF_ROTATION * DstRotation + ); + #ifdef __cplusplus } #endif diff --git a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h index 75c26589946e..66d1ef646ae9 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h +++ b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_rename.h @@ -2,7 +2,7 @@ * * The MIT License (MIT) * -* Copyright (c) 2014 Vivante Corporation +* Copyright (c) 2014 - 2015 Vivante Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -26,7 +26,7 @@ * * The GPL License (GPL) * -* Copyright (C) 2014 Vivante Corporation +* Copyright (C) 2014 - 2015 Vivante Corporation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_security_interface.h b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_security_interface.h index 27f91f0aec3a..d7e54c90ee89 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_security_interface.h +++ b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_security_interface.h @@ -2,7 +2,7 @@ * * The MIT License (MIT) * -* Copyright (c) 2014 Vivante Corporation +* Copyright (c) 2014 - 2015 Vivante Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -26,7 +26,7 @@ * * The GPL License (GPL) * -* Copyright (C) 2014 Vivante Corporation +* Copyright (C) 2014 - 2015 Vivante Corporation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -71,12 +71,6 @@ typedef enum kernel_packet_command { KERNEL_EXECUTE, /* Execute a command buffer. */ } kernel_packet_command_t; -/*! - @brief gckCOMMAND Object requests TrustZone to start FE. - @discussion - DMA enabled register can only be written in TrustZone to avoid GPU from jumping to a hacked code. - Kernel module need use these command to ask TrustZone start command parser. - */ struct kernel_start_command { kernel_packet_command_t command; /*! The command (always needs to be the first entry in a structure). */ gctUINT8 gpu; /*! Which GPU. */ diff --git a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h index 5611a8bc214a..7deb736f7061 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h +++ b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_statistics.h @@ -2,7 +2,7 @@ * * The MIT License (MIT) * -* Copyright (c) 2014 Vivante Corporation +* Copyright (c) 2014 - 2015 Vivante Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -26,7 +26,7 @@ * * The GPL License (GPL) * -* Copyright (C) 2014 Vivante Corporation +* Copyright (C) 2014 - 2015 Vivante Corporation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h index f79f9ad57bde..aa72880a3a1c 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h +++ b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_types.h @@ -2,7 +2,7 @@ * * The MIT License (MIT) * -* Copyright (c) 2014 Vivante Corporation +* Copyright (c) 2014 - 2015 Vivante Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -26,7 +26,7 @@ * * The GPL License (GPL) * -* Copyright (C) 2014 Vivante Corporation +* Copyright (C) 2014 - 2015 Vivante Corporation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h index ed77d1aa8cde..ee2965853842 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h +++ b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h @@ -2,7 +2,7 @@ * * The MIT License (MIT) * -* Copyright (c) 2014 Vivante Corporation +* Copyright (c) 2014 - 2015 Vivante Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -26,7 +26,7 @@ * * The GPL License (GPL) * -* Copyright (C) 2014 Vivante Corporation +* Copyright (C) 2014 - 2015 Vivante Corporation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -62,8 +62,8 @@ #define gcvVERSION_PATCH 11 -#define gcvVERSION_BUILD 33433 +#define gcvVERSION_BUILD 41671 -#define gcvVERSION_STRING "5.0.11.p7.33433" +#define gcvVERSION_STRING "5.0.11.p8.pre.41671" #endif /* __gc_hal_version_h_ */ diff --git a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h index e33d895d1ce2..6a2c34f74a87 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h +++ b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_vg.h @@ -2,7 +2,7 @@ * * The MIT License (MIT) * -* Copyright (c) 2014 Vivante Corporation +* Copyright (c) 2014 - 2015 Vivante Corporation * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -26,7 +26,7 @@ * * The GPL License (GPL) * -* Copyright (C) 2014 Vivante Corporation +* Copyright (C) 2014 - 2015 Vivante Corporation * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License |