summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2015-05-11 00:51:37 +0200
committerYuri Kunde Schlesner <yuriks@yuriks.net>2015-05-11 01:05:30 +0200
commit1538a34eda324782bf88fa382201e1e5cf8a237c (patch)
tree289d71bd250004be94c6cd3e3698382b7fa184d9
parentKernel: Zero-fill shared memory blocks when mapping (diff)
downloadyuzu-1538a34eda324782bf88fa382201e1e5cf8a237c.tar
yuzu-1538a34eda324782bf88fa382201e1e5cf8a237c.tar.gz
yuzu-1538a34eda324782bf88fa382201e1e5cf8a237c.tar.bz2
yuzu-1538a34eda324782bf88fa382201e1e5cf8a237c.tar.lz
yuzu-1538a34eda324782bf88fa382201e1e5cf8a237c.tar.xz
yuzu-1538a34eda324782bf88fa382201e1e5cf8a237c.tar.zst
yuzu-1538a34eda324782bf88fa382201e1e5cf8a237c.zip
-rw-r--r--src/core/hle/service/gsp_gpu.cpp20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/core/hle/service/gsp_gpu.cpp b/src/core/hle/service/gsp_gpu.cpp
index e2b6b0b02..917f4685f 100644
--- a/src/core/hle/service/gsp_gpu.cpp
+++ b/src/core/hle/service/gsp_gpu.cpp
@@ -31,7 +31,7 @@ Kernel::SharedPtr<Kernel::Event> g_interrupt_event;
/// GSP shared memoryings
Kernel::SharedPtr<Kernel::SharedMemory> g_shared_memory;
/// Thread index into interrupt relay queue, 1 is arbitrary
-u32 g_thread_id = 1;
+u32 g_thread_id = 0;
/// Gets a pointer to a thread command buffer in GSP shared memory
static inline u8* GetCommandBuffer(u32 thread_id) {
@@ -277,7 +277,7 @@ static void FlushDataCache(Service::Interface* self) {
* 1 : "Flags" field, purpose is unknown
* 3 : Handle to GSP synchronization event
* Outputs:
- * 0 : Result of function, 0 on success, otherwise error code
+ * 1 : Result of function, 0x2A07 on success, otherwise error code
* 2 : Thread index into GSP command buffer
* 4 : Handle to GSP shared memory
*/
@@ -288,13 +288,11 @@ static void RegisterInterruptRelayQueue(Service::Interface* self) {
g_interrupt_event = Kernel::g_handle_table.Get<Kernel::Event>(cmd_buff[3]);
ASSERT_MSG((g_interrupt_event != nullptr), "handle is not valid!");
- using Kernel::MemoryPermission;
- g_shared_memory = Kernel::SharedMemory::Create(0x1000, MemoryPermission::ReadWrite,
- MemoryPermission::ReadWrite, "GSPSharedMem");
-
Handle shmem_handle = Kernel::g_handle_table.Create(g_shared_memory).MoveFrom();
- cmd_buff[1] = 0x2A07; // Value verified by 3dmoo team, purpose unknown, but needed for GSP init
+ // This specific code is required for a successful initialization, rather than 0
+ cmd_buff[1] = ResultCode((ErrorDescription)519, ErrorModule::GX,
+ ErrorSummary::Success, ErrorLevel::Success).raw;
cmd_buff[2] = g_thread_id++; // Thread ID
cmd_buff[4] = shmem_handle; // GSP shared memory
@@ -529,8 +527,12 @@ Interface::Interface() {
Register(FunctionTable);
g_interrupt_event = 0;
- g_shared_memory = 0;
- g_thread_id = 1;
+
+ using Kernel::MemoryPermission;
+ g_shared_memory = Kernel::SharedMemory::Create(0x1000, MemoryPermission::ReadWrite,
+ MemoryPermission::ReadWrite, "GSPSharedMem");
+
+ g_thread_id = 0;
}
} // namespace