From 27f5aecea81fda5b6524f80b11fb9d22a72f47bd Mon Sep 17 00:00:00 2001
From: fincs <fincs.alt1@gmail.com>
Date: Tue, 28 Aug 2018 13:16:27 +0200
Subject: [PATCH] nvgfx: Strip down to bare minimum - remove unused logic

---
 nx/source/display/gfx.c   |   4 +-
 nx/source/display/nvgfx.c | 160 +++++++++-----------------------------
 2 files changed, 37 insertions(+), 127 deletions(-)

diff --git a/nx/source/display/gfx.c b/nx/source/display/gfx.c
index c9ff36d8..58662c11 100644
--- a/nx/source/display/gfx.c
+++ b/nx/source/display/gfx.c
@@ -435,9 +435,9 @@ void gfxConfigureAutoResolutionDefault(bool enable) {
     gfxConfigureAutoResolution(enable, 1280, 720, 0, 0);
 }
 
-Result _gfxGraphicBufferInit(s32 buf, u32 nvmap_handle) {
+Result _gfxGraphicBufferInit(s32 buf, u32 nvmap_id, u32 nvmap_handle) {
     g_gfx_BufferInitData.refcount = buf;
-    g_gfx_BufferInitData.data.nvmap_handle0 = nvmap_handle;
+    g_gfx_BufferInitData.data.nvmap_handle0 = nvmap_id;
     g_gfx_BufferInitData.data.nvmap_handle1 = nvmap_handle;
     g_gfx_BufferInitData.data.buffer_offset = g_gfx_singleframebuf_size*buf;
     g_gfx_BufferInitData.data.timestamp = svcGetSystemTick();
diff --git a/nx/source/display/nvgfx.c b/nx/source/display/nvgfx.c
index 6cdeb1e4..f07d76ff 100644
--- a/nx/source/display/nvgfx.c
+++ b/nx/source/display/nvgfx.c
@@ -17,28 +17,17 @@ typedef struct {
     size_t mem_size;
 } nvmapobj;
 
-static bool g_nvgfxInitialized = 0;
-static u32 g_nvgfx_fd_nvhostctrlgpu;
-static u32 g_nvgfx_fd_nvhostasgpu;
+static bool g_nvgfxInitialized;
 static u32 g_nvgfx_fd_nvmap;
-static u32 g_nvgfx_fd_nvhostgpu;
 static u32 g_nvgfx_fd_nvhostctrl;
 
-static nvioctl_gpu_characteristics g_nvgfx_gpu_characteristics;
-static nvioctl_fence g_nvgfx_nvhost_fence;
+u32 g_nvgfx_totalframebufs = 2;
 
-u32 g_nvgfx_totalframebufs = 0;
-
-static nvmapobj nvmap_objs[18];
-
-static u64 nvmap_obj4_mapbuffer_x0_offset;
-static u64 nvmap_obj6_mapbuffer_xdb_offset;
-
-static u64 g_nvgfx_gpfifo_pos = 0;
+static nvmapobj nvmap_fb_obj;
 
 extern size_t g_gfx_singleframebuf_size;
 
-Result _gfxGraphicBufferInit(s32 buf, u32 nvmap_handle);
+Result _gfxGraphicBufferInit(s32 buf, u32 nvmap_id, u32 nvmap_handle);
 
 static Result nvmapobjInitialize(nvmapobj *obj, size_t size) {
     Result rc=0;
@@ -71,12 +60,6 @@ static void nvmapobjClose(nvmapobj *obj) {
     memset(obj, 0, sizeof(nvmapobj));
 }
 
-static void nvmapobjCloseAll(void) {
-    u32 pos=0;
-
-    for(pos=0; pos<sizeof(nvmap_objs)/sizeof(nvmapobj); pos++) nvmapobjClose(&nvmap_objs[pos]);
-}
-
 static Result nvmapobjSetup(nvmapobj *obj, u32 heapmask, u32 flags, u32 align, u8 kind) {
     Result rc=0;
 
@@ -92,108 +75,36 @@ Result nvgfxInitialize(void) {
     if (g_nvgfxInitialized)
         return 0;
 
-    u32 framebuf_nvmap_handle = 0;//Special handle ID for framebuf/windowbuf.
-
-    g_nvgfx_fd_nvhostctrlgpu = 0;
-    g_nvgfx_fd_nvhostasgpu = 0;
-    g_nvgfx_fd_nvmap = 0;
-    g_nvgfx_fd_nvhostgpu = 0;
-
-    g_nvgfx_totalframebufs = 2;
-
-    memset(nvmap_objs, 0, sizeof(nvmap_objs));
-
-    memset(&g_nvgfx_gpu_characteristics, 0, sizeof(nvioctl_gpu_characteristics));
-    memset(&g_nvgfx_nvhost_fence, 0, sizeof(g_nvgfx_nvhost_fence));
-    nvmap_obj4_mapbuffer_x0_offset = 0;
-    nvmap_obj6_mapbuffer_xdb_offset = 0;
-
-    g_nvgfx_gpfifo_pos = 0;
-
-    //All of the below sizes for nvmapobjInitialize are from certain official sw.
-    if (R_SUCCEEDED(rc)) rc = nvmapobjInitialize(&nvmap_objs[4], 0x59000);
-    if (R_SUCCEEDED(rc)) rc = nvmapobjInitialize(&nvmap_objs[6], g_nvgfx_totalframebufs*g_gfx_singleframebuf_size);
-
-    if (R_SUCCEEDED(rc)) rc = nvOpen(&g_nvgfx_fd_nvhostctrlgpu, "/dev/nvhost-ctrl-gpu");
-
-    if (R_SUCCEEDED(rc)) rc = nvioctlNvhostCtrlGpu_GetCharacteristics(g_nvgfx_fd_nvhostctrlgpu, &g_nvgfx_gpu_characteristics);
-
-    if (R_SUCCEEDED(rc)) rc = nvOpen(&g_nvgfx_fd_nvhostasgpu, "/dev/nvhost-as-gpu");
-
-    if (R_SUCCEEDED(rc)) rc = nvioctlNvhostAsGpu_InitializeEx(g_nvgfx_fd_nvhostasgpu, 1, /*0*/0x10000);
-    if (R_SUCCEEDED(rc)) rc = nvioctlNvhostAsGpu_AllocSpace(g_nvgfx_fd_nvhostasgpu, 0x10000, /*0x20000*/0x10000, 0, 0x10000, NULL);
     if (R_SUCCEEDED(rc)) rc = nvOpen(&g_nvgfx_fd_nvmap, "/dev/nvmap");
-    if (R_SUCCEEDED(rc)) rc = nvOpen(&g_nvgfx_fd_nvhostgpu, "/dev/nvhost-gpu");
-
-    if (R_SUCCEEDED(rc)) rc = nvioctlNvhostAsGpu_BindChannel(g_nvgfx_fd_nvhostasgpu, g_nvgfx_fd_nvhostgpu);
-
-    if (R_SUCCEEDED(rc)) rc = nvioctlChannel_SetNvmapFd(g_nvgfx_fd_nvhostgpu, g_nvgfx_fd_nvmap);
-
-    if (R_SUCCEEDED(rc)) rc = nvioctlChannel_AllocGpfifoEx2(g_nvgfx_fd_nvhostgpu, 0x800, 0x1, 0, 0, 0, 0, &g_nvgfx_nvhost_fence);
-
-    if (R_SUCCEEDED(rc)) rc = nvioctlChannel_AllocObjCtx(g_nvgfx_fd_nvhostgpu, g_nvgfx_gpu_characteristics.threed_class, 0, NULL);
-    if (R_SUCCEEDED(rc)) rc = nvioctlChannel_SetPriority(g_nvgfx_fd_nvhostgpu, NvChannelPriority_Medium);
-
-    if (R_SUCCEEDED(rc)) rc = nvmapobjSetup(&nvmap_objs[4], 0, 0x1, 0x20000, 0);
-    if (R_SUCCEEDED(rc)) rc = nvioctlNvhostAsGpu_MapBufferEx(g_nvgfx_fd_nvhostasgpu, 4, 0, nvmap_objs[4].handle, 0x10000, 0, 0, 0, &nvmap_obj4_mapbuffer_x0_offset);
-    if (R_SUCCEEDED(rc)) rc = nvioctlNvhostAsGpu_MapBufferEx(g_nvgfx_fd_nvhostasgpu, 4, 0xfe, nvmap_objs[4].handle, 0x10000, 0, 0, 0, NULL);
-    if (R_SUCCEEDED(rc)) rc = nvioctlChannel_ZCullBind(g_nvgfx_fd_nvhostgpu, nvmap_obj4_mapbuffer_x0_offset+0x8000, 0x2);
-
-    if (R_SUCCEEDED(rc)) rc = nvmapobjSetup(&nvmap_objs[6], 0, 0x1, 0x20000, 0);
-    if (R_SUCCEEDED(rc)) rc = nvioctlNvhostAsGpu_MapBufferEx(g_nvgfx_fd_nvhostasgpu, 4, 0, nvmap_objs[6].handle, 0x10000, 0, 0, 0, NULL);
-    if (R_SUCCEEDED(rc)) rc = nvioctlNvhostAsGpu_MapBufferEx(g_nvgfx_fd_nvhostasgpu, 4, 0xfe, nvmap_objs[6].handle, 0x10000, 0, 0, 0, NULL);
-    if (R_SUCCEEDED(rc)) rc = nvioctlNvhostAsGpu_MapBufferEx(g_nvgfx_fd_nvhostasgpu, 4, 0xdb, nvmap_objs[6].handle, 0x10000, 0, 0, 0, &nvmap_obj6_mapbuffer_xdb_offset);
     if (R_SUCCEEDED(rc)) rc = nvOpen(&g_nvgfx_fd_nvhostctrl, "/dev/nvhost-ctrl");
+    if (R_SUCCEEDED(rc)) rc = nvmapobjInitialize(&nvmap_fb_obj, g_nvgfx_totalframebufs*g_gfx_singleframebuf_size);
+    if (R_SUCCEEDED(rc)) rc = nvmapobjSetup(&nvmap_fb_obj, 0, 0x1, 0x20000, 0);
 
     if (R_SUCCEEDED(rc))
     {
-        u32 pos;
-        for (pos=0; pos<g_nvgfx_totalframebufs; pos++) {
-            rc = nvioctlNvhostAsGpu_MapBufferEx(g_nvgfx_fd_nvhostasgpu, 0x100, 0xdb, framebuf_nvmap_handle, 0, pos*g_gfx_singleframebuf_size, g_gfx_singleframebuf_size, nvmap_obj6_mapbuffer_xdb_offset, NULL);
-            if (R_FAILED(rc)) break;
-        }
-    }
-
-    if (R_SUCCEEDED(rc))
-    {
-        u32 i;
-        for (i=0; i<2; i++)
+        u32 id = 0;
+        rc = nvioctlNvmap_GetId(g_nvgfx_fd_nvmap, nvmap_fb_obj.handle, &id);
+        if (R_SUCCEEDED(rc))
         {
-            u32 new_id = 0;
-            rc = nvioctlNvmap_GetId(g_nvgfx_fd_nvmap, nvmap_objs[6].handle, &new_id);
-
-            if (R_FAILED(rc))
-                break;
-
-            if (new_id == -1) {
-                rc = 6; // todo: Convert this error
-                break;
+            for (int i = 0; i < g_nvgfx_totalframebufs; i ++)
+            {
+                rc = _gfxGraphicBufferInit(i, id, nvmap_fb_obj.handle);
+                if (R_FAILED(rc))
+                    break;
             }
-
-            u32 new_nvmap_fd;
-            rc = nvioctlNvmap_FromId(g_nvgfx_fd_nvmap, new_id, &new_nvmap_fd);
-
-            if (R_FAILED(rc))
-                break;
-
-            rc = _gfxGraphicBufferInit(i, new_nvmap_fd);
-
-            if (R_FAILED(rc))
-                break;
         }
     }
 
     if (R_FAILED(rc)) {
-        nvClose(g_nvgfx_fd_nvhostgpu);
-        nvClose(g_nvgfx_fd_nvmap);
-        nvClose(g_nvgfx_fd_nvhostasgpu);
-        nvClose(g_nvgfx_fd_nvhostctrlgpu);
-        g_nvgfx_fd_nvhostgpu = 0;
-        g_nvgfx_fd_nvmap = 0;
-        g_nvgfx_fd_nvhostasgpu = 0;
-        g_nvgfx_fd_nvhostctrlgpu = 0;
-
-        nvmapobjCloseAll();
+        nvmapobjClose(&nvmap_fb_obj);
+        if (g_nvgfx_fd_nvhostctrl != -1) {
+            nvClose(g_nvgfx_fd_nvhostctrl);
+            g_nvgfx_fd_nvhostctrl = -1;
+        }
+        if (g_nvgfx_fd_nvmap != -1) {
+            nvClose(g_nvgfx_fd_nvmap);
+            g_nvgfx_fd_nvmap = -1;
+        }
     }
 
     if (R_SUCCEEDED(rc))
@@ -206,16 +117,15 @@ void nvgfxExit(void) {
     if (!g_nvgfxInitialized)
         return;
 
-    nvClose(g_nvgfx_fd_nvhostgpu);
-    nvClose(g_nvgfx_fd_nvmap);
-    nvClose(g_nvgfx_fd_nvhostasgpu);
-    nvClose(g_nvgfx_fd_nvhostctrlgpu);
-    g_nvgfx_fd_nvhostgpu = 0;
-    g_nvgfx_fd_nvmap = 0;
-    g_nvgfx_fd_nvhostasgpu = 0;
-    g_nvgfx_fd_nvhostctrlgpu = 0;
-
-    nvmapobjCloseAll();
+    nvmapobjClose(&nvmap_fb_obj);
+    if (g_nvgfx_fd_nvhostctrl != -1) {
+        nvClose(g_nvgfx_fd_nvhostctrl);
+        g_nvgfx_fd_nvhostctrl = -1;
+    }
+    if (g_nvgfx_fd_nvmap != -1) {
+        nvClose(g_nvgfx_fd_nvmap);
+        g_nvgfx_fd_nvmap = -1;
+    }
 
     g_nvgfxInitialized = false;
 }
@@ -238,11 +148,11 @@ Result nvgfxGetFramebuffer(u8 **buffer, size_t *size, u32 *handle)
         return MAKERESULT(Module_Libnx, LibnxError_NotInitialized);
 
     if (buffer != NULL)
-        *buffer = nvmap_objs[6].mem;
+        *buffer = nvmap_fb_obj.mem;
     if (size != NULL)
-        *size = nvmap_objs[6].mem_size;
+        *size = nvmap_fb_obj.mem_size;
     if (handle != NULL)
-        *handle = nvmap_objs[6].handle;
+        *handle = nvmap_fb_obj.handle;
 
     return 0;
 }