Removal of stale code

Klockwork fix

Change-Id: I81d2bf82962744f07cd6b922ccdb5a1ed387d919

Author: drprajap

Source/GmmLib/CachePolicy/GmmGen10CachePolicy.h

@@ -91,7 +91,7 @@ DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_HEAP_INDIRECT_OBJECT
 DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_HEAP_INSTRUCTION                                      , 1   , 0    , 1  , 0  , 3 ,     0,       0,      0,   0,    0);
 DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_HIZ                                                   , 1   , 0    , 0  , 0  , 3 ,     0,       0,      0,   0,    0);
 DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_INDEX_BUFFER                                          , 0   , 0    , 0  , 0  , 3 ,     0,       0,      0,   0,    0);
-DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_MCS                                                   , 1   , 0    , 0  , 0  , 3 ,     0,       0,      0,   0,    0); // SKL-TODO: Remove after clients update their code.
+DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_MCS                                                   , 1   , 0    , 0  , 0  , 3 ,     0,       0,      0,   0,    0);
 DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_PUSH_CONSTANT_BUFFER                                  , 0   , 0    , 0  , 0  , 3 ,     0,       0,      0,   0,    0);
 DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_PULL_CONSTANT_BUFFER                                  , 1   , 0    , 1  , 0  , 3 ,     0,       0,      0,   0,    1);
 DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_QUERY                                                 , 1   , 1    , 1  , 0  , 3 ,     0,       0,      0,   0,    0);

Source/GmmLib/CachePolicy/GmmGen9CachePolicy.h

@@ -107,7 +107,7 @@ DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_HEAP_INDIRECT_OBJECT
 DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_HEAP_INSTRUCTION                                      , 1      , 1     , 1  ,3 , WB );
 DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_HIZ                                                   , !GT3e  , EDRAM , 1  ,3 , WB );
 DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_INDEX_BUFFER                                          , !GT3e  , EDRAM , 1  ,3 , WB );
-DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_MCS                                                   , 0      , EDRAM , 0  ,3 , UC ); // SKL-TODO: Remove after clients update their code.
+DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_MCS                                                   , 0      , EDRAM , 0  ,3 , UC );
 DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_PUSH_CONSTANT_BUFFER                                  , 0      , EDRAM , 0  ,3 , UC );
 DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_PULL_CONSTANT_BUFFER                                  , !GT3e  , EDRAM , 1  ,3 , WB );
 DEFINE_CACHE_ELEMENT(GMM_RESOURCE_USAGE_QUERY                                                 , !GT3e  , EDRAM , 0  ,3 , WB );

Source/GmmLib/Platform/GmmPlatform.cpp

