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

nvBufferCreate: use separate is_cpu_cacheable/is_gpu_cacheable parameters

Browse Source
This commit is contained in:
fincs 2018-10-17 00:32:47 +02:00
parent 86a25e1edd
commit fba43b0f10
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nx/include/switch/nvidia/buffer.h
View File

@ -13,14 +13,15 @@ typedef struct NvBuffer {
NvAddressSpace* addr_space; NvAddressSpace* addr_space;
NvKind kind; NvKind kind;
bool has_init; bool has_init;
bool is_cacheable; bool is_cpu_cacheable;
bool is_gpu_cacheable;
} NvBuffer; } NvBuffer;
Result nvBufferInit(void); Result nvBufferInit(void);
u32 nvBufferGetNvmapFd(void); u32 nvBufferGetNvmapFd(void);
void nvBufferExit(void); void nvBufferExit(void);
Result nvBufferCreate(NvBuffer* m, size_t size, u32 align, bool is_cacheable, NvKind kind, NvAddressSpace* as); Result nvBufferCreate(NvBuffer* m, size_t size, u32 align, bool is_cpu_cacheable, bool is_gpu_cacheable, NvKind kind, NvAddressSpace* as);
void nvBufferFree(NvBuffer* m); void nvBufferFree(NvBuffer* m);
void* nvBufferGetCpuAddr(NvBuffer* m); void* nvBufferGetCpuAddr(NvBuffer* m);

15
nx/source/nvidia/buffer.c
View File

@ -43,7 +43,7 @@ u32 nvBufferGetNvmapFd(void) {
} }
Result nvBufferCreate( Result nvBufferCreate(
NvBuffer* m, size_t size, u32 align, bool is_cacheable, NvKind kind, NvBuffer* m, size_t size, u32 align, bool is_cpu_cacheable, bool is_gpu_cacheable, NvKind kind,
NvAddressSpace* as) NvAddressSpace* as)
{ {
Result rc; Result rc;
@ -51,7 +51,8 @@ Result nvBufferCreate(
size = (size + align - 1) & ~(align - 1); size = (size + align - 1) & ~(align - 1);
m->has_init = true; m->has_init = true;
m->is_cacheable = is_cacheable; m->is_cpu_cacheable = is_cpu_cacheable;
m->is_gpu_cacheable = is_gpu_cacheable;
m->size = size; m->size = size;
m->fd = -1; m->fd = -1;
m->cpu_addr = memalign(align, size); m->cpu_addr = memalign(align, size);
@ -67,16 +68,16 @@ Result nvBufferCreate(
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
rc = nvioctlNvmap_Alloc(g_nvmap_fd, m->fd, rc = nvioctlNvmap_Alloc(g_nvmap_fd, m->fd,
0, is_cacheable ? 1 : 0, align, kind, m->cpu_addr); 0, is_cpu_cacheable ? 1 : 0, align, kind, m->cpu_addr);
if (R_SUCCEEDED(rc) && !is_cacheable) { if (R_SUCCEEDED(rc) && !is_cpu_cacheable) {
armDCacheFlush(m->cpu_addr, m->size); armDCacheFlush(m->cpu_addr, m->size);
svcSetMemoryAttribute(m->cpu_addr, m->size, 8, 8); svcSetMemoryAttribute(m->cpu_addr, m->size, 8, 8);
} }
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
rc = nvAddressSpaceMapBuffer(as, m->fd, rc = nvAddressSpaceMapBuffer(as, m->fd,
is_cacheable ? NvMapBufferFlags_IsCacheable : 0, NvKind_Pitch, &m->gpu_addr); is_gpu_cacheable ? NvMapBufferFlags_IsCacheable : 0, NvKind_Pitch, &m->gpu_addr);
if (R_FAILED(rc)) if (R_FAILED(rc))
nvBufferFree(m); nvBufferFree(m);
@ -105,7 +106,7 @@ void nvBufferFree(NvBuffer* m)
} }
if (m->cpu_addr) { if (m->cpu_addr) {
if (!m->is_cacheable) if (!m->is_cpu_cacheable)
svcSetMemoryAttribute(m->cpu_addr, m->size, 8, 0); svcSetMemoryAttribute(m->cpu_addr, m->size, 8, 0);
free(m->cpu_addr); free(m->cpu_addr);
@ -125,7 +126,7 @@ iova_t nvBufferGetGpuAddr(NvBuffer* m) {
Result nvBufferMapAsTexture(NvBuffer* m, NvKind kind) { Result nvBufferMapAsTexture(NvBuffer* m, NvKind kind) {
return nvAddressSpaceMapBuffer(m->addr_space, m->fd, return nvAddressSpaceMapBuffer(m->addr_space, m->fd,
m->is_cacheable ? NvMapBufferFlags_IsCacheable : 0, kind, &m->gpu_addr_texture); m->is_gpu_cacheable ? NvMapBufferFlags_IsCacheable : 0, kind, &m->gpu_addr_texture);
} }
iova_t nvBufferGetGpuAddrTexture(NvBuffer* m) { iova_t nvBufferGetGpuAddrTexture(NvBuffer* m) {

2
nx/source/nvidia/gpu/cmd_list.c
View File

@ -22,7 +22,7 @@ Result nvCmdListCreate(NvCmdList* c, NvGpu* parent, size_t max_cmds)
Result rc; Result rc;
rc = nvBufferCreate( rc = nvBufferCreate(
&c->buffer, max_cmds * 4, 0x1000, NvKind_Pitch, false, &c->buffer, max_cmds * 4, 0x1000, NvKind_Pitch, false, false,
&parent->addr_space); &parent->addr_space);
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {

2
nx/source/nvidia/gpu/zcull_ctx.c
View File

@ -25,7 +25,7 @@ Result nvZcullContextCreate(NvZcullContext* z, NvGpu* parent)
z->parent = parent; z->parent = parent;
rc = nvBufferCreate( rc = nvBufferCreate(
&z->ctx_buf, nvInfoGetZcullCtxSize(), 0x20000, NvKind_Pitch, true, &z->ctx_buf, nvInfoGetZcullCtxSize(), 0x20000, NvKind_Pitch, false, true,
&parent->addr_space); &parent->addr_space);
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))