diff options
author | ameerj <52414509+ameerj@users.noreply.github.com> | 2021-08-07 02:06:30 +0200 |
---|---|---|
committer | ameerj <52414509+ameerj@users.noreply.github.com> | 2021-08-07 02:06:30 +0200 |
commit | cc8ac112fca0c141eace0e3703fca08ebe0962e0 (patch) | |
tree | 0d7e0fcb47f6dac604197663332236e382607d61 | |
parent | Merge pull request #6788 from Morph1984/hle_api_12.1.0 (diff) | |
download | yuzu-cc8ac112fca0c141eace0e3703fca08ebe0962e0.tar yuzu-cc8ac112fca0c141eace0e3703fca08ebe0962e0.tar.gz yuzu-cc8ac112fca0c141eace0e3703fca08ebe0962e0.tar.bz2 yuzu-cc8ac112fca0c141eace0e3703fca08ebe0962e0.tar.lz yuzu-cc8ac112fca0c141eace0e3703fca08ebe0962e0.tar.xz yuzu-cc8ac112fca0c141eace0e3703fca08ebe0962e0.tar.zst yuzu-cc8ac112fca0c141eace0e3703fca08ebe0962e0.zip |
-rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp | 27 |
1 files changed, 4 insertions, 23 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 1403a39d0..207a5b90d 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp @@ -178,30 +178,11 @@ NvResult nvhost_nvdec_common::MapBuffer(const std::vector<u8>& input, std::vecto } NvResult nvhost_nvdec_common::UnmapBuffer(const std::vector<u8>& input, std::vector<u8>& output) { - IoctlMapBuffer params{}; - std::memcpy(¶ms, input.data(), sizeof(IoctlMapBuffer)); - std::vector<MapBufferEntry> cmd_buffer_handles(params.num_entries); - SliceVectors(input, cmd_buffer_handles, params.num_entries, sizeof(IoctlMapBuffer)); - - auto& gpu = system.GPU(); - - for (auto& cmd_buffer : cmd_buffer_handles) { - const auto object{nvmap_dev->GetObject(cmd_buffer.map_handle)}; - if (!object) { - LOG_ERROR(Service_NVDRV, "invalid cmd_buffer nvmap_handle={:X}", cmd_buffer.map_handle); - std::memcpy(output.data(), ¶ms, output.size()); - return NvResult::InvalidState; - } - if (const auto size{RemoveBufferMap(object->dma_map_addr)}; size) { - gpu.MemoryManager().Unmap(object->dma_map_addr, *size); - } else { - // This occurs quite frequently, however does not seem to impact functionality - LOG_DEBUG(Service_NVDRV, "invalid offset=0x{:X} dma=0x{:X}", object->addr, - object->dma_map_addr); - } - object->dma_map_addr = 0; - } + // This is intntionally stubbed. + // Skip unmapping buffers here, as to not break the continuity of the VP9 reference frame + // addresses, and risk invalidating data before the async GPU thread is done with it std::memset(output.data(), 0, output.size()); + LOG_DEBUG(Service_NVDRV, "(STUBBED) called"); return NvResult::Success; } |