From 7a9d1ad2f873003e6aad637e8749b77b91247da3 Mon Sep 17 00:00:00 2001
From: Fernando Sahmkow
Date: Sun, 24 Dec 2023 18:20:02 +0100
Subject: NVDRV: Implement sessions and initial implementation of SMMU

---
 src/video_core/host1x/host1x.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/video_core/host1x/host1x.cpp')

diff --git a/src/video_core/host1x/host1x.cpp b/src/video_core/host1x/host1x.cpp
index 7c317a85d..d05bcaf26 100644
--- a/src/video_core/host1x/host1x.cpp
+++ b/src/video_core/host1x/host1x.cpp
@@ -9,8 +9,7 @@ namespace Tegra {
 namespace Host1x {
 
 Host1x::Host1x(Core::System& system_)
-    : system{system_}, syncpoint_manager{}, memory_manager{system, 32, 12},
-      allocator{std::make_unique<Common::FlatAllocator<u32, 0, 32>>(1 << 12)} {}
+    : system{system_}, syncpoint_manager{}, memory_manager(system.DeviceMemory()) {}
 
 } // namespace Host1x
 
-- 
cgit v1.2.3


From 96fd1348aea9d70cb502a94cbd0412be6edb0189 Mon Sep 17 00:00:00 2001
From: Fernando Sahmkow
Date: Fri, 29 Dec 2023 09:50:04 +0100
Subject: GPU SMMU: Expand to 34 bits

---
 src/video_core/host1x/host1x.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/video_core/host1x/host1x.cpp')

diff --git a/src/video_core/host1x/host1x.cpp b/src/video_core/host1x/host1x.cpp
index d05bcaf26..b7f9a08cf 100644
--- a/src/video_core/host1x/host1x.cpp
+++ b/src/video_core/host1x/host1x.cpp
@@ -9,7 +9,9 @@ namespace Tegra {
 namespace Host1x {
 
 Host1x::Host1x(Core::System& system_)
-    : system{system_}, syncpoint_manager{}, memory_manager(system.DeviceMemory()) {}
+    : system{system_}, syncpoint_manager{},
+      memory_manager(system.DeviceMemory()), gmmu_manager{system, memory_manager, 32, 12},
+      allocator{std::make_unique<Common::FlatAllocator<u32, 0, 32>>(1 << 12)} {}
 
 } // namespace Host1x
 
-- 
cgit v1.2.3


From 303cd311621b25fbb8d55e0ed2cc4c3248de44ad Mon Sep 17 00:00:00 2001
From: Fernando Sahmkow
Date: Sat, 30 Dec 2023 04:37:25 +0100
Subject: SMMU: Add Android compatibility

---
 src/video_core/host1x/host1x.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/video_core/host1x/host1x.cpp')

diff --git a/src/video_core/host1x/host1x.cpp b/src/video_core/host1x/host1x.cpp
index b7f9a08cf..c4c7a5883 100644
--- a/src/video_core/host1x/host1x.cpp
+++ b/src/video_core/host1x/host1x.cpp
@@ -13,6 +13,8 @@ Host1x::Host1x(Core::System& system_)
       memory_manager(system.DeviceMemory()), gmmu_manager{system, memory_manager, 32, 12},
       allocator{std::make_unique<Common::FlatAllocator<u32, 0, 32>>(1 << 12)} {}
 
+Host1x::~Host1x() = default;
+
 } // namespace Host1x
 
 } // namespace Tegra
-- 
cgit v1.2.3