Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GPU: Correct Interrupts to interrupt on syncpt/value instead of event, mirroring hardware

Browse source
This commit is contained in:
Fernando Sahmkow 2019-06-12 07:52:49 -04:00 • committed by FernandoS27
parent 61697864c3
commit 7d1b974bca
12 changed files with 45 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/video_core/gpu.cpp
View file

@ -70,13 +70,13 @@ const DmaPusher& GPU::DmaPusher() const {
void GPU::IncrementSyncPoint(const u32 syncpoint_id) {
syncpoints[syncpoint_id]++;
sync_mutex.lock();
if (!events[syncpoint_id].empty()) {
if (!syncpt_interrupts[syncpoint_id].empty()) {
u32 value = syncpoints[syncpoint_id].load();
auto it = events[syncpoint_id].begin();
while (it != events[syncpoint_id].end()) {
if (value >= it->value) {
TriggerCpuInterrupt(it->event_id);
it = events[syncpoint_id].erase(it);
auto it = syncpt_interrupts[syncpoint_id].begin();
while (it != syncpt_interrupts[syncpoint_id].end()) {
if (value >= *it) {
TriggerCpuInterrupt(syncpoint_id, *it);
it = syncpt_interrupts[syncpoint_id].erase(it);
continue;
}
it++;
@ -89,19 +89,19 @@ u32 GPU::GetSyncpointValue(const u32 syncpoint_id) const {
return syncpoints[syncpoint_id].load();
}
void GPU::RegisterEvent(const u32 event_id, const u32 syncpoint_id, const u32 value) {
for (auto& ev : events[syncpoint_id]) {
if (ev.event_id == event_id && ev.value == value)
void GPU::RegisterSyncptInterrupt(const u32 syncpoint_id, const u32 value) {
for (u32 in_value : syncpt_interrupts[syncpoint_id]) {
if (in_value == value)
return;
}
events[syncpoint_id].emplace_back(event_id, value);
syncpt_interrupts[syncpoint_id].emplace_back(value);
}
void GPU::CancelEvent(const u32 event_id, const u32 syncpoint_id, const u32 value) {
auto it = events[syncpoint_id].begin();
while (it != events[syncpoint_id].end()) {
if (value == it->value) {
it = events[syncpoint_id].erase(it);
void GPU::CancelSyncptInterrupt(const u32 syncpoint_id, const u32 value) {
auto it = syncpt_interrupts[syncpoint_id].begin();
while (it != syncpt_interrupts[syncpoint_id].end()) {
if (value == *it) {
it = syncpt_interrupts[syncpoint_id].erase(it);
return;
}
it++;

14
src/video_core/gpu.h
View file

@ -172,9 +172,9 @@ public:
u32 GetSyncpointValue(const u32 syncpoint_id) const;
void RegisterEvent(const u32 event_id, const u32 syncpoint_id, const u32 value);
void RegisterSyncptInterrupt(const u32 syncpoint_id, const u32 value);
void CancelEvent(const u32 event_id, const u32 syncpoint_id, const u32 value);
void CancelSyncptInterrupt(const u32 syncpoint_id, const u32 value);
void Guard(bool guard_set) {
if (guard_set) {
@ -253,7 +253,7 @@ public:
virtual void FlushAndInvalidateRegion(CacheAddr addr, u64 size) = 0;
protected:
virtual void TriggerCpuInterrupt(const u32 event_id) const = 0;
virtual void TriggerCpuInterrupt(const u32 syncpoint_id, const u32 value) const = 0;
private:
void ProcessBindMethod(const MethodCall& method_call);
@ -293,13 +293,7 @@ private:
std::array<std::atomic<u32>, Service::Nvidia::MaxSyncPoints> syncpoints{};
struct Event {
Event(const u32 event_id, const u32 value) : event_id(event_id), value(value) {}
u32 event_id;
u32 value;
};
std::array<std::list<Event>, Service::Nvidia::MaxSyncPoints> events;
std::array<std::list<u32>, Service::Nvidia::MaxSyncPoints> syncpt_interrupts;
std::mutex sync_mutex;

4
src/video_core/gpu_asynch.cpp
View file

@ -40,9 +40,9 @@ void GPUAsynch::FlushAndInvalidateRegion(CacheAddr addr, u64 size) {
gpu_thread.FlushAndInvalidateRegion(addr, size);
}
void GPUAsynch::TriggerCpuInterrupt(const u32 event_id) const {
void GPUAsynch::TriggerCpuInterrupt(const u32 syncpoint_id, const u32 value) const {
auto& interrupt_manager = system.InterruptManager();
interrupt_manager.InterruptGPU(event_id);
interrupt_manager.GPUInterruptSyncpt(syncpoint_id, value);
}
} // namespace VideoCommon

2
src/video_core/gpu_asynch.h
View file

@ -28,7 +28,7 @@ public:
void FlushAndInvalidateRegion(CacheAddr addr, u64 size) override;
protected:
void TriggerCpuInterrupt(const u32 event_id) const override;
void TriggerCpuInterrupt(const u32 syncpoint_id, const u32 value) const override;
private:
GPUThread::ThreadManager gpu_thread;

2
src/video_core/gpu_synch.h
View file

@ -27,7 +27,7 @@ public:
void FlushAndInvalidateRegion(CacheAddr addr, u64 size) override;
protected:
void TriggerCpuInterrupt(const u32 event_id) const override {}
void TriggerCpuInterrupt(const u32 syncpoint_id, const u32 value) const override {}
};
} // namespace VideoCommon