@@ -65,7 +65,7 @@ GmmLib::PlatformInfo::PlatformInfo(PLATFORM &Platform) {
 /////////////////////////////////////////////////////////////////////////////////////
 const GMM_PLATFORM_INFO* GMM_STDCALL __GmmGetPlatformInfo()
 {
-    __GMM_ASSERT(pGmmGlobalContext != NULL)
+    __GMM_ASSERTPTR(pGmmGlobalContext, NULL)
 
     if (pGmmGlobalContext->GetPlatformInfoObj() != NULL)
     {

Source/GmmLib/Resource/GmmResourceInfo.cpp

@@ -178,24 +178,6 @@ uint32_t GMM_STDCALL GmmResGetSizeOfStruct(void)
     return (sizeof(GMM_RESOURCE_INFO));
 }
 
-/////////////////////////////////////////////////////////////////////////////////////
-/// This function returns resource flags
-///
-/// @param[in]  pGmmResource: Pointer to the GmmResourceInfo class
-/// @param[out] pFlags: Memory where resource flags will be copied
-/////////////////////////////////////////////////////////////////////////////////////
-void GMM_STDCALL GmmResGetFlags(GMM_RESOURCE_INFO* pGmmResource,
-                                GMM_RESOURCE_FLAG* pFlags /*output*/)
-{
-    GMM_DPF_ENTER;
-    __GMM_ASSERTPTR(pGmmResource, VOIDRETURN);
-    __GMM_ASSERTPTR(pFlags, VOIDRETURN);
-
-    *pFlags = GmmResGetResourceFlags(pGmmResource);
-
-    GMM_DPF_EXIT;
-}
-
 /////////////////////////////////////////////////////////////////////////////////////
 /// C wrapper for GmmLib::GmmResourceInfoCommon::GetResourceType.
 /// @see        GmmLib::GmmResourceInfoCommon::GetResourceType()
@@ -1031,7 +1013,7 @@ GMM_GFX_SIZE_T  GMM_STDCALL GmmResGetSizeMainSurface(const GMM_RESOURCE_INFO *pR
     return pResourceInfo->GetSizeMainSurface();
 }
 
-//TODO(Low) : Remove when vpg-compute-neo moves to new interface
+//TODO(Low) : Remove when client moves to new interface
 /////////////////////////////////////////////////////////////////////////////////////
 /// C wrapper for GmmResourceInfoCommon::GetSizeSurface
 /// @see    GmmLib::GmmResourceInfoCommon::GetSizeSurface()
@@ -1341,19 +1323,6 @@ uint8_t GMM_STDCALL GmmIsSurfaceFaultable(GMM_RESOURCE_INFO *pGmmResource)
     return pGmmResource->IsSurfaceFaultable();
 }
 
-/////////////////////////////////////////////////////////////////////////////////////
-/// C wrapper for GmmResourceInfoCommon::GetResFlags
-/// @see    GmmLib::GmmResourceInfoCommon::GetResFlags()
-///
-/// @param[in]  pGmmResource: Pointer to GmmResourceInfo class
-/// @return     Copy of ::GMM_RESOURCE_FLAGS
-/////////////////////////////////////////////////////////////////////////////////////
-GMM_RESOURCE_FLAG GMM_STDCALL GmmResGetResourceFlags(const GMM_RESOURCE_INFO* pGmmResource)
-{
-    __GMM_ASSERT(pGmmResource);
-    return const_cast<GMM_RESOURCE_INFO*>(pGmmResource)->GetResFlags();
-}
-
 /////////////////////////////////////////////////////////////////////////////////////
 /// C wrapper for GmmResourceInfoCommon::GetMaximumRenamingListLength
 /// @see    GmmLib::GmmResourceInfoCommon::GetMaximumRenamingListLength()

Source/GmmLib/Resource/GmmResourceInfoCommon.cpp

@@ -1504,7 +1504,6 @@ uint8_t GMM_STDCALL GmmLib::GmmResourceInfoCommon::GetMappingSpanDesc(GMM_GET_MA
             {
                 // If the resource was a planar surface then need to iterate over the remaining planes
                 WasFinalSpan = pMapping->Scratch.Plane == pMapping->Scratch.LastPlane;
-                //GMM_DPF( GFXDBG_CRITICAL, "\n" );   // TODO (rmadayik): Remove when done testing.
             }
         }
     }

Source/GmmLib/Scripts/GmmCheckCodingStandard.bat

@@ -1,22 +1,21 @@
 @echo off
-REM Copyright (2014) Intel Corporation All Rights Reserved.
+REM Copyright(c) 2017 Intel Corporation
 REM
