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

Added nvioctlNvhostCtrl_EventSignal and nvioctlNvhostCtrl_EventWait. More nvgfx init.

Browse Source
This commit is contained in:
yellows8 2017-11-15 02:36:27 -05:00
parent 8d68cb401f
commit 0f0a4cd0fe
3 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nx/include/switch/gfx/nvioctl.h
View File

@ -75,6 +75,9 @@ enum nvioctl_channel_priority {
NVIOCTL_CHANNEL_PRIORITY_high = 0x96
};
Result nvioctlNvhostCtrl_EventSignal(u32 fd, u32 event_id);
Result nvioctlNvhostCtrl_EventWait(u32 fd, u32 unk0, u32 unk1, s32 timeout, u32 event_id, u32 *out);
Result nvioctlNvhostCtrlGpu_ZCullGetCtxSize(u32 fd, u32 *out);
Result nvioctlNvhostCtrlGpu_ZCullGetInfo(u32 fd, u32 out[40>>2]);
Result nvioctlNvhostCtrlGpu_GetCharacteristics(u32 fd, gpu_characteristics *out);

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

@ -14,6 +14,7 @@ static u32 g_nvgfx_fd_nvhostctrlgpu;
static u32 g_nvgfx_fd_nvhostasgpu;
static u32 g_nvgfx_fd_nvmap;
static u32 g_nvgfx_fd_nvhostgpu;
static u32 g_nvgfx_fd_nvhostctrl;
static gpu_characteristics g_nvgfx_gpu_characteristics;
static u64 g_nvgfx_nvhostasgpu_allocspace_offset;
@ -26,6 +27,7 @@ static nvioctl_fence g_nvgfx_nvhost_fence;
static nvioctl_fence g_nvgfx_nvhostgpu_gpfifo_fence;
static u8 *g_nvgfx_nvhost_userdata;
static size_t g_nvgfx_nvhost_userdata_size;
static u32 g_nvgfx_nvhostctrl_eventres;
static nvmapobj nvmap_objs[18];
@ -89,6 +91,7 @@ Result nvgfxInitialize(void) {
g_nvgfx_fd_nvhostasgpu = 0;
g_nvgfx_fd_nvmap = 0;
g_nvgfx_fd_nvhostgpu = 0;
g_nvgfx_fd_nvhostctrl = 0;
memset(nvmap_objs, 0, sizeof(nvmap_objs));
@ -102,6 +105,7 @@ Result nvgfxInitialize(void) {
g_nvgfx_nvhostasgpu_allocspace_offset = 0;
g_nvgfx_zcullctxsize = 0;
nvmap_obj6_mapbuffer_xdb_offset = 0;
g_nvgfx_nvhostctrl_eventres = 0;
//All of the below sizes for nvmapobjInitialize are from certain official sw.
if (R_SUCCEEDED(rc)) rc = nvmapobjInitialize(&nvmap_objs[0], 0x1000);
@ -275,13 +279,26 @@ Result nvgfxInitialize(void) {
if (R_SUCCEEDED(rc)) rc = nvioctlNvhostAsGpu_MapBufferEx(g_nvgfx_fd_nvhostasgpu, 5, 0, nvmap_objs[16].handle, 0x10000, 0, 0x10000, g_nvgfx_nvhostasgpu_allocspace_offset+0x10000+0x800000+0x10000+0x10000+0x10000, NULL);
if (R_SUCCEEDED(rc)) rc = nvioctlNvhostAsGpu_MapBufferEx(g_nvgfx_fd_nvhostasgpu, 4, 0xfe, nvmap_objs[16].handle, 0x10000, 0, 0, 0, NULL);
if (R_SUCCEEDED(rc)) rc = nvOpen(&g_nvgfx_fd_nvhostctrl, "/dev/nvhost-ctrl");
if (R_SUCCEEDED(rc)) {
do {
rc = nvioctlNvhostCtrl_EventWait(g_nvgfx_fd_nvhostctrl, 0x42, 0x1ca7, 0x64, 0, &g_nvgfx_nvhostctrl_eventres);
} while(rc==5);//timeout error
}
//Currently broken.
//if (R_SUCCEEDED(rc)) rc = nvioctlNvhostCtrl_EventSignal(g_nvgfx_fd_nvhostctrl, g_nvgfx_nvhostctrl_eventres);
//if (R_SUCCEEDED(rc)) rc = -1;
if (R_FAILED(rc)) {
nvClose(g_nvgfx_fd_nvhostctrl);
nvClose(g_nvgfx_fd_nvhostgpu);
nvClose(g_nvgfx_fd_nvmap);
nvClose(g_nvgfx_fd_nvhostasgpu);
nvClose(g_nvgfx_fd_nvhostctrlgpu);
g_nvgfx_fd_nvhostctrl = 0;
g_nvgfx_fd_nvhostgpu = 0;
g_nvgfx_fd_nvmap = 0;
g_nvgfx_fd_nvhostasgpu = 0;
@ -303,10 +320,12 @@ Result nvgfxInitialize(void) {
void nvgfxExit(void) {
if(!g_nvgfxInitialized)return;
nvClose(g_nvgfx_fd_nvhostctrl);
nvClose(g_nvgfx_fd_nvhostgpu);
nvClose(g_nvgfx_fd_nvmap);
nvClose(g_nvgfx_fd_nvhostasgpu);
nvClose(g_nvgfx_fd_nvhostctrlgpu);
g_nvgfx_fd_nvhostctrl = 0;
g_nvgfx_fd_nvhostgpu = 0;
g_nvgfx_fd_nvmap = 0;
g_nvgfx_fd_nvhostasgpu = 0;

35
nx/source/gfx/nvioctl.c
View File

@ -1,6 +1,41 @@
#include <string.h>
#include <switch.h>
Result nvioctlNvhostCtrl_EventSignal(u32 fd, u32 event_id) {
struct {
u32 event_id; //in ranges from 0x01 to 0x3F
} data;
memset(&data, 0, sizeof(data));
data.event_id = event_id;
return nvIoctl(fd, _IOWR(0x00, 0x1C, data), &data);
}
Result nvioctlNvhostCtrl_EventWait(u32 fd, u32 unk0, u32 unk1, s32 timeout, u32 event_id, u32 *out) {
Result rc = 0;
struct {
u32 unk0;//in
u32 unk1;//in
s32 timeout;//in
u32 event;// in=event_id; out=result
} data;
memset(&data, 0, sizeof(data));
data.unk0 = unk0;
data.unk1 = unk1;
data.timeout = timeout;
data.event = event_id;
rc = nvIoctl(fd, _IOWR(0x00, 0x1D, data), &data);
if (R_FAILED(rc)) return rc;
if(out) *out = data.event;
return rc;
}
Result nvioctlNvhostCtrlGpu_ZCullGetCtxSize(u32 fd, u32 *out) {
Result rc = 0;