Pull upstream #24
Merged
Pull upstream #24
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* mmu: Add function mmu_enabled() This function can be used to know whether or not the MMU is in use. * mmu: Support address translation of store queues Reserve the last two TLB entries and map a 1 MiB page each for use with the SQ area. Add the function mmu_set_sq_addr(), which will overwrite the physical address that the SQ area points to in the TLB. * sq: Update sq_lock() prototype to work with MMU Change its prototype: it now returns a pointer, which is the translated address of the source pointer. In non-MMU use, it's returns the same value as SQ_MASK_DEST(src). When MMU is enabled, sq_lock() will reset the address translation for the SQ memory area, and convert the source address as an offset to that memory area, making it possible to use SQs when MMU is enabled. The caveat is that we only map one megabyte of SQ memory area for simplicity, and therefore the SQ memory window is reduced. This should be fine though, as apart from e.g. a whole-VRAM clear, nobody will ever need such a big window. * sq: Update sq_cpy() to work with MMU When using the MMU the SQ area is a 1 MiB page, so we must not copy data outside this area. * sq: Update sq_set32() to work with MMU When using the MMU the SQ area is a 1 MiB page, so we must not copy data outside this area. * mmu: Remove mmu_disable() / mmu_restore() Now that SQs work with MMU, those two functions aren't useful anymore and can be dropped. --------- Signed-off-by: Paul Cercueil <paul@crapouillou.net>
- Rather than asserting and crashing, which isn't really warranted, modified pvr_mem_available() and snd_mem_available() to gracefully return 0 when called before PVR/Sound RAM has been initialized. - This way profilers and monitors in other threads can still boot up and show proper stats while things are being initialized, rather than simply crashing in debug builds and returning garbage in release builds.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull latest master changes from KallistiOS Proper