From f469fa7458c1fb8f9daaf4f3b24f3c0ba8315050 Mon Sep 17 00:00:00 2001
From: fincs <fincs.alt1@gmail.com>
Date: Fri, 14 Sep 2018 02:15:55 +0200
Subject: [PATCH] Add nvioctlChannel_KickoffPb (uses Ioctl2)

---
 nx/include/switch/nvidia/ioctl.h   |  3 ++-
 nx/source/nvidia/ioctl/nvchannel.c | 28 ++++++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/nx/include/switch/nvidia/ioctl.h b/nx/include/switch/nvidia/ioctl.h
index 663d0008..a9d8fbb9 100644
--- a/nx/include/switch/nvidia/ioctl.h
+++ b/nx/include/switch/nvidia/ioctl.h
@@ -181,7 +181,8 @@ Result nvioctlNvmap_Free(u32 fd, u32 nvmap_handle);
 Result nvioctlNvmap_GetId(u32 fd, u32 nvmap_handle, u32 *id);
 
 Result nvioctlChannel_SetNvmapFd(u32 fd, u32 nvmap_fd);
-Result nvioctlChannel_SubmitGpfifo(u32 fd, nvioctl_gpfifo_entry *entries, u32 num_entries, u32 flags, nvioctl_fence *fence_out);
+Result nvioctlChannel_SubmitGpfifo(u32 fd, nvioctl_gpfifo_entry *entries, u32 num_entries, u32 flags, nvioctl_fence *fence_inout);
+Result nvioctlChannel_KickoffPb(u32 fd, nvioctl_gpfifo_entry *entries, u32 num_entries, u32 flags, nvioctl_fence *fence_inout);
 Result nvioctlChannel_AllocObjCtx(u32 fd, u32 class_num, u32 flags, u64* id_out);
 Result nvioctlChannel_ZCullBind(u32 fd, u64 gpu_va, u32 mode);
 Result nvioctlChannel_SetErrorNotifier(u32 fd, u32 enable);
diff --git a/nx/source/nvidia/ioctl/nvchannel.c b/nx/source/nvidia/ioctl/nvchannel.c
index 89f7afcc..8081ea1a 100644
--- a/nx/source/nvidia/ioctl/nvchannel.c
+++ b/nx/source/nvidia/ioctl/nvchannel.c
@@ -30,9 +30,8 @@ Result nvioctlChannel_SubmitGpfifo(u32 fd, nvioctl_gpfifo_entry *entries, u32 nu
         __nv_in    nvioctl_gpfifo_entry entries[num_entries]; // depends on num_entries
     } data;
 
-
     memset(&data, 0, sizeof(data));
-    data.gpfifo = 1;
+    data.gpfifo = (u64)data.entries; // ignored
     data.num_entries = num_entries;
     data.flags = flags;
     data.fence = *fence_inout;
@@ -47,6 +46,31 @@ Result nvioctlChannel_SubmitGpfifo(u32 fd, nvioctl_gpfifo_entry *entries, u32 nu
     return rc;
 }
 
+Result nvioctlChannel_KickoffPb(u32 fd, nvioctl_gpfifo_entry *entries, u32 num_entries, u32 flags, nvioctl_fence *fence_inout) {
+    Result rc=0;
+
+    struct {
+        __nv_in    u64 gpfifo;           // (ignored) pointer to gpfifo entry structs
+        __nv_in    u32 num_entries;      // number of entries being submitted
+        __nv_in    u32 flags;
+        __nv_inout nvioctl_fence fence;  // returned new fence object for others to wait on
+    } data;
+
+    memset(&data, 0, sizeof(data));
+    data.gpfifo = (u64)entries; // ignored?
+    data.num_entries = num_entries;
+    data.flags = flags;
+    data.fence = *fence_inout;
+
+    rc = nvIoctl2(fd, _NV_IOWR(0x48, 0x1B, data), &data, entries, num_entries*sizeof(nvioctl_gpfifo_entry));
+
+    if (R_SUCCEEDED(rc)) {
+        *fence_inout = data.fence;
+    }
+
+    return rc;
+}
+
 Result nvioctlChannel_AllocObjCtx(u32 fd, u32 class_num, u32 flags, u64* id_out) {
     struct {
         __nv_in u32 class_num;