change in Std types for common headers

Change-Id: If2079f53a28d1326274322e9149a44300c3de14e

Author: drprajap

Source/Common/AssertTracer/AssertTracer.cpp

@@ -136,7 +136,7 @@ void __stdcall ReportAssert(
     Sends message to the system log.
 
 Input:
-    const ULONG ComponentMask
+    const unsigned long ComponentMask
         Contains the component id for which raised assert (KMD, MINIPORT..)
     const char *expr -
         The expression passed to function.

Source/GmmLib/Resource/GmmResourceInfoCommonEx.cpp

@@ -51,7 +51,7 @@ bool GmmLib::GmmResourceInfoCommon::CopyClientParams(GMM_RESCREATE_PARAMS &Creat
     !(pGmmGlobalContext->GetSkuTable().FtrWddm2GpuMmu ||
       pGmmGlobalContext->GetSkuTable().FtrWddm2Svm);
 
-#if !__GMM_KMD__
+#if !__GMM_KMD__ && _WIN32
     if(pGmmGlobalContext->GetWaTable().WaLLCCachingUnsupported)
     {
         Surf.Flags.Info.GttMapType = (CreateParams.Flags.Info.Cacheable) ?

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

@@ -22,6 +22,8 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #pragma once
 
+#ifdef _WIN32
+
 // Set packing alignment
 #pragma pack(push, 8)
 
@@ -57,4 +59,6 @@ typedef enum GMM_GTT_CACHETYPE_ENUM
     GMM_GTT_CACHETYPE_WB_ELLC_AGE_1     = 18,   // Gen7.5+
     GMM_GTT_CACHETYPE_WB_ELLC_AGE_0     = 19,   // Gen7.5+
     GMM_GTT_CACHETYPE_MAX
-}GMM_GTT_CACHETYPE;
+}GMM_GTT_CACHETYPE;
+
+#endif

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

@@ -29,6 +29,11 @@ extern "C" {
 #pragma pack(push, 8)
 
 #ifndef __GMM_KMD__
+#ifdef _WIN32
+    #ifndef PHYSICAL_ADDRESS
+    #define PHYSICAL_ADDRESS LARGE_INTEGER
+    #endif
+#endif
     #ifndef PAGE_SIZE
     #define PAGE_SIZE 4096
     #endif

Source/inc/common/gfxmacro.h

@@ -25,6 +25,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 #include <limits.h>
 #include <string.h> // for memcpy
+#include <stdint.h>
 
 // ### __GFXMACRO_ASSERT ######################################################
 // Since an "always-callable" GFX_ASSERT/etc. is no longer really in-place,
@@ -66,9 +67,9 @@ OTHER DEALINGS IN THE SOFTWARE.
                                  ((1UL << (hi)) -    \
                                   (1UL << (lo))))
 
-#define GFX_MASK_LARGE(lo,hi)    (((UINT64)1 << (hi)) |  \
-                                 (((UINT64)1 << (hi)) -  \
-                                  ((UINT64)1 << (lo))))
+#define GFX_MASK_LARGE(lo,hi)    (((uint64_t)1 << (hi)) |  \
+                                 (((uint64_t)1 << (hi)) -  \
+                                  ((uint64_t)1 << (lo))))
 
 #define GFX_IS_POWER_OF_2(a)     (((a) > 0) && !((a) & ((a) - 1)))
 
