Hello community, here is the log from the commit of package gmmlib for openSUSE:Factory checked in at 2020-03-24 22:34:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gmmlib (Old) and /work/SRC/openSUSE:Factory/.gmmlib.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gmmlib" Tue Mar 24 22:34:21 2020 rev:7 rq:787479 version:19.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/gmmlib/gmmlib.changes 2019-11-08 15:28:54.143204042 +0100 +++ /work/SRC/openSUSE:Factory/.gmmlib.new.3160/gmmlib.changes 2020-03-24 22:34:22.365148615 +0100 @@ -1,0 +2,6 @@ +Mon Mar 23 11:08:00 UTC 2020 - Martin Pluskal <mplus...@suse.com> + +- Update to version 19.4.1: + * No upstream changelog available + +------------------------------------------------------------------- @@ -40 +45,0 @@ - Old: ---- intel-gmmlib-19.3.3.tar.gz New: ---- intel-gmmlib-19.4.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gmmlib.spec ++++++ --- /var/tmp/diff_new_pack.CQyrmL/_old 2020-03-24 22:34:24.565149685 +0100 +++ /var/tmp/diff_new_pack.CQyrmL/_new 2020-03-24 22:34:24.565149685 +0100 @@ -1,7 +1,7 @@ # # spec file for package gmmlib # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,75 +15,67 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # - -%define so_ver 11 - +%global somajor 11 +%global libname libigdgmm%{somajor} Name: gmmlib -Version: 19.3.3 +Version: 19.4.1 Release: 0 -Summary: Intel Graphics Memory Management Library +Summary: Intel(R) Graphics Memory Management Library Package License: MIT -Group: System/Libraries +Group: Development/Libraries/C and C++ URL: https://github.com/intel/gmmlib -Source: https://github.com/intel/gmmlib/archive/intel-gmmlib-%{version}.tar.gz +Source0: https://github.com/intel/gmmlib/archive/intel-gmmlib-%{version}.tar.gz BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig ExclusiveArch: x86_64 %description -The Intel Graphics Memory Management Library provides device specific and -buffer management for the Intel Graphics Compute Runtime for OpenCL and -the Intel Media Driver for VAAPI. - -%package -n libigdgmm%{so_ver} -Summary: Intel Graphics Memory Management Library -Group: System/Libraries - -%description -n libigdgmm%{so_ver} -The Intel Graphics Memory Management Library provides device specific and -buffer management for the Intel Graphics Compute Runtime for OpenCL and -the Intel Media Driver for VAAPI. +The Intel(R) Graphics Memory Management Library provides device specific +and buffer management for the Intel(R) Graphics Compute Runtime for +OpenCL(TM) and the Intel(R) Media Driver for VAAPI. + +%package -n %{libname} +Summary: Intel(R) Graphics Memory Management Library development package + +%description -n %{libname} +The Intel(R) Graphics Memory Management Library provides device specific +and buffer management for the Intel(R) Graphics Compute Runtime for +OpenCL(TM) and the Intel(R) Media Driver for VAAPI. + +This package contains shared library. + +%package devel +Summary: Intel(R) Graphics Memory Management Library development package +Requires: %{libname} = %{version} +Provides: libigdgmm-devel = %{version} +Obsoletes: libigdgmm-devel < %{version} + +%description devel +The Intel(R) Graphics Memory Management Library provides device specific +and buffer management for the Intel(R) Graphics Compute Runtime for +OpenCL(TM) and the Intel(R) Media Driver for VAAPI. -%package -n libigdgmm-devel -Summary: Development files for Intel Graphics Memory Management Library -Group: Development/Libraries/C and C++ -Requires: libigdgmm%{so_ver} = %{version} -Provides: gmmlib-devel - -%description -n libigdgmm-devel -The Intel Graphics Memory Management Library provides device specific and -buffer management for the Intel Graphics Compute Runtime for OpenCL and -the Intel Media Driver for VAAPI. - -This package contains the development headers for the library found in -libigdgmm%{so_ver}. +This package provides development files. %prep -%setup -q -c -a 0 -mv gmmlib-intel-gmmlib-* gmmlib -chmod -x gmmlib/*.md gmmlib/*.rst - -%define __sourcedir gmmlib +%autosetup -n %{name}-intel-%{name}-%{version} %build -srcroot=`pwd` %cmake -%make_jobs +%cmake_build %install %cmake_install -rm -f %{buildroot}%{_libdir}/*.a -%post -n libigdgmm%{so_ver} -p /sbin/ldconfig -%postun -n libigdgmm%{so_ver} -p /sbin/ldconfig +%post -n %{libname} -p /sbin/ldconfig +%postun -n %{libname} -p /sbin/ldconfig -%files -n libigdgmm%{so_ver} -%doc gmmlib/README.rst -%license gmmlib/LICENSE.md -%{_libdir}/libigdgmm.so.* +%files -n %{libname} +%license LICENSE.md +%{_libdir}/libigdgmm.so.%{somajor}* -%files -n libigdgmm-devel +%files devel %{_includedir}/igdgmm %{_libdir}/libigdgmm.so %{_libdir}/pkgconfig/igdgmm.pc ++++++ intel-gmmlib-19.3.3.tar.gz -> intel-gmmlib-19.4.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gmmlib-intel-gmmlib-19.3.3/Source/GmmLib/CMakeLists.txt new/gmmlib-intel-gmmlib-19.4.1/Source/GmmLib/CMakeLists.txt --- old/gmmlib-intel-gmmlib-19.3.3/Source/GmmLib/CMakeLists.txt 2019-10-15 16:02:10.000000000 +0200 +++ new/gmmlib-intel-gmmlib-19.4.1/Source/GmmLib/CMakeLists.txt 2019-12-20 07:09:27.000000000 +0100 @@ -25,14 +25,14 @@ # GmmLib Api Version used for so naming set(GMMLIB_API_MAJOR_VERSION 11) -set(GMMLIB_API_MINOR_VERSION 0) +set(GMMLIB_API_MINOR_VERSION 1) if(NOT DEFINED MAJOR_VERSION) set(MAJOR_VERSION 11) endif() if(NOT DEFINED MINOR_VERSION) - set(MINOR_VERSION 0) + set(MINOR_VERSION 1) endif() if(NOT DEFINED PATCH_VERSION) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gmmlib-intel-gmmlib-19.3.3/Source/GmmLib/GlobalInfo/GmmLibDllMain.cpp new/gmmlib-intel-gmmlib-19.4.1/Source/GmmLib/GlobalInfo/GmmLibDllMain.cpp --- old/gmmlib-intel-gmmlib-19.3.3/Source/GmmLib/GlobalInfo/GmmLibDllMain.cpp 2019-10-15 16:02:10.000000000 +0200 +++ new/gmmlib-intel-gmmlib-19.4.1/Source/GmmLib/GlobalInfo/GmmLibDllMain.cpp 2019-12-20 07:09:27.000000000 +0100 @@ -106,17 +106,36 @@ GMM_STATUS Status = GMM_SUCCESS; GMM_CLIENT_CONTEXT *pClientContext = NULL; - Status = GmmCreateSingletonContext(Platform, pSkuTable, pWaTable, pGtSysInfo); if(Status == GMM_SUCCESS) - { + { pClientContext = GmmCreateClientContext(ClientType); - } + } return pClientContext; } +///////////////////////////////////////////////////////////////////////////////////// +// First Call to GMM Lib DLL/so to initialize singleton global context +// and create client context +///////////////////////////////////////////////////////////////////////////////////// +extern "C" GMM_LIB_API GMM_STATUS GMM_STDCALL InitializeGmm(GMM_INIT_IN_ARGS *pInArgs, GMM_INIT_OUT_ARGS *pOutArgs) +{ + GMM_STATUS Status = GMM_ERROR; + + if(pInArgs && pOutArgs) + { + Status = GmmCreateSingletonContext(pInArgs->Platform, pInArgs->pSkuTable, pInArgs->pWaTable, pInArgs->pGtSysInfo); + + if(Status == GMM_SUCCESS) + { + pOutArgs->pGmmClientContext = GmmCreateClientContext(pInArgs->ClientType); + } + } + + return Status; +} ///////////////////////////////////////////////////////////////////////////////////// /// Destroys singleton global context and client context @@ -127,4 +146,16 @@ GmmDestroySingletonContext(); GmmDeleteClientContext(pGmmClientContext); } + +///////////////////////////////////////////////////////////////////////////////////// +// Destroys singleton global context and client context +///////////////////////////////////////////////////////////////////////////////////// +extern "C" GMM_LIB_API void GMM_STDCALL GmmAdapterDestroy(GMM_INIT_OUT_ARGS *pInArgs) +{ + if(pInArgs && pInArgs->pGmmClientContext) + { + GmmDeleteClientContext(pInArgs->pGmmClientContext); + GmmDestroySingletonContext(); + } +} #endif // GMM_LIB_DLL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gmmlib-intel-gmmlib-19.3.3/Source/GmmLib/Resource/GmmResourceInfoCommonEx.cpp new/gmmlib-intel-gmmlib-19.4.1/Source/GmmLib/Resource/GmmResourceInfoCommonEx.cpp --- old/gmmlib-intel-gmmlib-19.3.3/Source/GmmLib/Resource/GmmResourceInfoCommonEx.cpp 2019-10-15 16:02:10.000000000 +0200 +++ new/gmmlib-intel-gmmlib-19.4.1/Source/GmmLib/Resource/GmmResourceInfoCommonEx.cpp 2019-12-20 07:09:27.000000000 +0100 @@ -59,7 +59,7 @@ CreateParams.Flags.Info.TiledY = true; // Pre-Gen11 Planar - if(GmmIsPlanar(CreateParams.Format)) + if(GmmIsPlanar(CreateParams.Format) && (GFX_GET_CURRENT_RENDERCORE(pGmmGlobalContext->GetPlatformInfo().Platform) < IGFX_GEN11_CORE)) { CreateParams.Flags.Info.TiledX = true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gmmlib-intel-gmmlib-19.3.3/Source/GmmLib/TranslationTable/GmmAuxTable.cpp new/gmmlib-intel-gmmlib-19.4.1/Source/GmmLib/TranslationTable/GmmAuxTable.cpp --- old/gmmlib-intel-gmmlib-19.3.3/Source/GmmLib/TranslationTable/GmmAuxTable.cpp 2019-10-15 16:02:10.000000000 +0200 +++ new/gmmlib-intel-gmmlib-19.4.1/Source/GmmLib/TranslationTable/GmmAuxTable.cpp 2019-12-20 07:09:27.000000000 +0100 @@ -519,7 +519,7 @@ { // Clear valid bit of L2 entry L2e.Valid = 0; - ((GMM_AUXTTL2e *)L2GfxAddress)[L2eIdx].Valid = 0; + ((GMM_AUXTTL2e *)L2CPUAddress)[L2eIdx].Valid = 0; } if(DoNotWait) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gmmlib-intel-gmmlib-19.3.3/Source/GmmLib/TranslationTable/GmmPageTableMgr.cpp new/gmmlib-intel-gmmlib-19.4.1/Source/GmmLib/TranslationTable/GmmPageTableMgr.cpp --- old/gmmlib-intel-gmmlib-19.3.3/Source/GmmLib/TranslationTable/GmmPageTableMgr.cpp 2019-10-15 16:02:10.000000000 +0200 +++ new/gmmlib-intel-gmmlib-19.4.1/Source/GmmLib/TranslationTable/GmmPageTableMgr.cpp 2019-12-20 07:09:27.000000000 +0100 @@ -69,7 +69,7 @@ } pAlloc->GfxVA = Alloc.gfxAddr; - pAlloc->CPUVA = Alloc.gfxAddr; + pAlloc->CPUVA = (GMM_GFX_ADDRESS) Alloc.cpuAddr; pAlloc->Handle = (HANDLE)Alloc.bo; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gmmlib-intel-gmmlib-19.3.3/Source/GmmLib/inc/External/Common/GmmLibDll.h new/gmmlib-intel-gmmlib-19.4.1/Source/GmmLib/inc/External/Common/GmmLibDll.h --- old/gmmlib-intel-gmmlib-19.3.3/Source/GmmLib/inc/External/Common/GmmLibDll.h 2019-10-15 16:02:10.000000000 +0200 +++ new/gmmlib-intel-gmmlib-19.4.1/Source/GmmLib/inc/External/Common/GmmLibDll.h 2019-12-20 07:09:27.000000000 +0100 @@ -24,6 +24,21 @@ #include "GmmCommonExt.h" #include "GmmInfo.h" +typedef struct _GMM_INIT_IN_ARGS_ +{ + PLATFORM Platform; + void *pSkuTable; + void *pWaTable; + void *pGtSysInfo; + uint32_t FileDescriptor; + GMM_CLIENT ClientType; +} GMM_INIT_IN_ARGS; + +typedef struct _GMM_INIT_OUT_ARGS_ +{ + GMM_CLIENT_CONTEXT *pGmmClientContext; +} GMM_INIT_OUT_ARGS; + // Interfaces exported from GMM Lib DLL typedef struct _GmmExportEntries { @@ -54,6 +69,8 @@ /// Only function exported from GMM lib DLL. ///////////////////////////////////////////////////////////////////////////////////// GMM_LIB_API GMM_STATUS GMM_STDCALL OpenGmm(GmmExportEntries *pm_GmmFuncs); + GMM_LIB_API GMM_STATUS GMM_STDCALL InitializeGmm(GMM_INIT_IN_ARGS *pInArgs, GMM_INIT_OUT_ARGS *pOutArgs); + GMM_LIB_API void GMM_STDCALL GmmAdapterDestroy(GMM_INIT_OUT_ARGS *pInArgs); #ifdef __cplusplus } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gmmlib-intel-gmmlib-19.3.3/Source/GmmLib/inc/External/Common/GmmLibDllName.h new/gmmlib-intel-gmmlib-19.4.1/Source/GmmLib/inc/External/Common/GmmLibDllName.h --- old/gmmlib-intel-gmmlib-19.3.3/Source/GmmLib/inc/External/Common/GmmLibDllName.h 2019-10-15 16:02:10.000000000 +0200 +++ new/gmmlib-intel-gmmlib-19.4.1/Source/GmmLib/inc/External/Common/GmmLibDllName.h 2019-12-20 07:09:27.000000000 +0100 @@ -22,20 +22,23 @@ #pragma once #if defined(_WIN64 ) || defined(__x86_64__) || defined(__LP64__) - #define GMM_ENTRY_NAME "OpenGmm" - #define GMM_INIT_NAME "GmmInit" - #define GMM_DESTROY_NAME "GmmDestroy" + #define GMM_ENTRY_NAME "OpenGmm" + #define GMM_INIT_NAME "GmmInit" + #define GMM_ADAPTER_INIT_NAME "InitializeGmm" + #define GMM_DESTROY_NAME "GmmDestroy" + #define GMM_ADAPTER_DESTROY_NAME "GmmAdapterDestroy" #if defined(_WIN64) - #define GMM_UMD_DLL "igdgmm64.dll" + #define GMM_UMD_DLL "igdgmm64.dll" #else - #define GMM_UMD_DLL "libigdgmm.so.11" + #define GMM_UMD_DLL "libigdgmm.so.11" #endif #else - #define GMM_ENTRY_NAME "_OpenGmm@4" - - #define GMM_INIT_NAME "_GmmInit@48" - #define GMM_DESTROY_NAME "_GmmDestroy@4" + #define GMM_ENTRY_NAME "_OpenGmm@4" + #define GMM_INIT_NAME "_GmmInit@48" + #define GMM_ADAPTER_INIT_NAME "_InitializeGmm@8" + #define GMM_DESTROY_NAME "_GmmDestroy@4" + #define GMM_ADAPTER_DESTROY_NAME "_GmmAdapterDestroy@4" #if defined(_WIN32) #define GMM_UMD_DLL "igdgmm32.dll" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gmmlib-intel-gmmlib-19.3.3/Source/GmmLib/inc/GmmLib.h new/gmmlib-intel-gmmlib-19.4.1/Source/GmmLib/inc/GmmLib.h --- old/gmmlib-intel-gmmlib-19.3.3/Source/GmmLib/inc/GmmLib.h 2019-10-15 16:02:10.000000000 +0200 +++ new/gmmlib-intel-gmmlib-19.4.1/Source/GmmLib/inc/GmmLib.h 2019-12-20 07:09:27.000000000 +0100 @@ -58,6 +58,8 @@ #include "External/Common/GmmInfo.h" #include "External/Common/GmmClientContext.h" +#include "External/Common/GmmPageTableMgr.h" + #include "External/Common/GmmLibDll.h" #include "External/Common/GmmLibDllName.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gmmlib-intel-gmmlib-19.3.3/Source/inc/common/igfxfmid.h new/gmmlib-intel-gmmlib-19.4.1/Source/inc/common/igfxfmid.h --- old/gmmlib-intel-gmmlib-19.3.3/Source/inc/common/igfxfmid.h 2019-10-15 16:02:10.000000000 +0200 +++ new/gmmlib-intel-gmmlib-19.4.1/Source/inc/common/igfxfmid.h 2019-12-20 07:09:27.000000000 +0100 @@ -1187,6 +1187,11 @@ #define IEHL_1x4x4_DEVICE_A0_ID 0x4551 #define IEHL_1x4x8_DEVICE_A0_ID 0x4571 +//JSL+ Rev02 +#define IJSL_1x4x4_DEVICE_B0_ID 0x4E51 +#define IJSL_1x4x6_DEVICE_B0_ID 0x4E61 +#define IJSL_1x4x8_DEVICE_B0_ID 0x4E71 + //ICL PCH LP Device IDs #define ICP_LP_RESERVED_FUSE_ID 0x3480 #define ICP_LP_U_SUPER_SKU_ID 0x3481 @@ -1292,6 +1297,40 @@ #define PCH_CMP_LP_DEV_P31_ID 0x029E #define PCH_CMP_LP_DEV_P32_ID 0x029F +// TGL_H PCH Device ID range 0x4380-0x439F +#define PCH_TGL_H_UNKNOWN_SKU_ID_1 0x4380 +#define PCH_TGL_H_UNKNOWN_SKU_ID_2 0x4381 +#define PCH_TGL_H_UNKNOWN_SKU_ID_3 0x4382 +#define PCH_TGL_H_UNKNOWN_SKU_ID_4 0x4383 +#define PCH_TGL_H_UNKNOWN_SKU_ID_5 0x4384 +#define PCH_TGL_H_UNKNOWN_SKU_ID_6 0x4385 +#define PCH_TGL_H_UNKNOWN_SKU_ID_7 0x4386 +#define PCH_TGL_H_UNKNOWN_SKU_ID_8 0x4387 +#define PCH_TGL_H_UNKNOWN_SKU_ID_9 0x4388 +#define PCH_TGL_H_UNKNOWN_SKU_ID_10 0x4389 +#define PCH_TGL_H_UNKNOWN_SKU_ID_11 0x438A +#define PCH_TGL_H_UNKNOWN_SKU_ID_12 0x438B +#define PCH_TGL_H_UNKNOWN_SKU_ID_13 0x438C +#define PCH_TGL_H_UNKNOWN_SKU_ID_14 0x438D +#define PCH_TGL_H_UNKNOWN_SKU_ID_15 0x438E +#define PCH_TGL_H_UNKNOWN_SKU_ID_16 0x438F +#define PCH_TGL_H_UNKNOWN_SKU_ID_17 0x4390 +#define PCH_TGL_H_UNKNOWN_SKU_ID_18 0x4391 +#define PCH_TGL_H_UNKNOWN_SKU_ID_19 0x4392 +#define PCH_TGL_H_UNKNOWN_SKU_ID_20 0x4393 +#define PCH_TGL_H_UNKNOWN_SKU_ID_21 0x4394 +#define PCH_TGL_H_UNKNOWN_SKU_ID_22 0x4395 +#define PCH_TGL_H_UNKNOWN_SKU_ID_23 0x4396 +#define PCH_TGL_H_UNKNOWN_SKU_ID_24 0x4397 +#define PCH_TGL_H_UNKNOWN_SKU_ID_25 0x4398 +#define PCH_TGL_H_UNKNOWN_SKU_ID_26 0x4399 +#define PCH_TGL_H_UNKNOWN_SKU_ID_27 0x439A +#define PCH_TGL_H_UNKNOWN_SKU_ID_28 0x439B +#define PCH_TGL_H_UNKNOWN_SKU_ID_29 0x439C +#define PCH_TGL_H_UNKNOWN_SKU_ID_30 0x439D +#define PCH_TGL_H_UNKNOWN_SKU_ID_31 0x439E +#define PCH_TGL_H_UNKNOWN_SKU_ID_32 0x439F + //define CML H PCH Device Ids #define PCH_CMP_H_DEV_P1_ID 0x0680 #define PCH_CMP_H_DEV_P2_ID 0x0681 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gmmlib-intel-gmmlib-19.3.3/Source/inc/umKmInc/sharedata.h new/gmmlib-intel-gmmlib-19.4.1/Source/inc/umKmInc/sharedata.h --- old/gmmlib-intel-gmmlib-19.3.3/Source/inc/umKmInc/sharedata.h 2019-10-15 16:02:10.000000000 +0200 +++ new/gmmlib-intel-gmmlib-19.4.1/Source/inc/umKmInc/sharedata.h 2019-12-20 07:09:27.000000000 +0100 @@ -134,6 +134,22 @@ uint32_t ActiveDisplay; } KM_DEFERRED_WAIT_INFO; +// struct to hold Adapter's BDF +typedef struct _ADAPTER_BDF_ +{ + union + { + struct + { + uint32_t Bus : 8; + uint32_t Device : 8; + uint32_t Function : 8; + uint32_t Reserved : 8; + }; + uint32_t Data; + }; +}ADAPTER_BDF; + // Private data structure for D3D callback QueryAdapterInfoCB //===========================================================================
