From 8943f2158d0e8a9f708612f1b0ea7051a6b0ddff Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Wed, 14 Jul 2021 23:56:24 -0400
Subject: [PATCH] nvhost_nvdec_common: Read Submit ioctl data from object addr

Fixes Mario Golf intro video decoding.
---
 .../hle/service/nvdrv/devices/nvhost_nvdec_common.cpp  | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp b/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp
index f045008eb3..1403a39d0f 100644
--- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp
+++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp
@@ -93,15 +93,9 @@ NvResult nvhost_nvdec_common::Submit(const std::vector<u8>& input, std::vector<u
     for (const auto& cmd_buffer : command_buffers) {
         const auto object = nvmap_dev->GetObject(cmd_buffer.memory_id);
         ASSERT_OR_EXECUTE(object, return NvResult::InvalidState;);
-        const auto map = FindBufferMap(object->dma_map_addr);
-        if (!map) {
-            LOG_ERROR(Service_NVDRV, "Tried to submit an invalid offset 0x{:X} dma 0x{:X}",
-                      object->addr, object->dma_map_addr);
-            return NvResult::Success;
-        }
         Tegra::ChCommandHeaderList cmdlist(cmd_buffer.word_count);
-        gpu.MemoryManager().ReadBlock(map->StartAddr() + cmd_buffer.offset, cmdlist.data(),
-                                      cmdlist.size() * sizeof(u32));
+        system.Memory().ReadBlock(object->addr + cmd_buffer.offset, cmdlist.data(),
+                                  cmdlist.size() * sizeof(u32));
         gpu.PushCommandBuffer(cmdlist);
     }
     if (gpu.UseNvdec()) {