diff options
author | Lim Siew Hoon <siew.hoon.lim@intel.com> | 2022-07-25 11:09:09 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2022-07-25 14:23:13 +0800 |
commit | b783f9e933ee07b118a550953e7cbf4db51d61d1 (patch) | |
tree | 98da38b0d2197bb7d42d2461e81d81bd761bf62a /recipes-multimedia/libva | |
parent | ada3eb5781551de175feda3cda94f4173826744c (diff) | |
download | meta-intel-b783f9e933ee07b118a550953e7cbf4db51d61d1.tar.gz |
intel-media-driver: upgrade 22.3.1 -> 22.4.4
Drops patches already merged:
* c8457540aed1ab9424661087276fb788c0e3aabb.patch
Add patches to fix fails with musl libc
* 0001-Fix-uClibc-build.patch
Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'recipes-multimedia/libva')
-rw-r--r-- | recipes-multimedia/libva/files/0001-Fix-uClibc-build.patch | 64 | ||||
-rw-r--r-- | recipes-multimedia/libva/files/c8457540aed1ab9424661087276fb788c0e3aabb.patch | 109 | ||||
-rw-r--r-- | recipes-multimedia/libva/intel-media-driver_22.4.4.bb (renamed from recipes-multimedia/libva/intel-media-driver_22.3.1.bb) | 4 |
3 files changed, 66 insertions, 111 deletions
diff --git a/recipes-multimedia/libva/files/0001-Fix-uClibc-build.patch b/recipes-multimedia/libva/files/0001-Fix-uClibc-build.patch new file mode 100644 index 00000000..dbe93872 --- /dev/null +++ b/recipes-multimedia/libva/files/0001-Fix-uClibc-build.patch | |||
@@ -0,0 +1,64 @@ | |||
1 | From 2e0a1de5fee7899cc7d4e67ec9893a621a3cf024 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bernd Kuhls <bernd.kuhls@t-online.de> | ||
3 | Date: Fri, 10 Jun 2022 18:42:34 +0200 | ||
4 | Subject: [PATCH] Fix uClibc build | ||
5 | |||
6 | uClibc does not provide execinfo.h | ||
7 | |||
8 | Upstream-Status: Submitted [https://github.com/intel/media-driver/pull/1437] | ||
9 | Signed-off-by: Lim Siew Hoon <siew.hoon.lim@intel.com> | ||
10 | --- | ||
11 | CMakeLists.txt | 6 ++++++ | ||
12 | .../linux/common/os/osservice/mos_utilities_specific.cpp | 4 ++++ | ||
13 | 2 files changed, 10 insertions(+) | ||
14 | |||
15 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
16 | index 8305acfdb..6bec00f7d 100755 | ||
17 | --- a/CMakeLists.txt | ||
18 | +++ b/CMakeLists.txt | ||
19 | @@ -53,6 +53,12 @@ option (BUILD_CMRTLIB "Build and Install cmrtlib together with media driver" ON) | ||
20 | |||
21 | option (ENABLE_PRODUCTION_KMD "Enable Production KMD header files" OFF) | ||
22 | |||
23 | +include(CheckIncludeFileCXX) | ||
24 | +check_include_file_cxx("execinfo.h" HAVE_EXECINFO) | ||
25 | +if (HAVE_EXECINFO) | ||
26 | + add_definitions(-DHAVE_EXECINFO) | ||
27 | +endif() | ||
28 | + | ||
29 | include(GNUInstallDirs) | ||
30 | |||
31 | if (BUILD_CMRTLIB AND NOT CMAKE_WDDM_LINUX) | ||
32 | diff --git a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp | ||
33 | index ff0b68655..8ea621f0e 100644 | ||
34 | --- a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp | ||
35 | +++ b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp | ||
36 | @@ -51,7 +51,9 @@ | ||
37 | #include <signal.h> | ||
38 | #include <unistd.h> // fork | ||
39 | #include <algorithm> | ||
40 | +#ifdef HAVE_EXECINFO | ||
41 | #include <execinfo.h> // backtrace | ||
42 | +#endif | ||
43 | |||
44 | const char *MosUtilitiesSpecificNext::m_szUserFeatureFile = USER_FEATURE_FILE; | ||
45 | MOS_PUF_KEYLIST MosUtilitiesSpecificNext::m_ufKeyList = nullptr; | ||
46 | @@ -2492,6 +2494,7 @@ void MosUtilities::MosTraceEvent( | ||
47 | MOS_FreeMemory(pTraceBuf); | ||
48 | } | ||
49 | } | ||
50 | +#ifdef HAVE_EXECINFO | ||
51 | if (m_mosTraceFilter & (1ULL << TR_KEY_CALL_STACK)) | ||
52 | { | ||
53 | // reserve space for header and stack size field. | ||
54 | @@ -2511,6 +2514,7 @@ void MosUtilities::MosTraceEvent( | ||
55 | size_t ret = write(MosUtilitiesSpecificNext::m_mosTraceFd, traceBuf, nLen); | ||
56 | } | ||
57 | } | ||
58 | +#endif | ||
59 | } | ||
60 | return; | ||
61 | } | ||
62 | -- | ||
63 | 2.34.1 | ||
64 | |||
diff --git a/recipes-multimedia/libva/files/c8457540aed1ab9424661087276fb788c0e3aabb.patch b/recipes-multimedia/libva/files/c8457540aed1ab9424661087276fb788c0e3aabb.patch deleted file mode 100644 index 046778b2..00000000 --- a/recipes-multimedia/libva/files/c8457540aed1ab9424661087276fb788c0e3aabb.patch +++ /dev/null | |||
@@ -1,109 +0,0 @@ | |||
1 | From c8457540aed1ab9424661087276fb788c0e3aabb Mon Sep 17 00:00:00 2001 | ||
2 | From: "Wang, Pingli" <pingli.wang@intel.com> | ||
3 | Date: Wed, 23 Mar 2022 20:14:04 +0800 | ||
4 | Subject: [PATCH] Fixes #1354 | ||
5 | |||
6 | Fixes #1354. It is to fix the compiling issue for gcc12.0.1. | ||
7 | [-Werror=address] [-Werror=dangling-pointer=][-Werror=alloc-size-larger-than=] | ||
8 | |||
9 | Signed-off-by: Wang, Pingli <pingli.wang@intel.com> | ||
10 | |||
11 | Upstream-Status: Backport | ||
12 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
13 | --- | ||
14 | .../agnostic/common/os/mos_utilities.h | 4 +-- | ||
15 | .../codec/hal/codechal_encoder_base.cpp | 2 +- | ||
16 | .../common/codec/ddi/media_ddi_decode_vp8.cpp | 25 ++++++++----------- | ||
17 | .../agnostic/common/os/mos_utilities_next.h | 4 +-- | ||
18 | 4 files changed, 16 insertions(+), 19 deletions(-) | ||
19 | |||
20 | diff --git a/media_common/agnostic/common/os/mos_utilities.h b/media_common/agnostic/common/os/mos_utilities.h | ||
21 | index 7c395816f..d41a3a065 100644 | ||
22 | --- a/media_common/agnostic/common/os/mos_utilities.h | ||
23 | +++ b/media_common/agnostic/common/os/mos_utilities.h | ||
24 | @@ -181,10 +181,10 @@ _Ty* MOS_NewUtil(_Types&&... _Args) | ||
25 | template<class _Ty, class... _Types> | ||
26 | _Ty *MOS_NewArrayUtil(const char *functionName, | ||
27 | const char *filename, | ||
28 | - int32_t line, int32_t numElements) | ||
29 | + int32_t line, size_t numElements) | ||
30 | #else | ||
31 | template<class _Ty, class... _Types> | ||
32 | -_Ty* MOS_NewArrayUtil(int32_t numElements) | ||
33 | +_Ty* MOS_NewArrayUtil(size_t numElements) | ||
34 | #endif | ||
35 | { | ||
36 | #if MOS_MESSAGES_ENABLED | ||
37 | diff --git a/media_driver/agnostic/common/codec/hal/codechal_encoder_base.cpp b/media_driver/agnostic/common/codec/hal/codechal_encoder_base.cpp | ||
38 | index 4bf869c60..e9b3575fd 100644 | ||
39 | --- a/media_driver/agnostic/common/codec/hal/codechal_encoder_base.cpp | ||
40 | +++ b/media_driver/agnostic/common/codec/hal/codechal_encoder_base.cpp | ||
41 | @@ -3891,6 +3891,7 @@ MOS_STATUS CodechalEncoderState::ReadCounterValue(uint16_t index, EncodeStatusRe | ||
42 | CODECHAL_ENCODE_FUNCTION_ENTER; | ||
43 | CODECHAL_ENCODE_CHK_NULL_RETURN(encodeStatusReport); | ||
44 | uint64_t *address2Counter = nullptr; | ||
45 | + uint32_t ctr[4] = { 0 }; | ||
46 | |||
47 | if (m_hwInterface->GetCpInterface()->IsHwCounterIncrement(m_osInterface)) | ||
48 | { | ||
49 | @@ -3923,7 +3924,6 @@ MOS_STATUS CodechalEncoderState::ReadCounterValue(uint16_t index, EncodeStatusRe | ||
50 | else | ||
51 | { | ||
52 | //Report driver generated counter which was submitted to HW by command | ||
53 | - uint32_t ctr[4] = { 0 }; | ||
54 | eStatus = m_hwInterface->GetCpInterface()->GetCounterValue(ctr); | ||
55 | if (MOS_STATUS_SUCCESS == eStatus) | ||
56 | { | ||
57 | diff --git a/media_driver/linux/common/codec/ddi/media_ddi_decode_vp8.cpp b/media_driver/linux/common/codec/ddi/media_ddi_decode_vp8.cpp | ||
58 | index 72891d584..fac4c415d 100644 | ||
59 | --- a/media_driver/linux/common/codec/ddi/media_ddi_decode_vp8.cpp | ||
60 | +++ b/media_driver/linux/common/codec/ddi/media_ddi_decode_vp8.cpp | ||
61 | @@ -235,20 +235,17 @@ VAStatus DdiDecodeVP8::ParsePicParams( | ||
62 | codecPicParams->ucUvModeProbs[0] = picParam->uv_mode_probs[0]; | ||
63 | codecPicParams->ucUvModeProbs[1] = picParam->uv_mode_probs[1]; | ||
64 | codecPicParams->ucUvModeProbs[2] = picParam->uv_mode_probs[2]; | ||
65 | - if (codecPicParams->ucMvUpdateProb[0] && picParam->mv_probs[0]) | ||
66 | - { | ||
67 | - MOS_SecureMemcpy(codecPicParams->ucMvUpdateProb[0], | ||
68 | - sizeof(codecPicParams->ucMvUpdateProb[0]), | ||
69 | - picParam->mv_probs[0], | ||
70 | - sizeof(codecPicParams->ucMvUpdateProb[0])); | ||
71 | - } | ||
72 | - if (codecPicParams->ucMvUpdateProb[1] && picParam->mv_probs[1]) | ||
73 | - { | ||
74 | - MOS_SecureMemcpy(codecPicParams->ucMvUpdateProb[1], | ||
75 | - sizeof(codecPicParams->ucMvUpdateProb[1]), | ||
76 | - picParam->mv_probs[1], | ||
77 | - sizeof(codecPicParams->ucMvUpdateProb[1])); | ||
78 | - } | ||
79 | + | ||
80 | + MOS_SecureMemcpy(codecPicParams->ucMvUpdateProb[0], | ||
81 | + sizeof(codecPicParams->ucMvUpdateProb[0]), | ||
82 | + picParam->mv_probs[0], | ||
83 | + sizeof(codecPicParams->ucMvUpdateProb[0])); | ||
84 | + | ||
85 | + MOS_SecureMemcpy(codecPicParams->ucMvUpdateProb[1], | ||
86 | + sizeof(codecPicParams->ucMvUpdateProb[1]), | ||
87 | + picParam->mv_probs[1], | ||
88 | + sizeof(codecPicParams->ucMvUpdateProb[1])); | ||
89 | + | ||
90 | codecPicParams->ucP0EntropyCount = (8 - picParam->bool_coder_ctx.count) & 0x7; //hardware needs used bits not remaining bits in bool decoder | ||
91 | codecPicParams->ucP0EntropyValue = picParam->bool_coder_ctx.value; | ||
92 | codecPicParams->uiP0EntropyRange = picParam->bool_coder_ctx.range; | ||
93 | diff --git a/media_softlet/agnostic/common/os/mos_utilities_next.h b/media_softlet/agnostic/common/os/mos_utilities_next.h | ||
94 | index 509f2de3d..b6069bbc8 100644 | ||
95 | --- a/media_softlet/agnostic/common/os/mos_utilities_next.h | ||
96 | +++ b/media_softlet/agnostic/common/os/mos_utilities_next.h | ||
97 | @@ -90,10 +90,10 @@ class MosUtilities | ||
98 | template<class _Ty, class... _Types> | ||
99 | static _Ty *MosNewArrayUtil(const char *functionName, | ||
100 | const char *filename, | ||
101 | - int32_t line, int32_t numElements) | ||
102 | + int32_t line, size_t numElements) | ||
103 | #else | ||
104 | template<class _Ty, class... _Types> | ||
105 | - static _Ty* MosNewArrayUtil(int32_t numElements) | ||
106 | + static _Ty* MosNewArrayUtil(size_t numElements) | ||
107 | #endif | ||
108 | { | ||
109 | #if (_DEBUG || _RELEASE_INTERNAL) | ||
diff --git a/recipes-multimedia/libva/intel-media-driver_22.3.1.bb b/recipes-multimedia/libva/intel-media-driver_22.4.4.bb index 4e64c1b6..22fd4d06 100644 --- a/recipes-multimedia/libva/intel-media-driver_22.3.1.bb +++ b/recipes-multimedia/libva/intel-media-driver_22.4.4.bb | |||
@@ -19,10 +19,10 @@ REQUIRED_DISTRO_FEATURES = "opengl" | |||
19 | DEPENDS += "libva gmmlib" | 19 | DEPENDS += "libva gmmlib" |
20 | 20 | ||
21 | SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;nobranch=1 \ | 21 | SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;nobranch=1 \ |
22 | file://c8457540aed1ab9424661087276fb788c0e3aabb.patch \ | 22 | file://0001-Fix-uClibc-build.patch \ |
23 | " | 23 | " |
24 | 24 | ||
25 | SRCREV = "6547f46584633a7619440b39b34908e13c8c857d" | 25 | SRCREV = "9ca43202d5ff3d1bf22f1b7ff1fe3bd2980b90dc" |
26 | S = "${WORKDIR}/git" | 26 | S = "${WORKDIR}/git" |
27 | 27 | ||
28 | COMPATIBLE_HOST:x86-x32 = "null" | 28 | COMPATIBLE_HOST:x86-x32 = "null" |