@@ -289,19 +290,19 @@ __S_INLINE int64_t GFX_POW2_SIZE (int64_t x)
             {
                 #ifdef __CT__
                 {
-                    _BitScanReverse64(&HighBit, x - 1);
+                    _BitScanReverse64((DWORD *)&HighBit, x - 1);
                 }
                 #else // Break into separate Upper/Lower scans...
                 {
                     #define UDW_1 ((int64_t) _UI32_MAX + 1) // <-- UpperDW Value of 1 (i.e. 0x00000001`00000000).
 
                     if(x < UDW_1)
                     {
-                        _BitScanReverse(&HighBit, GFX_ULONG_CAST(x - 1));
+                        _BitScanReverse((DWORD *)&HighBit, GFX_ULONG_CAST(x - 1));
                     }
                     else if(x > UDW_1)
                     {
-                        _BitScanReverse(&HighBit, GFX_ULONG_CAST((x - 1) >> 32));
+                        _BitScanReverse((DWORD *)&HighBit, GFX_ULONG_CAST((x - 1) >> 32));
                         HighBit += 32;
                     }
                     else

Source/inc/common/gtsysinfo.h

@@ -40,14 +40,14 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 typedef struct GT_SUBSLICE_INFO
 {
-    uint8_t             Enabled;            // determine if this SS is enabled.
+    bool                Enabled;            // determine if this SS is enabled.
     uint32_t            EuEnabledCount;     // Total Count of EU enabled on this SubSlice
     uint32_t            EuEnabledMask;      // Mask of EUs enabled on this SubSlice
 } GT_SUBSLICE_INFO;
 
 typedef struct GT_SLICE_INFO
 {
-    uint8_t              Enabled;                                    // determine if this slice is enabled.
+    bool                 Enabled;                                    // determine if this slice is enabled.
     GT_SUBSLICE_INFO     SubSliceInfo[GT_MAX_SUBSLICE_PER_SLICE];    // SS details that belong to this slice.
     uint32_t             SubSliceEnabledCount;                       // No. of SS enabled in this slice
 } GT_SLICE_INFO;
@@ -82,7 +82,7 @@ typedef struct GT_VEBOX_INFO
 
     uint32_t NumberOfVEBoxEnabled;              // Number of bits set among bit 0-3 of VEBoxEnableMask; used on CNL
 
-    uint8_t  IsValid;                               // flag to check if VEBoxInfo is valid.
+    bool     IsValid;                           // flag to check if VEBoxInfo is valid.
 
 } GT_VEBOX_INFO;
 
@@ -116,7 +116,7 @@ typedef struct GT_VDBOX_INFO
 
     uint32_t NumberOfVDBoxEnabled;              // Number of bits set among bit 0-7 of VDBoxEnableMask;
 
-    uint8_t IsValid;                               // flag to check if VDBoxInfo is valid.
+    bool     IsValid;                            // flag to check if VDBoxInfo is valid.
 
 } GT_VDBOX_INFO;
 
@@ -136,7 +136,7 @@ typedef struct GT_SYSTEM_INFO
     uint64_t        L3CacheSizeInKb;                // Total L3 cache size in kilo bytes
     uint64_t        LLCCacheSizeInKb;               // Total LLC cache size in kilo bytes
     uint64_t        EdramSizeInKb;                  // Total EDRAM size in kilo bytes
-    uint32_t        L3BankCount;                    // Total L3 banks across all slices. This is not bank count per slice.
+    uint32_t        L3BankCount;                    // Total L3 banks across all slices. This is not bank count per slice. 
     uint32_t        MaxFillRate;                    // Fillrate with Alphablend (in Pix/Clk)
     uint32_t        EuCountPerPoolMax;              // Max EU count per pool
     uint32_t        EuCountPerPoolMin;              // Min EU count per pool
@@ -148,28 +148,28 @@ typedef struct GT_SYSTEM_INFO
     uint32_t        TotalPsThreadsWindowerRange;    // Total threads in PS Windower Range
 
     // Note: The CSR size requirement is not clear at this moment. Till then the driver will set
-    // the maximum size that should be sufficient for all platform SKUs.
+    // the maximum size that should be sufficient for all platform SKUs. 
     uint32_t        CsrSizeInMb;                    // Total size that driver needs to allocate for CSR.
 
     /*------------------------------------*/
     // Below fields are required for proper allocation of scratch/private space for threads execution.
     // Threads scratch space has to be allocated based on native die config. So allocation has to be
     // done even for unfused or non-enabled slices/subslices/EUs. Since H/W doesn't provide us a way to know
     // about the native die config S/W will allocate based on max EU/S/SS.
-    uint32_t        MaxEuPerSubSlice;               // Max available EUs per sub-slice.
+    uint32_t        MaxEuPerSubSlice;               // Max available EUs per sub-slice. 
     uint32_t        MaxSlicesSupported;             // Max slices this platfrom can have.
     uint32_t        MaxSubSlicesSupported;          // Max total sub-slices this platform can have (not per slice)
     /*------------------------------------*/
 
     // Flag to determine if hashing is enabled. If enabled then one of the L3 banks will be disabled.
     // As a result 'L3BankCount' will be reduced by 1 bank during system info derivation routine.
     // Note: Only expected only in CNL (limited SKUs).
