From b7e4fb00aa79983e98967b7f9a25e12ac347925a Mon Sep 17 00:00:00 2001 From: SDK Chan Date: Wed, 23 Jul 2025 17:32:51 +0200 Subject: [PATCH] [nvdrv] Unstub Allocate Object Context --- .../hle/service/nvdrv/devices/nvhost_gpu.cpp | 24 +++++++++++++++---- .../hle/service/nvdrv/devices/nvhost_gpu.h | 3 ++- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp index efc9cca1cc..a9af1411b2 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_gpu.cpp @@ -192,11 +192,27 @@ NvResult nvhost_gpu::AllocGPFIFOEx2(IoctlAllocGpfifoEx2& params, DeviceFD fd) { } NvResult nvhost_gpu::AllocateObjectContext(IoctlAllocObjCtx& params) { - LOG_WARNING(Service_NVDRV, "(STUBBED) called, class_num={:X}, flags={:X}", params.class_num, - params.flags); + LOG_DEBUG(Service_NVDRV, "called, class_num={:X}, flags={:X}, obj_id={:X}", params.class_num, + params.flags, params.obj_id); - params.obj_id = 0x0; - return NvResult::Success; + if (!channel_state->initialized) { + LOG_CRITICAL(Service_NVDRV, "No address space bound to allocate a object context!"); + return NvResult::NotInitialized; + } + + switch (static_cast(params.class_num)) { + case CtxClasses::Ctx2D: + case CtxClasses::Ctx3D: + case CtxClasses::CtxCompute: + case CtxClasses::CtxKepler: + case CtxClasses::CtxDMA: + case CtxClasses::CtxChannelGPFIFO: + ctxObj_params.push_back(params); + return NvResult::Success; + default: + LOG_ERROR(Service_NVDRV, "Invalid class number for object context: {:X}", params.class_num); + return NvResult::BadParameter; + } } static boost::container::small_vector BuildWaitCommandList( diff --git a/src/core/hle/service/nvdrv/devices/nvhost_gpu.h b/src/core/hle/service/nvdrv/devices/nvhost_gpu.h index e0aeef9536..e1bdb2e780 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_gpu.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_gpu.h @@ -54,7 +54,7 @@ public: private: friend class nvhost_as_gpu; - enum class CtxObjects : u32_le { + enum class CtxClasses : u32_le { Ctx2D = 0x902D, Ctx3D = 0xB197, CtxCompute = 0xB1C0, @@ -183,6 +183,7 @@ private: s32_le nvmap_fd{}; u64_le user_data{}; IoctlZCullBind zcull_params{}; + std::vector ctxObj_params{}; u32_le channel_priority{}; u32_le channel_timeslice{};