H3cJP/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NVDRV: Fix clearing when destroying.

Browse Source
This commit is contained in:
Fernando Sahmkow 2021-11-05 02:57:14 +01:00
parent 68d9504a04
commit ad038609c8
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp
View File

@ -24,12 +24,9 @@ namespace Service::Nvidia::Devices {
nvhost_ctrl::nvhost_ctrl(Core::System& system_, EventInterface& events_interface_, nvhost_ctrl::nvhost_ctrl(Core::System& system_, EventInterface& events_interface_,
NvCore::Container& core_) NvCore::Container& core_)
: nvdevice{system_}, events_interface{events_interface_}, core{core_}, : nvdevice{system_}, events_interface{events_interface_}, core{core_},
syncpoint_manager{core_.GetSyncpointManager()} { syncpoint_manager{core_.GetSyncpointManager()} {}
events_interface.RegisterForSignal(this);
}
nvhost_ctrl::~nvhost_ctrl() { nvhost_ctrl::~nvhost_ctrl() {
events_interface.UnregisterForSignal(this);
for (auto& event : events) { for (auto& event : events) {
if (!event.registered) { if (!event.registered) {
continue; continue;
@ -77,8 +74,12 @@ NvResult nvhost_ctrl::Ioctl3(DeviceFD fd, Ioctl command, const std::vector<u8>&
return NvResult::NotImplemented; return NvResult::NotImplemented;
} }
void nvhost_ctrl::OnOpen(DeviceFD fd) {} void nvhost_ctrl::OnOpen(DeviceFD fd) {
void nvhost_ctrl::OnClose(DeviceFD fd) {} events_interface.RegisterForSignal(this);
}
void nvhost_ctrl::OnClose(DeviceFD fd) {
events_interface.UnregisterForSignal(this);
}
NvResult nvhost_ctrl::NvOsGetConfigU32(const std::vector<u8>& input, std::vector<u8>& output) { NvResult nvhost_ctrl::NvOsGetConfigU32(const std::vector<u8>& input, std::vector<u8>& output) {
IocGetConfigParams params{}; IocGetConfigParams params{};

7
src/core/hle/service/nvdrv/nvdrv.cpp
View File

@ -29,7 +29,7 @@
namespace Service::Nvidia { namespace Service::Nvidia {
EventInterface::EventInterface(Module& module_) : module{module_} {} EventInterface::EventInterface(Module& module_) : module{module_}, guard{}, on_signal{} {}
EventInterface::~EventInterface() = default; EventInterface::~EventInterface() = default;
@ -40,10 +40,7 @@ void EventInterface::RegisterForSignal(Devices::nvhost_ctrl* device) {
void EventInterface::UnregisterForSignal(Devices::nvhost_ctrl* device) { void EventInterface::UnregisterForSignal(Devices::nvhost_ctrl* device) {
std::unique_lock<std::mutex> lk(guard); std::unique_lock<std::mutex> lk(guard);
auto it = std::find(on_signal.begin(), on_signal.end(), device); on_signal.remove(device);
if (it != on_signal.end()) {
on_signal.erase(it);
}
} }
void EventInterface::Signal(u32 syncpoint_id, u32 value) { void EventInterface::Signal(u32 syncpoint_id, u32 value) {

3
src/core/hle/service/nvdrv/nvdrv.h
View File

@ -110,9 +110,6 @@ private:
/// Mapping of file descriptors to the devices they reference. /// Mapping of file descriptors to the devices they reference.
FilesContainerType open_files; FilesContainerType open_files;
/// Mapping of device node names to their implementation.
std::unordered_map<std::string, std::shared_ptr<Devices::nvdevice>> devices;
KernelHelpers::ServiceContext service_context; KernelHelpers::ServiceContext service_context;
EventInterface events_interface; EventInterface events_interface;