Update intel-gmmlib to 22.3.20 and intel-media-driver to 24.2.5. I had hoped that this version would fix my segment error in mos_gpucontext_specific_next as there was a note in the release notes: "Improved software stability by fixing potential segment fault issues for AV1/AVC/HEVC/MPEG2/VP9 decoding".
https://github.com/intel/media-driver/releases/tag/intel-media-24.2.5 So I just plugged it by checking the globalInst variable. OK? Feedback? Rafael Index: intel-gmmlib/Makefile =================================================================== RCS file: /cvs/ports/graphics/intel-gmmlib/Makefile,v diff -u -p -r1.4 Makefile --- intel-gmmlib/Makefile 20 Jul 2024 07:19:05 -0000 1.4 +++ intel-gmmlib/Makefile 2 Aug 2024 19:10:16 -0000 @@ -2,7 +2,7 @@ ONLY_FOR_ARCHS = amd64 i386 COMMENT = Intel Graphics Memory Management Library -VERSION = 22.3.19 +VERSION = 22.3.20 GH_ACCOUNT = intel GH_PROJECT = gmmlib GH_TAGNAME = intel-gmmlib-${VERSION} Index: intel-gmmlib/distinfo =================================================================== RCS file: /cvs/ports/graphics/intel-gmmlib/distinfo,v diff -u -p -r1.1.1.1 distinfo --- intel-gmmlib/distinfo 15 Jul 2024 19:11:10 -0000 1.1.1.1 +++ intel-gmmlib/distinfo 2 Aug 2024 19:10:16 -0000 @@ -1,2 +1,2 @@ -SHA256 (intel-gmmlib-22.3.19.tar.gz) = 6pxBiw/YSpgoUPIwyy14Pf4uH5kjBl9Usvyq0emzNBc= -SIZE (intel-gmmlib-22.3.19.tar.gz) = 846342 +SHA256 (intel-gmmlib-22.3.20.tar.gz) = InwWFNSBcVS05vv7ZnuisjHqeqU3ltkfGACvmutwP1k= +SIZE (intel-gmmlib-22.3.20.tar.gz) = 846257 Index: intel-gmmlib/patches/patch-Source_GmmLib_Texture_GmmTextureAlloc_cpp =================================================================== RCS file: /cvs/ports/graphics/intel-gmmlib/patches/patch-Source_GmmLib_Texture_GmmTextureAlloc_cpp,v diff -u -p -r1.1.1.1 patch-Source_GmmLib_Texture_GmmTextureAlloc_cpp --- intel-gmmlib/patches/patch-Source_GmmLib_Texture_GmmTextureAlloc_cpp 15 Jul 2024 19:11:10 -0000 1.1.1.1 +++ intel-gmmlib/patches/patch-Source_GmmLib_Texture_GmmTextureAlloc_cpp 2 Aug 2024 19:10:16 -0000 @@ -2,7 +2,7 @@ https://github.com/intel/gmmlib/pull/68 Index: Source/GmmLib/Texture/GmmTextureAlloc.cpp --- Source/GmmLib/Texture/GmmTextureAlloc.cpp.orig +++ Source/GmmLib/Texture/GmmTextureAlloc.cpp -@@ -823,7 +823,7 @@ GMM_STATUS GmmLib::GmmTextureCalc::FillTexPitchAndSize +@@ -812,7 +812,7 @@ GMM_STATUS GmmLib::GmmTextureCalc::FillTexPitchAndSize } else { Index: intel-media-driver/Makefile =================================================================== RCS file: /cvs/ports/graphics/intel-media-driver/Makefile,v diff -u -p -r1.7 Makefile --- intel-media-driver/Makefile 31 Jul 2024 21:19:17 -0000 1.7 +++ intel-media-driver/Makefile 2 Aug 2024 19:10:16 -0000 @@ -3,16 +3,17 @@ BROKEN-i386 = ld: error: [...] is incomp COMMENT = VAAPI driver for Intel HD 5000 (Gen8) or newer -VERSION = 24.1.5 +VERSION = 24.2.5 GH_ACCOUNT = intel GH_PROJECT = media-driver GH_TAGNAME = intel-media-${VERSION} -REVISION = 1 DISTNAME = intel-media-driver-${VERSION} CATEGORIES = graphics multimedia +HOMEPAGE = https://github.com/intel/media-driver/wiki + # MIT & BSD-3-Clause PERMIT_PACKAGE= Yes @@ -22,10 +23,10 @@ MODULES = devel/cmake COMPILER = base-clang ports-gcc -LIB_DEPENDS = graphics/intel-gmmlib +LIB_DEPENDS = graphics/intel-gmmlib>=22.3.20 # XXX Unbundle googletest -CONFIGURE_ARGS = -DMEDIA_RUN_TEST_SUITE=ON +#CONFIGURE_ARGS = -DMEDIA_RUN_TEST_SUITE=ON CONFIGURE_ARGS += -DMEDIA_BUILD_FATAL_WARNINGS=OFF \ -DBUILD_CMRTLIB=OFF @@ -35,9 +36,5 @@ CONFIGURE_ARGS += -DLIBVA_DRIVERS_PATH=" # build dependency on libva MODCMAKE_LDFLAGS = -L${X11BASE}/lib -L${LOCALBASE}/lib CXXFLAGS = -I${X11BASE}/include - -pre-fake: - ${INSTALL_DATA_DIR} ${PREFIX}/lib/xorg/modules - .include <bsd.port.mk> Index: intel-media-driver/distinfo =================================================================== RCS file: /cvs/ports/graphics/intel-media-driver/distinfo,v diff -u -p -r1.1.1.1 distinfo --- intel-media-driver/distinfo 15 Jul 2024 19:27:04 -0000 1.1.1.1 +++ intel-media-driver/distinfo 2 Aug 2024 19:10:16 -0000 @@ -1,2 +1,2 @@ -SHA256 (intel-media-driver-24.1.5.tar.gz) = 4j6jfJjY1LnRo6E0tkiSVtj1p6TucZZ7Hbit5wBSZU8= -SIZE (intel-media-driver-24.1.5.tar.gz) = 25834293 +SHA256 (intel-media-driver-24.2.5.tar.gz) = 3sIhDB+CSnIeTqb2b1iZ4wCAGz5/riMtP4qU2zjC7dE= +SIZE (intel-media-driver-24.2.5.tar.gz) = 25860224 Index: intel-media-driver/patches/patch-media_softlet_linux_common_os_mos_gpucontext_specific_next_cpp =================================================================== RCS file: intel-media-driver/patches/patch-media_softlet_linux_common_os_mos_gpucontext_specific_next_cpp diff -N intel-media-driver/patches/patch-media_softlet_linux_common_os_mos_gpucontext_specific_next_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ intel-media-driver/patches/patch-media_softlet_linux_common_os_mos_gpucontext_specific_next_cpp 2 Aug 2024 19:10:16 -0000 @@ -0,0 +1,13 @@ +https://github.com/intel/media-driver/issues/1840 +Index: media_softlet/linux/common/os/mos_gpucontext_specific_next.cpp +--- media_softlet/linux/common/os/mos_gpucontext_specific_next.cpp.orig ++++ media_softlet/linux/common/os/mos_gpucontext_specific_next.cpp +@@ -1974,7 +1974,7 @@ PMOS_RESOURCE GpuContextSpecificNext::GetOcaRTLogResou + // than 2 video processors, the value may be overwritten and wrong allocation Index in array may be used. + // To avoid this, use duplicate MOS_RESOURCE instance in GPU Context to ensure differnt iAllocationIndex + // array of OcaRTLogResources being used for different GPU Context. +- if (!m_ocaRtLogResInited) ++ if (!m_ocaRtLogResInited && globalInst) + { + m_ocaRtLogResource = *globalInst; + m_ocaRtLogResInited = true; Index: intel-media-driver/patches/patch-media_softlet_linux_common_os_osservice_mos_utilities_specific_cpp =================================================================== RCS file: /cvs/ports/graphics/intel-media-driver/patches/patch-media_softlet_linux_common_os_osservice_mos_utilities_specific_cpp,v diff -u -p -r1.1.1.1 patch-media_softlet_linux_common_os_osservice_mos_utilities_specific_cpp --- intel-media-driver/patches/patch-media_softlet_linux_common_os_osservice_mos_utilities_specific_cpp 15 Jul 2024 19:27:04 -0000 1.1.1.1 +++ intel-media-driver/patches/patch-media_softlet_linux_common_os_osservice_mos_utilities_specific_cpp 2 Aug 2024 19:10:16 -0000 @@ -2,7 +2,7 @@ https://github.com/intel/media-driver/pu Index: media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp --- media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp.orig +++ media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp -@@ -2170,7 +2170,7 @@ uint32_t MosUtilities::MosGetThreadId( +@@ -2173,7 +2173,7 @@ uint32_t MosUtilities::MosGetThreadId( uint32_t MosUtilities::MosGetCurrentThreadId() { Index: intel-media-driver/patches/patch-media_softlet_linux_common_os_xe_include_dma-buf_h =================================================================== RCS file: intel-media-driver/patches/patch-media_softlet_linux_common_os_xe_include_dma-buf_h diff -N intel-media-driver/patches/patch-media_softlet_linux_common_os_xe_include_dma-buf_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ intel-media-driver/patches/patch-media_softlet_linux_common_os_xe_include_dma-buf_h 2 Aug 2024 19:10:16 -0000 @@ -0,0 +1,15 @@ +Index: media_softlet/linux/common/os/xe/include/dma-buf.h +--- media_softlet/linux/common/os/xe/include/dma-buf.h.orig ++++ media_softlet/linux/common/os/xe/include/dma-buf.h +@@ -20,7 +20,10 @@ + #ifndef _DMA_BUF_UAPI_H_ + #define _DMA_BUF_UAPI_H_ + +-#include <linux/types.h> ++#include <sys/types.h> ++typedef int32_t __s32; ++typedef uint32_t __u32; ++typedef uint64_t __u64; + + /** + * struct dma_buf_sync - Synchronize with CPU access. Index: intel-media-driver/pkg/DESCR =================================================================== RCS file: /cvs/ports/graphics/intel-media-driver/pkg/DESCR,v diff -u -p -r1.1.1.1 DESCR --- intel-media-driver/pkg/DESCR 15 Jul 2024 19:27:04 -0000 1.1.1.1 +++ intel-media-driver/pkg/DESCR 2 Aug 2024 19:10:16 -0000 @@ -1,21 +1,23 @@ -VA-API (Video Acceleration API) user mode driver for Intel GEN Graphics family +VA-API (Video Acceleration API) user mode driver for Intel GEN Graphics +family -VA-API is an open-source library and API specification, which provides access to -graphics hardware acceleration capabilities for video processing. It consists of -a main library and driver-specific acceleration backends for each supported -hardware vendor. +VA-API is an open-source library and API specification, which provides +access to graphics hardware acceleration capabilities for video +processing. It consists of a main library and driver-specific +acceleration backends for each supported hardware vendor. -The current video driver backend provides a bridge to the GEN GPUs through the -packaging of buffers and commands to be sent to the i915 driver for exercising -both hardware and shader functionality for video decode, encode, and processing. +The current video driver backend provides a bridge to the GEN GPUs +through the packaging of buffers and commands to be sent to the i915 +driver for exercising both hardware and shader functionality for video +decode, encode, and processing. Supported Platforms - BDW (Broadwell) - SKL (Skylake) - BXTx (BXT: Broxton, APL: Apollo Lake, GLK: Gemini Lake) -- KBLx (KBL: Kaby Lake, CFL: Coffee Lake, WHL: Whiskey Lake, CML: Comet Lake, - AML: Amber Lake) +- KBLx (KBL: Kaby Lake, CFL: Coffee Lake, WHL: Whiskey Lake, CML: Comet + Lake, AML: Amber Lake) - ICL (Ice Lake) - JSL (Jasper Lake) / EHL (Elkhart Lake) - TGLx (TGL: Tiger Lake, RKL: Rocket Lake, ADL-S/P/N: Alder Lake, RPL-S/P:
