From eef55f493b636bfc57389e9c541ddf2c39f6f826 Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Fri, 7 Jun 2019 22:13:40 -0400 Subject: [PATCH] Gpu: Mark areas as protected. --- src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp | 6 ++++++ src/video_core/gpu.cpp | 2 ++ src/video_core/gpu.h | 11 +++++++++++ 3 files changed, 19 insertions(+) diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp index 8f47d63e33..8e28c2fa42 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp @@ -60,10 +60,12 @@ u32 nvhost_ctrl::IocCtrlEventWait(const std::vector& input, std::vector& } auto& gpu = Core::System::GetInstance().GPU(); + gpu.Guard(true); u32 current_syncpoint_value = gpu.GetSyncpointValue(params.syncpt_id); if (current_syncpoint_value >= params.threshold) { params.value = current_syncpoint_value; std::memcpy(output.data(), ¶ms, sizeof(params)); + gpu.Guard(false); return NvResult::Success; } @@ -73,6 +75,7 @@ u32 nvhost_ctrl::IocCtrlEventWait(const std::vector& input, std::vector& if (params.timeout == 0) { std::memcpy(output.data(), ¶ms, sizeof(params)); + gpu.Guard(false); return NvResult::Timeout; } @@ -81,6 +84,7 @@ u32 nvhost_ctrl::IocCtrlEventWait(const std::vector& input, std::vector& event_id = params.value & 0x00FF; if (event_id >= 64) { std::memcpy(output.data(), ¶ms, sizeof(params)); + gpu.Guard(false); return NvResult::BadParameter; } } else { @@ -100,9 +104,11 @@ u32 nvhost_ctrl::IocCtrlEventWait(const std::vector& input, std::vector& params.value |= event_id; gpu.RegisterEvent(event_id, params.syncpt_id, params.threshold); std::memcpy(output.data(), ¶ms, sizeof(params)); + gpu.Guard(false); return NvResult::Timeout; } std::memcpy(output.data(), ¶ms, sizeof(params)); + gpu.Guard(false); return NvResult::BadParameter; } diff --git a/src/video_core/gpu.cpp b/src/video_core/gpu.cpp index 1fa6770ca8..ee976f81f9 100644 --- a/src/video_core/gpu.cpp +++ b/src/video_core/gpu.cpp @@ -69,6 +69,7 @@ const DmaPusher& GPU::DmaPusher() const { void GPU::IncrementSyncPoint(const u32 syncpoint_id) { syncpoints[syncpoint_id]++; + sync_guard.lock(); if (!events[syncpoint_id].empty()) { u32 value = syncpoints[syncpoint_id].load(); auto it = events[syncpoint_id].begin(); @@ -81,6 +82,7 @@ void GPU::IncrementSyncPoint(const u32 syncpoint_id) { it++; } } + sync_guard.unlock(); } u32 GPU::GetSyncpointValue(const u32 syncpoint_id) const { diff --git a/src/video_core/gpu.h b/src/video_core/gpu.h index 4805a5fbcb..bc63920f2e 100644 --- a/src/video_core/gpu.h +++ b/src/video_core/gpu.h @@ -12,6 +12,7 @@ #include "core/hle/service/nvdrv/nvdata.h" #include "core/hle/service/nvflinger/buffer_queue.h" #include "video_core/dma_pusher.h" +#include "common/spin_lock.h" using CacheAddr = std::uintptr_t; inline CacheAddr ToCacheAddr(const void* host_ptr) { @@ -175,6 +176,14 @@ public: void CancelEvent(const u32 event_id, const u32 syncpoint_id, const u32 value); + void Guard(bool guard_set) { + if (guard_set) { + sync_guard.lock(); + } else { + sync_guard.unlock(); + } + } + /// Returns a const reference to the GPU DMA pusher. const Tegra::DmaPusher& DmaPusher() const; @@ -287,6 +296,8 @@ private: }; std::array, Service::Nvidia::MaxSyncPoints> events; + + Common::SpinLock sync_guard{}; }; #define ASSERT_REG_POSITION(field_name, position) \