mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-21 12:32:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Store nvmap obj state inside of a dedicated obj struct + funcs for using that, etc.

Browse Source
This commit is contained in:
yellows8 2017-11-14 15:51:34 -05:00
parent 20ec051ca4
commit 31b945dff9
1 changed files with 57 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
nx/source/gfx/nvgfx.c
View File

@ -2,11 +2,17 @@
#include <malloc.h> #include <malloc.h>
#include <switch.h> #include <switch.h>
typedef struct {
bool initialized;
u32 handle;
u8 *mem;
size_t mem_size;
} nvmapobj;
static bool g_nvgfxInitialized = 0; static bool g_nvgfxInitialized = 0;
static u32 g_nvgfx_fd_nvhostctrlgpu; static u32 g_nvgfx_fd_nvhostctrlgpu;
static u32 g_nvgfx_fd_nvhostasgpu; static u32 g_nvgfx_fd_nvhostasgpu;
static u32 g_nvgfx_fd_nvmap; static u32 g_nvgfx_fd_nvmap;
static u32 g_nvgfx_nvmapobj0, g_nvgfx_nvmapobj1;
static gpu_characteristics g_nvgfx_gpu_characteristics; static gpu_characteristics g_nvgfx_gpu_characteristics;
static u64 g_nvgfx_nvhostasgpu_allocspace_offset; static u64 g_nvgfx_nvhostasgpu_allocspace_offset;
@ -16,8 +22,42 @@ static u32 g_nvgfx_zcullinfo[40>>2];
static nvioctl_va_region g_nvgfx_nvhostasgpu_varegions[2]; static nvioctl_va_region g_nvgfx_nvhostasgpu_varegions[2];
static nvioctl_l2_state g_nvgfx_l2state; static nvioctl_l2_state g_nvgfx_l2state;
static u8 *g_nvgfx_nvmap0_mem, *g_nvgfx_nvmap1_mem; nvmapobj nvmap_objs[2];
size_t g_nvgfx_nvmap0_mem_size, g_nvgfx_nvmap1_mem_size;
Result nvmapobjInitialize(nvmapobj *obj, size_t size) {
Result rc=0;
if(obj->initialized)return 0;
memset(obj, 0, sizeof(nvmapobj));
obj->mem_size = size;
obj->mem = memalign(0x1000, size);
if (obj->mem==NULL) rc = MAKERESULT(MODULE_LIBNX, LIBNX_OUTOFMEM);
if (R_SUCCEEDED(rc)) memset(obj->mem, 0, size);
if (R_SUCCEEDED(rc)) obj->initialized = 1;
return rc;
}
void nvmapobjClose(nvmapobj *obj) {
if(!obj->initialized)return;
if (obj->mem) {
free(obj->mem);
obj->mem = NULL;
}
memset(obj, 0, sizeof(nvmapobj));
}
void nvmapobjCloseAll(void) {
u32 pos=0;
for(pos=0; pos<sizeof(nvmap_objs)/sizeof(nvmapobj); pos++) nvmapobjClose(&nvmap_objs[pos]);
}
Result nvgfxInitialize(void) { Result nvgfxInitialize(void) {
Result rc=0; Result rc=0;
@ -26,10 +66,8 @@ Result nvgfxInitialize(void) {
g_nvgfx_fd_nvhostctrlgpu = 0; g_nvgfx_fd_nvhostctrlgpu = 0;
g_nvgfx_fd_nvhostasgpu = 0; g_nvgfx_fd_nvhostasgpu = 0;
g_nvgfx_fd_nvmap = 0; g_nvgfx_fd_nvmap = 0;
g_nvgfx_nvmapobj0 = 0;
g_nvgfx_nvmapobj1 = 0; memset(nvmap_objs, 0, sizeof(nvmap_objs));
g_nvgfx_nvmap0_mem = NULL;
g_nvgfx_nvmap1_mem = NULL;
memset(&g_nvgfx_gpu_characteristics, 0, sizeof(gpu_characteristics)); memset(&g_nvgfx_gpu_characteristics, 0, sizeof(gpu_characteristics));
memset(g_nvgfx_tpcmasks, 0, sizeof(g_nvgfx_tpcmasks)); memset(g_nvgfx_tpcmasks, 0, sizeof(g_nvgfx_tpcmasks));
@ -39,20 +77,8 @@ Result nvgfxInitialize(void) {
g_nvgfx_nvhostasgpu_allocspace_offset = 0; g_nvgfx_nvhostasgpu_allocspace_offset = 0;
g_nvgfx_zcullctxsize = 0; g_nvgfx_zcullctxsize = 0;
g_nvgfx_nvmap0_mem_size = 0x1000; if (R_SUCCEEDED(rc)) rc = nvmapobjInitialize(&nvmap_objs[0], 0x1000);
g_nvgfx_nvmap1_mem_size = 0x10000; if (R_SUCCEEDED(rc)) rc = nvmapobjInitialize(&nvmap_objs[1], 0x10000);
if (R_SUCCEEDED(rc)) {
g_nvgfx_nvmap0_mem = memalign(0x1000, g_nvgfx_nvmap0_mem_size);
if (g_nvgfx_nvmap0_mem==NULL) rc = MAKERESULT(MODULE_LIBNX, LIBNX_OUTOFMEM);
if (R_SUCCEEDED(rc)) memset(g_nvgfx_nvmap0_mem, 0, g_nvgfx_nvmap0_mem_size);
}
if (R_SUCCEEDED(rc)) {
g_nvgfx_nvmap1_mem = memalign(0x1000, g_nvgfx_nvmap1_mem_size);
if (g_nvgfx_nvmap1_mem==NULL) rc = MAKERESULT(MODULE_LIBNX, LIBNX_OUTOFMEM);
if (R_SUCCEEDED(rc)) memset(g_nvgfx_nvmap1_mem, 0, g_nvgfx_nvmap1_mem_size);
}
//Officially NVHOST_IOCTL_CTRL_GET_CONFIG is used a lot (here and later), skip that. //Officially NVHOST_IOCTL_CTRL_GET_CONFIG is used a lot (here and later), skip that.
@ -76,17 +102,17 @@ Result nvgfxInitialize(void) {
if (R_SUCCEEDED(rc)) rc = nvioctlNvhostAsGpu_AllocSpace(g_nvgfx_fd_nvhostasgpu, 0x10000, 0x20000, 0, 0x10000, &g_nvgfx_nvhostasgpu_allocspace_offset); if (R_SUCCEEDED(rc)) rc = nvioctlNvhostAsGpu_AllocSpace(g_nvgfx_fd_nvhostasgpu, 0x10000, 0x20000, 0, 0x10000, &g_nvgfx_nvhostasgpu_allocspace_offset);
if (R_SUCCEEDED(rc)) rc = nvOpen(&g_nvgfx_fd_nvmap, "/dev/nvmap"); if (R_SUCCEEDED(rc)) rc = nvOpen(&g_nvgfx_fd_nvmap, "/dev/nvmap");
if (R_SUCCEEDED(rc)) rc = nvioctlNvmap_Create(g_nvgfx_fd_nvmap, g_nvgfx_nvmap0_mem_size, &g_nvgfx_nvmapobj0); if (R_SUCCEEDED(rc)) rc = nvioctlNvmap_Create(g_nvgfx_fd_nvmap, nvmap_objs[0].mem_size, &nvmap_objs[0].handle);
if (R_SUCCEEDED(rc)) rc = nvioctlNvmap_Alloc(g_nvgfx_fd_nvmap, g_nvgfx_nvmapobj0, 0, 0, 0x20000, 0, g_nvgfx_nvmap0_mem); if (R_SUCCEEDED(rc)) rc = nvioctlNvmap_Alloc(g_nvgfx_fd_nvmap, nvmap_objs[0].handle, 0, 0, 0x20000, 0, nvmap_objs[0].mem);
if (R_SUCCEEDED(rc)) rc = nvioctlNvhostAsGpu_MapBufferEx(g_nvgfx_fd_nvhostasgpu, 0, 0, g_nvgfx_nvmapobj0, 0x10000, 0, 0, 0, NULL); if (R_SUCCEEDED(rc)) rc = nvioctlNvhostAsGpu_MapBufferEx(g_nvgfx_fd_nvhostasgpu, 0, 0, nvmap_objs[0].handle, 0x10000, 0, 0, 0, NULL);
if (R_SUCCEEDED(rc)) rc = nvioctlNvhostAsGpu_MapBufferEx(g_nvgfx_fd_nvhostasgpu, 0, 0xfe, g_nvgfx_nvmapobj0, 0x10000, 0, 0, 0, NULL); if (R_SUCCEEDED(rc)) rc = nvioctlNvhostAsGpu_MapBufferEx(g_nvgfx_fd_nvhostasgpu, 0, 0xfe, nvmap_objs[0].handle, 0x10000, 0, 0, 0, NULL);
if (R_SUCCEEDED(rc)) rc = nvioctlNvmap_Create(g_nvgfx_fd_nvmap, g_nvgfx_nvmap1_mem_size, &g_nvgfx_nvmapobj1); if (R_SUCCEEDED(rc)) rc = nvioctlNvmap_Create(g_nvgfx_fd_nvmap, nvmap_objs[1].mem_size, &nvmap_objs[1].handle);
if (R_SUCCEEDED(rc)) rc = nvioctlNvmap_Alloc(g_nvgfx_fd_nvmap, g_nvgfx_nvmapobj1, 0, 0, 0x20000, 0, g_nvgfx_nvmap1_mem); if (R_SUCCEEDED(rc)) rc = nvioctlNvmap_Alloc(g_nvgfx_fd_nvmap, nvmap_objs[1].handle, 0, 0, 0x20000, 0, nvmap_objs[1].mem);
if (R_SUCCEEDED(rc)) rc = nvioctlNvhostAsGpu_MapBufferEx(g_nvgfx_fd_nvhostasgpu, 5, 0, g_nvgfx_nvmapobj1, 0x10000, 0, 0x10000, g_nvgfx_nvhostasgpu_allocspace_offset, NULL); if (R_SUCCEEDED(rc)) rc = nvioctlNvhostAsGpu_MapBufferEx(g_nvgfx_fd_nvhostasgpu, 5, 0, nvmap_objs[1].handle, 0x10000, 0, 0x10000, g_nvgfx_nvhostasgpu_allocspace_offset, NULL);
if (R_SUCCEEDED(rc)) rc = nvioctlNvhostAsGpu_MapBufferEx(g_nvgfx_fd_nvhostasgpu, 4, 0xfe, g_nvgfx_nvmapobj1, 0x10000, 0, 0, 0, NULL); if (R_SUCCEEDED(rc)) rc = nvioctlNvhostAsGpu_MapBufferEx(g_nvgfx_fd_nvhostasgpu, 4, 0xfe, nvmap_objs[1].handle, 0x10000, 0, 0, 0, NULL);
if (R_SUCCEEDED(rc)) rc = nvioctlNvhostCtrlGpu_GetL2State(g_nvgfx_fd_nvhostctrlgpu, &g_nvgfx_l2state); if (R_SUCCEEDED(rc)) rc = nvioctlNvhostCtrlGpu_GetL2State(g_nvgfx_fd_nvhostctrlgpu, &g_nvgfx_l2state);
//if (R_SUCCEEDED(rc)) rc = -1; //if (R_SUCCEEDED(rc)) rc = -1;
@ -96,15 +122,7 @@ Result nvgfxInitialize(void) {
nvClose(g_nvgfx_fd_nvhostasgpu); nvClose(g_nvgfx_fd_nvhostasgpu);
nvClose(g_nvgfx_fd_nvhostctrlgpu); nvClose(g_nvgfx_fd_nvhostctrlgpu);
if (g_nvgfx_nvmap0_mem) { nvmapobjCloseAll();
free(g_nvgfx_nvmap0_mem);
g_nvgfx_nvmap0_mem = NULL;
}
if (g_nvgfx_nvmap1_mem) {
free(g_nvgfx_nvmap1_mem);
g_nvgfx_nvmap1_mem = NULL;
}
} }
if (R_SUCCEEDED(rc)) g_nvgfxInitialized = 1; if (R_SUCCEEDED(rc)) g_nvgfxInitialized = 1;
@ -122,15 +140,7 @@ void nvgfxExit(void) {
g_nvgfx_fd_nvhostasgpu = 0; g_nvgfx_fd_nvhostasgpu = 0;
g_nvgfx_fd_nvhostctrlgpu = 0; g_nvgfx_fd_nvhostctrlgpu = 0;
if (g_nvgfx_nvmap0_mem) { nvmapobjCloseAll();
free(g_nvgfx_nvmap0_mem);
g_nvgfx_nvmap0_mem = NULL;
}
if (g_nvgfx_nvmap1_mem) {
free(g_nvgfx_nvmap1_mem);
g_nvgfx_nvmap1_mem = NULL;
}
g_nvgfxInitialized = 0; g_nvgfxInitialized = 0;
} }