-REM The source code, information and material ("Material") contained
-REM herein is owned by Intel Corporation or its suppliers or licensors,
-REM and title to such Material remains with Intel Corporation or its
-REM suppliers or licensors. The Material contains proprietary information
-REM of Intel or its suppliers and licensors. The Material is protected by
-REM worldwide copyright laws and treaty provisions. No part of the
-REM Material may be used, copied, reproduced, modified, published,
-REM uploaded, posted, transmitted, distributed or disclosed in any way
-REM without Intel's prior express written permission. No license under any
-REM patent, copyright or other intellectual property rights in the
-REM Material is granted to or conferred upon you, either expressly, by
-REM implication, inducement, estoppel or otherwise. Any license under such
-REM intellectual property rights must be express and approved by Intel in
-REM writing.
-REM
-REM Unless otherwise agreed by Intel in writing, you may not remove or alter
-REM this notice or any other notice embedded in Materials by Intel or Intel's
-REM suppliers or licensors in any way.
+REM Permission is hereby granted, free of charge, to any person obtaining a
+REM copy of this software and associated documentation files(the "Software"),
+REM to deal in the Software without restriction, including without limitation
+REM the rights to use, copy, modify, merge, publish, distribute, sublicense,
+REM and / or sell copies of the Software, and to permit persons to whom the
+REM Software is furnished to do so, subject to the following conditions:
+REM 
+REM The above copyright notice and this permission notice shall be included
+REM in all copies or substantial portions of the Software.
+REM 
+REM THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+REM OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+REM FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+REM THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+REM OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+REM ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+REM OTHER DEALINGS IN THE SOFTWARE.
 cscript //nologo %~dp0\GmmCheckCodingStandard.wsf %~dp0\..

Source/GmmLib/Scripts/GmmCheckCodingStandard.wsf

@@ -1,3 +1,24 @@
+//============================================================================
+// Copyright(c) 2017 Intel 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.
+//============================================================================
 <job>
 <script>
 

Source/GmmLib/Texture/GmmTexture.h

@@ -259,13 +259,11 @@ GMM_INLINE GMM_STATUS __GmmTexFillHAlignVAlign(GMM_TEXTURE_INFO *pTexInfo)
             UnitAlignWidth  = 16;
             UnitAlignHeight = 4;
         }
-        /// TODO(Minor): Temp D3D12 WHQL WA. Remove once GMM switches to optimized H/VALIGN...
         else if(pTexInfo->Flags.Wa.__ForceOtherHVALIGN4)
         {
             UnitAlignWidth  = 4;
             UnitAlignHeight = 4;
         }
-        // FIXME: Resolve semantics of NoRestriction defaulting to 1/1 or 16/4 for H/VAlign for D3D
         #ifndef _WIN32
         else if(pTexInfo->Flags.Gpu.NoRestriction)
         {

Source/GmmLib/inc/External/Common/GmmCommonExt.h

@@ -72,41 +72,12 @@ typedef uint32_t GMM_GLOBAL_GFX_ADDRESS, GMM_GLOBAL_GFX_SIZE_T;
     #define GMM_GLOBAL_GFX_SIZE_T_CAST(x)   ((GMM_GLOBAL_GFX_SIZE_T)(x))
 #endif
 
-#define GMM_GMADR_OFFSET_T          GMM_GLOBAL_GFX_ADDRESS
-#define GMM_GMADR_SIZE_T            GMM_GLOBAL_GFX_SIZE_T
-#define GMM_GMADR_OFFSET_T_CAST     GMM_GLOBAL_GFX_ADDRESS_CAST
-#define GMM_GMADR_SIZE_T_CAST       GMM_GLOBAL_GFX_SIZE_T_CAST
-
-typedef uint32_t  TODO_GFX32; // TODO(Medium): Fix and remove!!
-
 #define GMM_GFX_ADDRESS_CANONIZE(a)     (((int64_t)(a) << (64 - 48)) >> (64 - 48)) // TODO(Minor): When GMM adds platform-dependent VA size caps, change from 48.
 #define GMM_GFX_ADDRESS_DECANONIZE(a)   ((uint64_t)(a) & (((uint64_t) 1 << 48) - 1)) // "
 
 #define GMM_BIT_RANGE(endbit, startbit)     ((endbit)-(startbit)+1)
 #define GMM_BIT(bit)                        (1)
 
-// TODO(Benign): Where should this live?
-#define GMM_IA32e_BITS_PER_TABLE_INDEX  9
-#define GMM_IA32e_ENTRIES_PER_TABLE     (1 << GMM_IA32e_BITS_PER_TABLE_INDEX)
-#define GMM_IA32e_PTE_SIZE              8
-#define GMM_IA32e_TABLE_SIZE            4096
-#define GMM_IA32e_PTE_PRESENT           __BIT(0)
-#define GMM_IA32e_PTE_WRITABLE          __BIT(1)
-#define GMM_IA32e_PTE_USER_ACCESSIBLE   __BIT(2)
-#define GMM_IA32e_PTE_PWT               __BIT(3)
-#define GMM_IA32e_PTE_PCD               __BIT(4)
-#define GMM_IA32e_PTE_ACCESSED          __BIT(5)
-#define GMM_IA32e_PTE_PAT               __BIT(7)
-#define GMM_IA32e_PTE_U_W_P             (GMM_IA32e_PTE_USER_ACCESSIBLE | GMM_IA32e_PTE_WRITABLE | GMM_IA32e_PTE_PRESENT)
-#define GMM_IA32e_PTE_U_R_P             (GMM_IA32e_PTE_USER_ACCESSIBLE | GMM_IA32e_PTE_PRESENT)
-#define GMM_PAT_IDX_PTE_BITS(idx)       ((((idx) & __BIT(2)) ? GMM_IA32e_PTE_PAT : 0) |\
-                                         (((idx) & __BIT(1)) ? GMM_IA32e_PTE_PCD : 0) |\
-                                         (((idx) & __BIT(0)) ? GMM_IA32e_PTE_PWT : 0) )
-#define GMM_SKL_PTE_NULL_PAGE           __BIT(9)
-#define GMM_IA32e_PDE_IPS               __BIT(11)
-
-#define GMM_GFX_PHYS_ADDRESS_MAX        (0xffffffffffffffff)
-#define GMM_WDDM_MAX_ALLOCATION_SIZE    (0xffffffff) // WDDM allocation sizes are limited by the MDL byte count, which is a uint32_t
 //===========================================================================
 // typedef:
 //      GMM_STATUS_ENUM