-    uint8_t            IsL3HashModeEnabled;
+    bool           IsL3HashModeEnabled;
 
     // VEBox/VDBox info
     GT_VDBOX_INFO   VDBoxInfo;                      // VDBoxInfo provides details(enabled/disabled) of all VDBox instances.
     GT_VEBOX_INFO   VEBoxInfo;                      // VEBoxInfo provides details(enabled/disabled) of all VEBox instances.
-
+    
     // SliceInfo provides the detailed breakdown of the Slice/Subslice/EU configuration. It is useful
     // for various WA that depend on the specific SSEU components enabled or disabled, but it is not
     // considered critically important to driver function at this time and may not be validly populated
@@ -179,7 +179,7 @@ typedef struct GT_SYSTEM_INFO
     // purpose. At the moment we are constrained by USC not to make any changes to the GT System
     // Info interface which require USC changes. USC currently references IsDynamicallyPopulated.
     GT_SLICE_INFO   SliceInfo[GT_MAX_SLICE];
-    uint8_t            IsDynamicallyPopulated;
+    bool            IsDynamicallyPopulated;
 
 	//SqidiInfo provides the detailed information for number of SQIDIs supported in GT.
 	//It also provides total no. of doorbells available per SQIDI unit.

Source/inc/umKmInc/UmKmDmaPerfTimer.h

@@ -31,7 +31,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #if defined (LHDM) || defined(KM_PERF_CONTROLLER_BUILD) || defined(_PERF_REPORT)
     #include "UmKmEnum.h"
 #endif
-
+#include <stdint.h>
 // Set packing alignment
 #pragma pack(push, 1)
 

Source/inc/umKmInc/sharedata.h

@@ -102,10 +102,10 @@ typedef struct __KMD_OVERLAY_CAPS_INFO
 
     KMD_OVERLAY_OVERRIDE    OVOverride;
 
-    uint32_t                    MaxOverlayDisplayWidth;
-    uint32_t                    MaxOverlayDisplayHeight;
+    uint32_t                MaxOverlayDisplayWidth;
+    uint32_t                MaxOverlayDisplayHeight;
     uint8_t                 HWScalerExists;
-    uint32_t                   MaxHWScalerStride;
+    uint32_t                MaxHWScalerStride;
 } KMD_OVERLAY_CAPS_INFO;
 
 // Frame Rate
@@ -120,10 +120,10 @@ typedef struct __KM_SYSTEM_INFO
 
     GT_SYSTEM_INFO      SystemInfo;
     // ShadowReg 119 caluclated value required for WA <WaProgramMgsrForCorrectSliceSpecificMmioReads>
-    uint32_t               ShadowRegValue;
-    uint32_t               ShadowRegValueforL3SpecificRegReads; // Shadow reg value for L3 bank specific MMIO reads.
+    uint32_t            ShadowRegValue;
+    uint32_t            ShadowRegValueforL3SpecificRegReads; // Shadow reg value for L3 bank specific MMIO reads.
 
-    uint32_t               GfxDevId;         // DeviceID
+    uint32_t            GfxDevId;         // DeviceID
 }KM_SYSTEM_INFO;
 
 
