mirror of
https://git.h3cjp.net/H3cJP/citra.git
synced 2024-12-26 13:16:58 +00:00
hle: service: nvdrv: Implement SyncpointManager, to manage syncpoints.
This commit is contained in:
parent
bca9591660
commit
d567b7e841
|
@ -454,6 +454,8 @@ add_library(core STATIC
|
||||||
hle/service/nvdrv/nvdrv.h
|
hle/service/nvdrv/nvdrv.h
|
||||||
hle/service/nvdrv/nvmemp.cpp
|
hle/service/nvdrv/nvmemp.cpp
|
||||||
hle/service/nvdrv/nvmemp.h
|
hle/service/nvdrv/nvmemp.h
|
||||||
|
hle/service/nvdrv/syncpoint_manager.cpp
|
||||||
|
hle/service/nvdrv/syncpoint_manager.h
|
||||||
hle/service/nvflinger/buffer_queue.cpp
|
hle/service/nvflinger/buffer_queue.cpp
|
||||||
hle/service/nvflinger/buffer_queue.h
|
hle/service/nvflinger/buffer_queue.h
|
||||||
hle/service/nvflinger/nvflinger.cpp
|
hle/service/nvflinger/nvflinger.cpp
|
||||||
|
|
|
@ -36,7 +36,7 @@ void InstallInterfaces(SM::ServiceManager& service_manager, NVFlinger::NVFlinger
|
||||||
nvflinger.SetNVDrvInstance(module_);
|
nvflinger.SetNVDrvInstance(module_);
|
||||||
}
|
}
|
||||||
|
|
||||||
Module::Module(Core::System& system) {
|
Module::Module(Core::System& system) : syncpoint_manager{system.GPU()} {
|
||||||
auto& kernel = system.Kernel();
|
auto& kernel = system.Kernel();
|
||||||
for (u32 i = 0; i < MaxNvEvents; i++) {
|
for (u32 i = 0; i < MaxNvEvents; i++) {
|
||||||
std::string event_label = fmt::format("NVDRV::NvEvent_{}", i);
|
std::string event_label = fmt::format("NVDRV::NvEvent_{}", i);
|
||||||
|
|
39
src/core/hle/service/nvdrv/syncpoint_manager.cpp
Normal file
39
src/core/hle/service/nvdrv/syncpoint_manager.cpp
Normal file
|
@ -0,0 +1,39 @@
|
||||||
|
// Copyright 2020 yuzu emulator team
|
||||||
|
// Licensed under GPLv2 or any later version
|
||||||
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
|
#include "common/assert.h"
|
||||||
|
#include "core/hle/service/nvdrv/syncpoint_manager.h"
|
||||||
|
#include "video_core/gpu.h"
|
||||||
|
|
||||||
|
namespace Service::Nvidia {
|
||||||
|
|
||||||
|
SyncpointManager::SyncpointManager(Tegra::GPU& gpu) : gpu{gpu} {}
|
||||||
|
|
||||||
|
SyncpointManager::~SyncpointManager() = default;
|
||||||
|
|
||||||
|
u32 SyncpointManager::RefreshSyncpoint(u32 syncpoint_id) {
|
||||||
|
syncpoints[syncpoint_id].min = gpu.GetSyncpointValue(syncpoint_id);
|
||||||
|
return GetSyncpointMin(syncpoint_id);
|
||||||
|
}
|
||||||
|
|
||||||
|
u32 SyncpointManager::AllocateSyncpoint() {
|
||||||
|
for (u32 syncpoint_id = 1; syncpoint_id < MaxSyncPoints; syncpoint_id++) {
|
||||||
|
if (!syncpoints[syncpoint_id].is_allocated) {
|
||||||
|
syncpoints[syncpoint_id].is_allocated = true;
|
||||||
|
return syncpoint_id;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
UNREACHABLE_MSG("No more available syncpoints!");
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
|
||||||
|
u32 SyncpointManager::IncreaseSyncpoint(u32 syncpoint_id, u32 value) {
|
||||||
|
for (u32 index = 0; index < value; ++index) {
|
||||||
|
syncpoints[syncpoint_id].max.fetch_add(1, std::memory_order_relaxed);
|
||||||
|
}
|
||||||
|
|
||||||
|
return GetSyncpointMax(syncpoint_id);
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace Service::Nvidia
|
85
src/core/hle/service/nvdrv/syncpoint_manager.h
Normal file
85
src/core/hle/service/nvdrv/syncpoint_manager.h
Normal file
|
@ -0,0 +1,85 @@
|
||||||
|
// Copyright 2020 yuzu emulator team
|
||||||
|
// Licensed under GPLv2 or any later version
|
||||||
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <array>
|
||||||
|
#include <atomic>
|
||||||
|
|
||||||
|
#include "common/common_types.h"
|
||||||
|
#include "core/hle/service/nvdrv/nvdata.h"
|
||||||
|
|
||||||
|
namespace Tegra {
|
||||||
|
class GPU;
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace Service::Nvidia {
|
||||||
|
|
||||||
|
class SyncpointManager final {
|
||||||
|
public:
|
||||||
|
explicit SyncpointManager(Tegra::GPU& gpu);
|
||||||
|
~SyncpointManager();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns true if the specified syncpoint is expired for the given value.
|
||||||
|
* @param syncpoint_id Syncpoint ID to check.
|
||||||
|
* @param value Value to check against the specified syncpoint.
|
||||||
|
* @returns True if the specified syncpoint is expired for the given value, otherwise False.
|
||||||
|
*/
|
||||||
|
bool IsSyncpointExpired(u32 syncpoint_id, u32 value) const {
|
||||||
|
return (GetSyncpointMax(syncpoint_id) - value) >= (GetSyncpointMin(syncpoint_id) - value);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the lower bound for the specified syncpoint.
|
||||||
|
* @param syncpoint_id Syncpoint ID to get the lower bound for.
|
||||||
|
* @returns The lower bound for the specified syncpoint.
|
||||||
|
*/
|
||||||
|
u32 GetSyncpointMin(u32 syncpoint_id) const {
|
||||||
|
return syncpoints[syncpoint_id].min.load(std::memory_order_relaxed);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the uper bound for the specified syncpoint.
|
||||||
|
* @param syncpoint_id Syncpoint ID to get the upper bound for.
|
||||||
|
* @returns The upper bound for the specified syncpoint.
|
||||||
|
*/
|
||||||
|
u32 GetSyncpointMax(u32 syncpoint_id) const {
|
||||||
|
return syncpoints[syncpoint_id].max.load(std::memory_order_relaxed);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Refreshes the minimum value for the specified syncpoint.
|
||||||
|
* @param syncpoint_id Syncpoint ID to be refreshed.
|
||||||
|
* @returns The new syncpoint minimum value.
|
||||||
|
*/
|
||||||
|
u32 RefreshSyncpoint(u32 syncpoint_id);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Allocates a new syncoint.
|
||||||
|
* @returns The syncpoint ID for the newly allocated syncpoint.
|
||||||
|
*/
|
||||||
|
u32 AllocateSyncpoint();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Increases the maximum value for the specified syncpoint.
|
||||||
|
* @param syncpoint_id Syncpoint ID to be increased.
|
||||||
|
* @param value Value to increase the specified syncpoint by.
|
||||||
|
* @returns The new syncpoint maximum value.
|
||||||
|
*/
|
||||||
|
u32 IncreaseSyncpoint(u32 syncpoint_id, u32 value);
|
||||||
|
|
||||||
|
private:
|
||||||
|
struct Syncpoint {
|
||||||
|
std::atomic<u32> min;
|
||||||
|
std::atomic<u32> max;
|
||||||
|
std::atomic<bool> is_allocated;
|
||||||
|
};
|
||||||
|
|
||||||
|
std::array<Syncpoint, MaxSyncPoints> syncpoints{};
|
||||||
|
|
||||||
|
Tegra::GPU& gpu;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace Service::Nvidia
|
Loading…
Reference in a new issue