From f77e45d588945d62b4e356d617de9536e6a6ed4d Mon Sep 17 00:00:00 2001 From: Lim Siew Hoon Date: Tue, 7 May 2024 13:13:07 +0800 Subject: intel-media-driver: upgrade 23.4.3 -> 24.1.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Drops list of patches already merged: - 0004-Add-device-ID-for-ARL.patch - 0005-Add-XR24-support-to-DMABuf.patch - 0006-add-INTEL-MEDIA-ALLOC-refineE-to-specify-the-memory-.patch - 0007-Skip-report-keys.patch - 0008-Limit-INTEL-MEDIA-ALLOC-MODE-to-MTL-and-ARL-only.patch - 0009-Skip-cache-bucket-realloc-for-default-mode-0.patch - 0010-Fix-failed-4k-video-wall-test-case-and-color-corrupt.patch - 0011-Disable-422H-format-output.patch - 0012-Decode-Fix-AVC-decode-SFC-4K-hang-issue.patch Backport a patch to fix build errors: | error: comparing the result of pointer addition ‘(avcDirectmodeParams._MHW_VDBOX_AVC_DIRECTMODE_PARAMS::presAvcDmvBuffers + ((((sizetype)n) + 1) * 328))’ and NULL [-Werror=address] | 592 | if (&avcDirectmodeParams.presAvcDmvBuffers[n+1] != nullptr) | | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~ Signed-off-by: Lim Siew Hoon Signed-off-by: Anuj Mittal --- .../libva/files/0007-Skip-report-keys.patch | 78 ---------------------- 1 file changed, 78 deletions(-) delete mode 100644 recipes-multimedia/libva/files/0007-Skip-report-keys.patch (limited to 'recipes-multimedia/libva/files/0007-Skip-report-keys.patch') diff --git a/recipes-multimedia/libva/files/0007-Skip-report-keys.patch b/recipes-multimedia/libva/files/0007-Skip-report-keys.patch deleted file mode 100644 index 459ff490..00000000 --- a/recipes-multimedia/libva/files/0007-Skip-report-keys.patch +++ /dev/null @@ -1,78 +0,0 @@ -From b1aebef4d342c77fc2b9c5efbf20aeb2aa9d634e Mon Sep 17 00:00:00 2001 -From: Wang_Pingli -Date: Thu, 28 Dec 2023 16:44:40 +0800 -Subject: [PATCH 07/12] Skip report keys - -Skip to report keys - -Upstream-Status: Backport [https://github.com/intel/media-driver/commit/68ce25b0a6fa90614eb4734c8680aa4e149e8323] -Signed-off-by: Lim, Siew Hoon ---- - .../os/osservice/mos_utilities_specific.cpp | 30 +++++++++++++++++-- - 1 file changed, 28 insertions(+), 2 deletions(-) - -diff --git a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp -index b5df29f06..96785e21e 100644 ---- a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp -+++ b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp -@@ -67,6 +67,8 @@ int32_t g_mosMemoryFailSimulateAllocCounter = 0; - int32_t *MosUtilities::m_mosAllocMemoryFailSimulateAllocCounter = &g_mosMemoryFailSimulateAllocCounter; - #endif - -+static bool s_skipToReportReg = false; -+ - double MosUtilities::MosGetTime() - { - struct timespec ts = {}; -@@ -1551,6 +1553,10 @@ MOS_STATUS MosUtilities::MosInitializeReg(RegBufferMap ®BufferMap) - { - std::string id = ""; - -+ static const char *disableReportRegKeyList[] = { -+ "INTEL MEDIA ALLOC MODE" -+ }; -+ static const uint32_t disableReportRegKeyListCount = sizeof(disableReportRegKeyList) / sizeof(disableReportRegKeyList[0]); - while(!regStream.eof()) - { - std::string line = ""; -@@ -1585,8 +1591,22 @@ MOS_STATUS MosUtilities::MosInitializeReg(RegBufferMap ®BufferMap) - { - std::string name = line.substr(0,pos); - std::string value = line.substr(pos+1); -- auto &keys = regBufferMap[id]; -- keys[name] = value; -+ if (name.size() > 0 && value.size() > 0) -+ { -+ auto &keys = regBufferMap[id]; -+ keys[name] = value; -+ if (s_skipToReportReg == false && id == USER_SETTING_CONFIG_PATH) -+ { -+ for (uint32_t i = 0; i < disableReportRegKeyListCount; i++) -+ { -+ if (strcmp(name.c_str(), disableReportRegKeyList[i]) == 0) -+ { -+ s_skipToReportReg = true; -+ break; -+ } -+ } -+ } -+ } - } - } - } -@@ -1606,6 +1626,12 @@ MOS_STATUS MosUtilities::MosInitializeReg(RegBufferMap ®BufferMap) - MOS_STATUS MosUtilities::MosUninitializeReg(RegBufferMap ®BufferMap) - { - MOS_STATUS status = MOS_STATUS_SUCCESS; -+ -+ if (s_skipToReportReg) -+ { -+ return MOS_STATUS_SUCCESS; -+ } -+ - if (regBufferMap.size() == 0) - { - return MOS_STATUS_SUCCESS; --- -2.40.1 - -- cgit v1.2.3-54-g00ecf