summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/nvdrv/nvdrv.cpp
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2018-02-12 03:30:23 +0100
committerSubv <subv2112@gmail.com>2018-02-12 03:30:23 +0100
commitba2426aa3f9b433b54e43e5dae3c596e6f3ae45d (patch)
treed8a35877596beef256e3991653d28c454f8ad0a8 /src/core/hle/service/nvdrv/nvdrv.cpp
parentMerge pull request #175 from bunnei/libnx-fixes-2 (diff)
downloadyuzu-ba2426aa3f9b433b54e43e5dae3c596e6f3ae45d.tar
yuzu-ba2426aa3f9b433b54e43e5dae3c596e6f3ae45d.tar.gz
yuzu-ba2426aa3f9b433b54e43e5dae3c596e6f3ae45d.tar.bz2
yuzu-ba2426aa3f9b433b54e43e5dae3c596e6f3ae45d.tar.lz
yuzu-ba2426aa3f9b433b54e43e5dae3c596e6f3ae45d.tar.xz
yuzu-ba2426aa3f9b433b54e43e5dae3c596e6f3ae45d.tar.zst
yuzu-ba2426aa3f9b433b54e43e5dae3c596e6f3ae45d.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/service/nvdrv/nvdrv.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/core/hle/service/nvdrv/nvdrv.cpp
index a98634422..469d6d33a 100644
--- a/src/core/hle/service/nvdrv/nvdrv.cpp
+++ b/src/core/hle/service/nvdrv/nvdrv.cpp
@@ -11,6 +11,7 @@
#include "core/hle/service/nvdrv/devices/nvhost_gpu.h"
#include "core/hle/service/nvdrv/devices/nvmap.h"
#include "core/hle/service/nvdrv/interface.h"
+#include "core/hle/service/nvdrv/memory_manager.h"
#include "core/hle/service/nvdrv/nvdrv.h"
#include "core/hle/service/nvdrv/nvmemp.h"
@@ -31,12 +32,14 @@ void InstallInterfaces(SM::ServiceManager& service_manager) {
Module::Module() {
auto nvmap_dev = std::make_shared<Devices::nvmap>();
- devices["/dev/nvhost-as-gpu"] = std::make_shared<Devices::nvhost_as_gpu>(nvmap_dev);
+ auto memory_manager = std::make_shared<MemoryManager>();
+ devices["/dev/nvhost-as-gpu"] =
+ std::make_shared<Devices::nvhost_as_gpu>(nvmap_dev, memory_manager);
+ devices["/dev/nvhost-gpu"] = std::make_shared<Devices::nvhost_gpu>(nvmap_dev, memory_manager);
devices["/dev/nvhost-ctrl-gpu"] = std::make_shared<Devices::nvhost_ctrl_gpu>();
devices["/dev/nvmap"] = nvmap_dev;
devices["/dev/nvdisp_disp0"] = std::make_shared<Devices::nvdisp_disp0>(nvmap_dev);
devices["/dev/nvhost-ctrl"] = std::make_shared<Devices::nvhost_ctrl>();
- devices["/dev/nvhost-gpu"] = std::make_shared<Devices::nvhost_gpu>();
}
u32 Module::Open(std::string device_name) {