diff options
author | Subv <subv2112@gmail.com> | 2018-02-12 03:34:20 +0100 |
---|---|---|
committer | Subv <subv2112@gmail.com> | 2018-02-12 04:42:48 +0100 |
commit | e01a8f218707b6f3ed0f111c432440b07ea5b6ff (patch) | |
tree | f5a95dc16a129a5c1a8a4d1309dfbbc3e4ccdb3f /src/core/hle | |
parent | nvdrv: Make the GPU memory manager available to nvhost-gpu. (diff) | |
download | yuzu-e01a8f218707b6f3ed0f111c432440b07ea5b6ff.tar yuzu-e01a8f218707b6f3ed0f111c432440b07ea5b6ff.tar.gz yuzu-e01a8f218707b6f3ed0f111c432440b07ea5b6ff.tar.bz2 yuzu-e01a8f218707b6f3ed0f111c432440b07ea5b6ff.tar.lz yuzu-e01a8f218707b6f3ed0f111c432440b07ea5b6ff.tar.xz yuzu-e01a8f218707b6f3ed0f111c432440b07ea5b6ff.tar.zst yuzu-e01a8f218707b6f3ed0f111c432440b07ea5b6ff.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h | 2 | ||||
-rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp | 4 | ||||
-rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_gpu.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h index 44ffddcd9..301a8a79f 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h @@ -21,7 +21,7 @@ class nvmap; class nvhost_as_gpu final : public nvdevice { public: nvhost_as_gpu(std::shared_ptr<nvmap> nvmap_dev, std::shared_ptr<MemoryManager> memory_manager) - : nvdevice(), nvmap_dev(std::move(nvmap_dev)), memory_manager(std::move(memory_manager)) {} + : nvmap_dev(std::move(nvmap_dev)), memory_manager(std::move(memory_manager)) {} ~nvhost_as_gpu() override = default; u32 ioctl(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output) override; diff --git a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp index 229048d37..1c3079889 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp @@ -6,6 +6,7 @@ #include "common/assert.h" #include "common/logging/log.h" #include "core/hle/service/nvdrv/devices/nvhost_gpu.h" +#include "video_core/command_processor.h" namespace Service { namespace Nvidia { @@ -130,7 +131,8 @@ u32 nvhost_gpu::SubmitGPFIFO(const std::vector<u8>& input, std::vector<u8>& outp std::memcpy(&entries[0], &input.data()[sizeof(IoctlSubmitGpfifo)], params.num_entries * sizeof(IoctlGpfifoEntry)); for (auto entry : entries) { - VAddr va_addr = entry.Address(); + VAddr va_addr = memory_manager->PhysicalToVirtualAddress(entry.Address()); + Tegra::CommandProcessor::ProcessCommandList(va_addr, entry.sz); // TODO(ogniK): Process these } params.fence_out.id = 0; diff --git a/src/core/hle/service/nvdrv/devices/nvhost_gpu.h b/src/core/hle/service/nvdrv/devices/nvhost_gpu.h index 5b40eaa88..6f9b90b05 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_gpu.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_gpu.h @@ -22,7 +22,7 @@ constexpr u32 NVGPU_IOCTL_CHANNEL_SUBMIT_GPFIFO(0x8); class nvhost_gpu final : public nvdevice { public: nvhost_gpu(std::shared_ptr<nvmap> nvmap_dev, std::shared_ptr<MemoryManager> memory_manager) - : nvdevice(), nvmap_dev(std::move(nvmap_dev)), memory_manager(std::move(memory_manager)) {} + : nvmap_dev(std::move(nvmap_dev)), memory_manager(std::move(memory_manager)) {} ~nvhost_gpu() override = default; u32 ioctl(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output) override; |