equeue: Implement sceGnmGetEqEventType/sceKernelGetEventData #1839
Conversation
|
|
||
| // We need to convert IRQ# to event id | ||
| // Exclude ids we shouldn't care about as they aren't a valid EqEventType. | ||
| if (irq == Platform::InterruptId::GpuIdle || irq == Platform::InterruptId::GfxFlip) |
There was a problem hiding this comment.
You're not checking for the rest of idents.
| auto event_type = static_cast<GnmEqEventType>(id); | ||
| eq->TriggerEvent(event_type, SceKernelEvent::Filter::GraphicsCore, | ||
| reinterpret_cast<void*>(event_type)); |
There was a problem hiding this comment.
Irrelevant cast in my opinion, since you'll be casting to void* either way.
| @@ -29,7 +29,7 @@ namespace Libraries::GnmDriver { | |||
|
|
|||
| using namespace AmdGpu; | |||
|
|
|||
| enum GnmEventIdents : u64 { | |||
| enum GnmEqEventType : u64 { | |||
There was a problem hiding this comment.
Is the name change necessary?
There was a problem hiding this comment.
I would say so, this is so far not used and more inline with sceGnmGetEqEventType.
src/core/libraries/kernel/equeue.cpp
Outdated
| bool has_event = false; | ||
| for (auto& ev : m_events) { | ||
| if (ev.event.ident == event.event.ident && ev.event.filter == event.event.filter) { | ||
| ev = std::move(event); | ||
| has_event = true; | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| if (!has_event) { | ||
| m_events.emplace_back(std::move(event)); | ||
| } |
There was a problem hiding this comment.
You can move back to std::ranges::find instead of manually iterating.
src/core/libraries/kernel/equeue.h
Outdated
| // Ensure not to clear event data for Eq events, as it'll be fetched by sceGnmGetEqEventType. | ||
| if (event.filter != SceKernelEvent::Filter::GraphicsCore) { | ||
| event.data = 0; | ||
| } |
There was a problem hiding this comment.
This shouldn't be merged IMO, proper research on kernel has to be done.
|
Reviews addressed. |
This PR implements
sceGnmGetEqEventTypeandsceKernelGetEventData(called from the former, based on module research).Games are normally expected to call
sceGnmGetEqEventTypeto get the type of Eq/GraphicCore events returned fromsceKernelWaitEqueue. Since this was not yet implemented, some games that would wait on aGfxEopevent before rendering would permanently softlock.Furthermore, equeue events are uniquely identified by ident and filter. Some code paths such as
AddEventwere not checking on this.Addresses a softlock in CUSA02168 (Gran Turismo Sport), CUSA24767 (Gran Turismo 7).
Needs testing.