@@ -149,47 +149,47 @@ typedef struct _KM_DEFERRED_WAIT_INFO
 #pragma pack (push,1)
 typedef struct _ADAPTER_INFO
 {
-    uint32_t                        KmdVersionInfo;         // Version ID
+    uint32_t                    KmdVersionInfo;         // Version ID
     DRIVER_VERSION_INFO         DriverVersionInfo;      //
     PLATFORM                    GfxPlatform;            // Chipset Gfx family, product, render core, display core, etc
     SKU_FEATURE_TABLE           SkuTable;               // SKU feature table
     WA_TABLE                    WaTable;                // WA table
-    uint32_t                        GfxTimeStampFreq;       // In Hz (No. of clock ticks per second). So timestamp base = 1 / GfxTimeStampFreq
-    uint32_t                        GfxCoreFrequency;       // In MHz.
-    uint32_t                        FSBFrequency;           // In MHz.
-    uint32_t                        MinRenderFreq;          // In MHz.
-    uint32_t                        MaxRenderFreq;          // In MHz.
-    uint32_t                       PackageTdp;             // TDP Power for the platform (In Watt)
-    uint32_t                        MaxFillRate;            // Fillrate with Alphablend (In Pix/Clk)
-    uint32_t                        NumberOfEUs;            // Number of EUs in GT
+    uint32_t                    GfxTimeStampFreq;       // In Hz (No. of clock ticks per second). So timestamp base = 1 / GfxTimeStampFreq
+    uint32_t                    GfxCoreFrequency;       // In MHz.
+    uint32_t                    FSBFrequency;           // In MHz.
+    uint32_t                    MinRenderFreq;          // In MHz.
+    uint32_t                    MaxRenderFreq;          // In MHz.
+    uint32_t                    PackageTdp;             // TDP Power for the platform (In Watt)
+    uint32_t                    MaxFillRate;            // Fillrate with Alphablend (In Pix/Clk)
+    uint32_t                    NumberOfEUs;            // Number of EUs in GT
 
     // NOTE: Name is kept same so that we don't have to change PC_TARGET macro and usage
     //       of that.
-    uint32_t                        dwReleaseTarget;        // PC Release Target Information supplied by INF
+    uint32_t                    dwReleaseTarget;        // PC Release Target Information supplied by INF
 
     // Following member can be use by UMD for optimal use of DMA and
     // command buffer
-    uint32_t                        SizeOfDmaBuffer;        // Size of DMA buffer set (In Bytes)
-    uint32_t                        PatchLocationListSize;  // Size of Patch Location List (In number of entries)
-    uint32_t                        AllocationListSize;     // Size of Patch Location List (In number of entries)
-    uint32_t                        SmallPatchLocationListSize;  // Size of Patch Location List for UMD context that needs a small Patch Location List,
+    uint32_t                    SizeOfDmaBuffer;        // Size of DMA buffer set (In Bytes)
+    uint32_t                    PatchLocationListSize;  // Size of Patch Location List (In number of entries)
+    uint32_t                    AllocationListSize;     // Size of Patch Location List (In number of entries)
+    uint32_t                    SmallPatchLocationListSize;  // Size of Patch Location List for UMD context that needs a small Patch Location List,
                                                              // currently only used by media context (In number of entries)
-    uint32_t                        DefaultCmdBufferSize;   // Size of Cmd buffer default location
+    uint32_t                    DefaultCmdBufferSize;   // Size of Cmd buffer default location
 
     // Following Members can be use for any UMD optimization (like Size of vertex buffer to allocate)
     // any cacheline related read/write, etc
-    int64_t                       GfxMemorySize;          // Total GFX memory (In MBytes)
-    uint32_t                        SystemMemorySize;       // Total System Memory (In MBytes)
-    uint32_t                        CacheLineSize;          // Processor CacheLine size
+    int64_t                     GfxMemorySize;          // Total GFX memory (In MBytes)
+    uint32_t                    SystemMemorySize;       // Total System Memory (In MBytes)
+    uint32_t                    CacheLineSize;          // Processor CacheLine size
     PROCESSOR_FAMILY            ProcessorFamily;        // Processor Family
     uint8_t                     IsHTSupported;          // Is Hyper Threaded CPU
     uint8_t                     IsMutiCoreCpu;          // Is Multi Core CPU
     uint8_t                     IsVTDSupported;         // Is Chipset VT is supported
     char                        DeviceRegistryPath[UMD_KMD_MAX_REGISTRY_PATH_LENGTH];    // Array that contains the device registry path
-    uint32_t                        RegistryPathLength;     // Actual chars (not including any trailing NULL) in the array set by the KMD
-    int64_t                       DedicatedVideoMemory;   // Dedicated Video Memory
-    int64_t                       SystemSharedMemory;     // System Shared Memory
-    int64_t                       SystemVideoMemory;      // SystemVideoMemory
+    uint32_t                    RegistryPathLength;     // Actual chars (not including any trailing NULL) in the array set by the KMD
+    int64_t                     DedicatedVideoMemory;   // Dedicated Video Memory
+    int64_t                     SystemSharedMemory;     // System Shared Memory
+    int64_t                     SystemVideoMemory;      // SystemVideoMemory
     FRAME_RATE                  OutputFrameRate;        // Output Frame Rate
     FRAME_RATE                  InputFrameRate;         // Input Frame Rate
     KMD_CAPS_INFO               Caps;                   // List of capabilities supported by the KMD

Source/util/g_gfxDebug.h

@@ -151,7 +151,7 @@ enum
 #ifdef __cplusplus
 extern "C" {
 #endif
-void GMMPrintMessage(uint32_t DebugLevel, const char *DebugMessageFmt, ...);
+void GMMPrintMessage(unsigned long DebugLevel, const char *DebugMessageFmt, ...);
 
 #ifdef __cplusplus
 }