From 4abe8c825324622d5f04d9c282a2a64b6a6668d4 Mon Sep 17 00:00:00 2001 From: ocldev Date: Mon, 13 May 2024 14:24:33 +0200 Subject: [PATCH] build: dependencies update Signed-off-by: ocldev --- Jenkinsfile | 2 +- manifests/manifest.yml | 8 ++++---- third_party/aub_stream/aubstream/aub_manager.h | 2 ++ third_party/aub_stream/aubstream/aubstream.h | 5 +++++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 79ceb68342..f4f54e89ec 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,5 +7,5 @@ * */ -dependenciesRevision='52a53e6a45698894fc239a8dbf3b9401c16189f0-2413' +dependenciesRevision='ddd15727ca5bd2d8045aba89ca10132faf18150f-2433' kernelVersion='dev-5478' diff --git a/manifests/manifest.yml b/manifests/manifest.yml index 033db24aca..2cf4c46f13 100644 --- a/manifests/manifest.yml +++ b/manifests/manifest.yml @@ -3,7 +3,7 @@ components: branch: master dest_dir: aub_stream repository: https://github.com/intel/aubstream - revision: 22732c4cd078470cc019bf5289ee0dab186383c9 + revision: f6e055bab58f0790ce4900940307cbf9c1b5e761 type: git gmmlib: asset_name: gmmlib @@ -42,7 +42,7 @@ components: dest_dir: kernels_bin type: git branch: kernels_bin - revision: 2413-1684 + revision: 2433-1685 kmdaf: branch: kmdaf dest_dir: kmdaf @@ -85,11 +85,11 @@ components: dest_dir: wdk type: git branch: wdk - revision: af47eb52bcc938c167ae79b8edc74b621a673761-2369 + revision: ddd15727ca5bd2d8045aba89ca10132faf18150f-2433 wsl: branch: wsl dest_dir: wsl revision: 56430997dac34ca0e9e18c177636234cac26ad54 type: git -converter: M-2413 +converter: M-2433 version: '1' diff --git a/third_party/aub_stream/aubstream/aub_manager.h b/third_party/aub_stream/aubstream/aub_manager.h index 66d2bf882f..d97aaeab95 100644 --- a/third_party/aub_stream/aubstream/aub_manager.h +++ b/third_party/aub_stream/aubstream/aub_manager.h @@ -67,6 +67,8 @@ class AubManager { virtual uint32_t readMMIO(uint32_t offset) { return 0; } virtual void writePCICFG(uint32_t offset, uint32_t value) {} virtual uint32_t readPCICFG(uint32_t offset) { return 0; } + + virtual void blockMemWritesViaTbx(bool onoff) {} }; } // namespace aub_stream diff --git a/third_party/aub_stream/aubstream/aubstream.h b/third_party/aub_stream/aubstream/aubstream.h index 1e5358749d..fc771c4fe9 100644 --- a/third_party/aub_stream/aubstream/aubstream.h +++ b/third_party/aub_stream/aubstream/aubstream.h @@ -63,6 +63,8 @@ constexpr uint32_t tbxShm = 3; constexpr uint32_t tbxShm3 = 4; constexpr uint32_t tbxShm4 = 5; constexpr uint32_t null = 6; +constexpr uint32_t aubFileAndShm = 7; +constexpr uint32_t aubFileAndShm4 = 8; } // namespace mode namespace clearColorType { @@ -79,6 +81,9 @@ extern "C" void setTbxServerIp(std::string server); extern "C" void setTbxFrontdoorMode(bool frontdoor); extern "C" void setAubStreamCaller(uint32_t caller); +extern "C" void injectMMIOListLegacy(MMIOList mmioList); +extern "C" void setTbxServerIpLegacy(std::string server); + namespace caller { constexpr uint32_t neo = 0; constexpr uint32_t rlr = 1;