The-Homebrew-Cloud/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-11-22 21:49:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixup nvdrv channel types to follow naming conventions

Browse Source
This commit is contained in:
Billy Laws 2021-10-30 19:36:36 +01:00 committed by PixelyIon
parent ad900aba7a
commit 73896c2e6b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/cpp/skyline/services/nvdrv/core/syncpoint_manager.h
View File

@ -13,8 +13,8 @@ namespace skyline::service::nvdrv::core {
*/ */
enum class ChannelType : u32 { enum class ChannelType : u32 {
MsEnc = 0, MsEnc = 0,
Vic = 1, VIC = 1,
Gpu = 2, GPU = 2,
NvDec = 3, NvDec = 3,
Display = 4, Display = 4,
NvJpg = 5, NvJpg = 5,
@ -55,8 +55,8 @@ namespace skyline::service::nvdrv::core {
public: public:
static constexpr std::array<u32, static_cast<u32>(ChannelType::Max)> ChannelSyncpoints{ static constexpr std::array<u32, static_cast<u32>(ChannelType::Max)> ChannelSyncpoints{
0x0, // `MsEnc` is unimplemented 0x0, // `MsEnc` is unimplemented
0xC, // `Vic` 0xC, // `VIC`
0x0, // `Gpu` syncpoints are allocated per-channel instead 0x0, // `GPU` syncpoints are allocated per-channel instead
0x36, // `NvDec` 0x36, // `NvDec`
0x0, // `Display` is unimplemented 0x0, // `Display` is unimplemented
0x37, // `NvJpg` 0x37, // `NvJpg`

2
app/src/main/cpp/skyline/services/nvdrv/driver.cpp
View File

@ -48,7 +48,7 @@ namespace skyline::service::nvdrv {
DEVICE_SWITCH(DEVICE_CASE("/dev/nvhost-nvjpg", nvhost::Host1xChannel, core::ChannelType::NvJpg)) DEVICE_SWITCH(DEVICE_CASE("/dev/nvhost-nvjpg", nvhost::Host1xChannel, core::ChannelType::NvJpg))
if (ctx.perms.AccessVic) if (ctx.perms.AccessVic)
DEVICE_SWITCH(DEVICE_CASE("/dev/nvhost-vic", nvhost::Host1xChannel, core::ChannelType::Vic)) DEVICE_SWITCH(DEVICE_CASE("/dev/nvhost-vic", nvhost::Host1xChannel, core::ChannelType::VIC))
if (ctx.perms.AccessVideoDecoder) if (ctx.perms.AccessVideoDecoder)
DEVICE_SWITCH(DEVICE_CASE("/dev/nvhost-nvdec", nvhost::Host1xChannel, core::ChannelType::NvDec)) DEVICE_SWITCH(DEVICE_CASE("/dev/nvhost-nvdec", nvhost::Host1xChannel, core::ChannelType::NvDec))