hwpplayer1/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

video_core: dma_pusher: Remove integrity check on command lists.

Browse source 
- This seems to cause softlocks in Breath of the Wild.
This commit is contained in:
bunnei 2020-11-07 00:08:19 -08:00
parent af477fb8c5
commit dc5396a466
3 changed files with 1 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp
View file

@ -214,7 +214,6 @@ u32 nvhost_gpu::SubmitGPFIFOImpl(IoctlSubmitGpfifo& params, std::vector<u8>& out
params.fence_out.value = syncpoint_manager.GetSyncpointMax(params.fence_out.id); params.fence_out.value = syncpoint_manager.GetSyncpointMax(params.fence_out.id);
} }
entries.RefreshIntegrityChecks(gpu);
gpu.PushGPUEntries(std::move(entries)); gpu.PushGPUEntries(std::move(entries));
if (params.flags.add_increment.Value()) { if (params.flags.add_increment.Value()) {

26
src/video_core/dma_pusher.cpp
View file

@ -13,20 +13,6 @@
namespace Tegra { namespace Tegra {
void CommandList::RefreshIntegrityChecks(GPU& gpu) {
command_list_hashes.resize(command_lists.size());
for (std::size_t index = 0; index < command_lists.size(); ++index) {
const CommandListHeader command_list_header = command_lists[index];
std::vector<CommandHeader> command_headers(command_list_header.size);
gpu.MemoryManager().ReadBlockUnsafe(command_list_header.addr, command_headers.data(),
command_list_header.size * sizeof(u32));
command_list_hashes[index] =
Common::CityHash64(reinterpret_cast<char*>(command_headers.data()),
command_list_header.size * sizeof(u32));
}
}
DmaPusher::DmaPusher(Core::System& system, GPU& gpu) : gpu{gpu}, system{system} {} DmaPusher::DmaPusher(Core::System& system, GPU& gpu) : gpu{gpu}, system{system} {}
DmaPusher::~DmaPusher() = default; DmaPusher::~DmaPusher() = default;
@ -77,8 +63,7 @@ bool DmaPusher::Step() {
dma_pushbuffer.pop(); dma_pushbuffer.pop();
} else { } else {
const CommandListHeader command_list_header{ const CommandListHeader command_list_header{
command_list.command_lists[dma_pushbuffer_subindex]}; command_list.command_lists[dma_pushbuffer_subindex++]};
const u64 next_hash = command_list.command_list_hashes[dma_pushbuffer_subindex++];
const GPUVAddr dma_get = command_list_header.addr; const GPUVAddr dma_get = command_list_header.addr;
if (dma_pushbuffer_subindex >= command_list.command_lists.size()) { if (dma_pushbuffer_subindex >= command_list.command_lists.size()) {
@ -95,15 +80,6 @@ bool DmaPusher::Step() {
command_headers.resize(command_list_header.size); command_headers.resize(command_list_header.size);
gpu.MemoryManager().ReadBlockUnsafe(dma_get, command_headers.data(), gpu.MemoryManager().ReadBlockUnsafe(dma_get, command_headers.data(),
command_list_header.size * sizeof(u32)); command_list_header.size * sizeof(u32));
// Integrity check
const u64 new_hash = Common::CityHash64(reinterpret_cast<char*>(command_headers.data()),
command_list_header.size * sizeof(u32));
if (new_hash != next_hash) {
LOG_CRITICAL(HW_GPU, "CommandList at addr=0x{:X} is corrupt, skipping!", dma_get);
dma_pushbuffer.pop();
return true;
}
} }
for (std::size_t index = 0; index < command_headers.size();) { for (std::size_t index = 0; index < command_headers.size();) {
const CommandHeader& command_header = command_headers[index]; const CommandHeader& command_header = command_headers[index];

3
src/video_core/dma_pusher.h
View file

@ -90,10 +90,7 @@ struct CommandList final {
explicit CommandList(std::vector<Tegra::CommandHeader>&& prefetch_command_list) explicit CommandList(std::vector<Tegra::CommandHeader>&& prefetch_command_list)
: prefetch_command_list{std::move(prefetch_command_list)} {} : prefetch_command_list{std::move(prefetch_command_list)} {}
void RefreshIntegrityChecks(GPU& gpu);
std::vector<Tegra::CommandListHeader> command_lists; std::vector<Tegra::CommandListHeader> command_lists;
std::vector<u64> command_list_hashes;
std::vector<Tegra::CommandHeader> prefetch_command_list; std::vector<Tegra::CommandHeader> prefetch_command_list;
}; };