Source/GmmLib/inc/External/Common/GmmFormatTable.h

@@ -164,7 +164,7 @@ GMM_FORMAT( P8A8_UNORM_PALETTE0          ,  16,  1,  1, 1, R, x, 0x122, NC  ,
 GMM_FORMAT( P8A8_UNORM_PALETTE1          ,  16,  1,  1, 1, R, x, 0x123, NC  ,     ALWAYS      )
 GMM_FORMAT( PLANAR_420_8                 ,   8,  1,  1, 1, R, x, 0x1A5, NC  ,     x         ) // No current GMM support by this name.
 GMM_FORMAT( PLANAR_420_16                ,  16,  1,  1, 1, R, x, 0x1A6, NC  ,     x         ) // "
-GMM_FORMAT( PLANAR_422_8                 ,   8,  1,  1, 1, R, x, 0x00F, NC  ,     x         )           // <-- TODO(Minor): Remove this HW-internal format.
+GMM_FORMAT( PLANAR_422_8                 ,   8,  1,  1, 1, R, x, 0x00F, NC  ,     x         ) // <-- TODO(Minor): Remove this HW-internal format.
 GMM_FORMAT( R1_UNORM                     ,   1,  1,  1, 1, R, x, 0x181, NC  ,     x         ) // "
 GMM_FORMAT( R8_SINT                      ,   8,  1,  1, 1, R, x, 0x142, 0xA ,     ALWAYS      )
 GMM_FORMAT( R8_SNORM                     ,   8,  1,  1, 1, R, x, 0x141, 0xA ,     ALWAYS      )

Source/GmmLib/inc/External/Common/GmmResourceFlags.h

@@ -82,9 +82,9 @@ typedef struct GMM_RESOURCE_FLAG_REC
         uint32_t Vertex                    : 1;
         uint32_t Video                     : 1; // Apply Video restrictions when padding/aligning this resource (see GmmRestrictions.c)
         uint32_t VxdRenderTarget           : 1; // Flag to indicate that the surface will be used by the MSVDX device. RT is xTiled and pitch alligned to VXD device.
-        uint32_t __NonMsaaTileXCcs         : 1; // Internal GMM flag--Clients don’t set.
-        uint32_t __NonMsaaTileYCcs         : 1; // Internal GMM flag--Clients don’t set.
-        uint32_t __MsaaTileMcs             : 1; // Internal GMM flag--Clients don’t set.
+        uint32_t __NonMsaaTileXCcs         : 1; // Internal GMM flag--Clients don't set.
+        uint32_t __NonMsaaTileYCcs         : 1; // Internal GMM flag--Clients don't set.
+        uint32_t __MsaaTileMcs             : 1; // Internal GMM flag--Clients don't set.
         uint32_t __NonMsaaLinearCCS        : 1; // Internal GMM flag--Clients don't set.
         uint32_t UmdDeferredMap            : 1; // Defer resource mapping by GMM and let UMD manage map/unmap later.
 
@@ -131,21 +131,21 @@ typedef struct GMM_RESOURCE_FLAG_REC
         uint32_t WddmProtected             : 1; // Sets the DXGK_ALLOCATIONINFOFLAGS.Protected flag
         uint32_t XAdapter                  : 1; // For WinBlue: to support Hybrid graphics
         uint32_t YUVShaderFriendlyLayout   : 1; // DX11.1+. Client wants non-std YUV memory layout, friendly to DX shader resource views. NV12 only.
-        uint32_t __PreallocatedResInfo     : 1; // Internal GMM flag--Clients don’t set.
-        uint32_t __PreWddm2SVM             : 1; // Internal GMM flag--Clients don’t set.
+        uint32_t __PreallocatedResInfo     : 1; // Internal GMM flag--Clients don't set.
+        uint32_t __PreWddm2SVM             : 1; // Internal GMM flag--Clients don't set.
     } Info;
 
     // Wa: Any Surface specific Work Around will go in here
     struct
     {
-        uint32_t GTMfx2ndLevelBatchRingSizeAlign   : 1; // GT steppings prior to C0 require MFX 2nd level bb's to have certain alignment. (DCN_856778)
-        uint32_t ILKNeedAvcMprRowStore32KAlign     : 1; // ILK A0 requires 32K align WA for AVC MPR RowStore (DCN_683608)
-        uint32_t ILKNeedAvcDmvBuffer32KAlign       : 1; // ILK A0 requires 32K align WA for AVC DMV Buffers  (DCN_683608)
+        uint32_t GTMfx2ndLevelBatchRingSizeAlign   : 1; // GT steppings prior to C0 require MFX 2nd level bb's to have certain alignment.
+        uint32_t ILKNeedAvcMprRowStore32KAlign     : 1; // ILK A0 requires 32K align WA for AVC MPR RowStore
+        uint32_t ILKNeedAvcDmvBuffer32KAlign       : 1; // ILK A0 requires 32K align WA for AVC DMV Buffers
         uint32_t NoBufferSamplerPadding            : 1; // GMM not to add pre-BDW buffer sampler padding--UMD's take responsibility to flush L3 after sampling, etc.
         uint32_t NoLegacyPlanarLinearVideoRestrictions : 1; // GMM not to apply Legacy Planar "Linear Video" Restrictions (64B pitch alignment)
         uint32_t CHVAstcSkipVirtualMips            : 1; // GMM adjusts mip-map allocation to skip mip0 size
         uint32_t DisablePackedMipTail              : 1; // Disables Yf/Ys MIP Tail packing--forcing each MIP to its own tile boundary.
-        uint32_t __ForceOtherHVALIGN4              : 1; // Temp D3D12 WHQL WA. TODO(Minor): Remove once GMM switches to optimized H/VALIGN.
+        uint32_t __ForceOtherHVALIGN4              : 1;
         uint32_t DisableDisplayCcsClearColor       : 1; // Disables display clear color
         uint32_t DisableDisplayCcsCompression      : 1; // Disables display decompression on the surface (it disables display awareness of both fast clear/render compression)
     } Wa;