summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2019-06-08 04:13:40 +0200
committerFernandoS27 <fsahmkow27@gmail.com>2019-07-05 21:49:16 +0200
commiteef55f493b636bfc57389e9c541ddf2c39f6f826 (patch)
treedb7e0db06edb8dc80b67b111b4fdb06d464a1eb5
parentnv_services: Stub CtrlEventSignal (diff)
downloadyuzu-eef55f493b636bfc57389e9c541ddf2c39f6f826.tar
yuzu-eef55f493b636bfc57389e9c541ddf2c39f6f826.tar.gz
yuzu-eef55f493b636bfc57389e9c541ddf2c39f6f826.tar.bz2
yuzu-eef55f493b636bfc57389e9c541ddf2c39f6f826.tar.lz
yuzu-eef55f493b636bfc57389e9c541ddf2c39f6f826.tar.xz
yuzu-eef55f493b636bfc57389e9c541ddf2c39f6f826.tar.zst
yuzu-eef55f493b636bfc57389e9c541ddf2c39f6f826.zip
-rw-r--r--src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp6
-rw-r--r--src/video_core/gpu.cpp2
-rw-r--r--src/video_core/gpu.h11
3 files changed, 19 insertions, 0 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp
index 8f47d63e3..8e28c2fa4 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<u8>& input, std::vector<u8>&
}
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(), &params, sizeof(params));
+ gpu.Guard(false);
return NvResult::Success;
}
@@ -73,6 +75,7 @@ u32 nvhost_ctrl::IocCtrlEventWait(const std::vector<u8>& input, std::vector<u8>&
if (params.timeout == 0) {
std::memcpy(output.data(), &params, sizeof(params));
+ gpu.Guard(false);
return NvResult::Timeout;
}
@@ -81,6 +84,7 @@ u32 nvhost_ctrl::IocCtrlEventWait(const std::vector<u8>& input, std::vector<u8>&
event_id = params.value & 0x00FF;
if (event_id >= 64) {
std::memcpy(output.data(), &params, sizeof(params));
+ gpu.Guard(false);
return NvResult::BadParameter;
}
} else {
@@ -100,9 +104,11 @@ u32 nvhost_ctrl::IocCtrlEventWait(const std::vector<u8>& input, std::vector<u8>&
params.value |= event_id;
gpu.RegisterEvent(event_id, params.syncpt_id, params.threshold);
std::memcpy(output.data(), &params, sizeof(params));
+ gpu.Guard(false);
return NvResult::Timeout;
}
std::memcpy(output.data(), &params, sizeof(params));
+ gpu.Guard(false);
return NvResult::BadParameter;
}
diff --git a/src/video_core/gpu.cpp b/src/video_core/gpu.cpp
index 1fa6770ca..ee976f81f 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 4805a5fbc..bc63920f2 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<std::list<Event>, Service::Nvidia::MaxSyncPoints> events;
+
+ Common::SpinLock sync_guard{};
};
#define ASSERT_REG_POSITION(field_name, position) \