Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

"Instant" ARAM DMA shouldn't schedule and event too soon. #3773

Merged
merged 1 commit into from
Apr 11, 2016
Merged

"Instant" ARAM DMA shouldn't schedule and event too soon. #3773

merged 1 commit into from
Apr 11, 2016

Conversation

phire
Copy link
Member

@phire phire commented Apr 9, 2016

Now that the accuracy of ScheduleEvent has changed, 0 cycles will schedule an event as soon as possible. But this breaks ATV 2.
So we schedule it 100 cycles out (unless it's a really short copy)

I'd really like to remove the whole hack, as it only appears to fix RE2/RE3 but I don't really want to make major changes to this code this close to the 5.0 release.

This change is Reviewable

@phire
"Instant" ARAM DMA shouldn't schedule and event too soon.
662ed21 
Now that the accuracy of ScheduleEvent has changed, 0 cycles will
schedule an event as soon as possible. But this breaks ATV 2.

So we schedule it 100 cycles out (unless it's a really short copy)
@delroth delroth added this to the Dolphin Release 5.0 milestone Apr 9, 2016
@phire phire mentioned this pull request Apr 9, 2016
Merged
@phire
Copy link
Member Author

phire commented Apr 10, 2016

See #3771 for the better fix which removes the whole hack but breaks Resident Evil 2 and 3.

lioncash
lioncash reviewed Apr 10, 2016
View reviewed changes
Source/Core/Core/HW/DSP.cpp
@@ -212,6 +212,7 @@ void EnableInstantDMA()
CoreTiming::RemoveEvent(et_CompleteARAM);
CompleteARAM(0, 0);
instant_dma = true;
ERROR_LOG(DSPINTERFACE, "Enabling Instant ARAM DMA hack");

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

@delroth
Copy link
Member

delroth commented Apr 11, 2016

Reviewed 1 of 1 files at r1.
Review status: all files reviewed at latest revision, 1 unresolved discussion.

Comments from Reviewable

@delroth delroth merged commit 58d8c73 into dolphin-emu:master Apr 11, 2016
@phire phire deleted the if_you_want_100_cycles_ask_for_100_cycles branch July 6, 2016 03:26
@phire phire mentioned this pull request Sep 7, 2016
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Milestone
Dolphin Release 5.0
7 participants
@phire @delroth @lioncash @BhaaLseN @JMC47 @JosJuice @Fallenleader