Browse Source

nv_host_ctrl: Make Sync GPU variant always return synced result.

nce_cpp
Fernando Sahmkow 7 years ago
committed by FernandoS27
parent
commit
772d205e8f
  1. 5
      src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp
  2. 4
      src/video_core/gpu.cpp
  3. 8
      src/video_core/gpu.h
  4. 2
      src/video_core/gpu_asynch.cpp
  5. 2
      src/video_core/gpu_synch.cpp

5
src/core/hle/service/nvdrv/devices/nvhost_ctrl.cpp

@ -60,6 +60,11 @@ u32 nvhost_ctrl::IocCtrlEventWait(const std::vector<u8>& input, std::vector<u8>&
}
auto& gpu = Core::System::GetInstance().GPU();
// This is mostly to take into account unimplemented features. As synced
// gpu is always synced.
if (!gpu.IsAsync()) {
return NvResult::Success;
}
gpu.Guard(true);
u32 current_syncpoint_value = gpu.GetSyncpointValue(params.syncpt_id);
if (current_syncpoint_value >= params.threshold) {

4
src/video_core/gpu.cpp

@ -29,8 +29,8 @@ u32 FramebufferConfig::BytesPerPixel(PixelFormat format) {
UNREACHABLE();
}
GPU::GPU(Core::System& system, VideoCore::RendererBase& renderer)
: system{system}, renderer{renderer} {
GPU::GPU(Core::System& system, VideoCore::RendererBase& renderer, bool is_async)
: system{system}, renderer{renderer}, is_async{is_async} {
auto& rasterizer{renderer.Rasterizer()};
memory_manager = std::make_unique<Tegra::MemoryManager>(rasterizer);
dma_pusher = std::make_unique<Tegra::DmaPusher>(*this);

8
src/video_core/gpu.h

@ -131,7 +131,7 @@ class MemoryManager;
class GPU {
public:
explicit GPU(Core::System& system, VideoCore::RendererBase& renderer);
explicit GPU(Core::System& system, VideoCore::RendererBase& renderer, bool is_async);
virtual ~GPU();
@ -184,6 +184,10 @@ public:
}
}
bool IsAsync() const {
return is_async;
}
/// Returns a const reference to the GPU DMA pusher.
const Tegra::DmaPusher& DmaPusher() const;
@ -298,6 +302,8 @@ private:
std::array<std::list<Event>, Service::Nvidia::MaxSyncPoints> events;
std::mutex sync_mutex;
const bool is_async;
};
#define ASSERT_REG_POSITION(field_name, position) \

2
src/video_core/gpu_asynch.cpp

@ -11,7 +11,7 @@
namespace VideoCommon {
GPUAsynch::GPUAsynch(Core::System& system, VideoCore::RendererBase& renderer)
: GPU(system, renderer), gpu_thread{system} {}
: GPU(system, renderer, true), gpu_thread{system} {}
GPUAsynch::~GPUAsynch() = default;

2
src/video_core/gpu_synch.cpp

@ -8,7 +8,7 @@
namespace VideoCommon {
GPUSynch::GPUSynch(Core::System& system, VideoCore::RendererBase& renderer)
: GPU(system, renderer) {}
: GPU(system, renderer, false) {}
GPUSynch::~GPUSynch() = default;

Loading…
Cancel
Save