FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-07 01:51:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/nouveau: allow gpuobj vinst to be a virtual address when necessary

Browse Source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2010-11-22 10:48:51 +10:00
parent b571fe21f5
commit 34cf01bc4b
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/nouveau/nouveau_drv.h
View File

@ -158,6 +158,7 @@ enum nouveau_flags {
#define NVOBJ_FLAG_DONT_MAP (1 << 0) #define NVOBJ_FLAG_DONT_MAP (1 << 0)
#define NVOBJ_FLAG_ZERO_ALLOC (1 << 1) #define NVOBJ_FLAG_ZERO_ALLOC (1 << 1)
#define NVOBJ_FLAG_ZERO_FREE (1 << 2) #define NVOBJ_FLAG_ZERO_FREE (1 << 2)
#define NVOBJ_FLAG_VM (1 << 3)
#define NVOBJ_CINST_GLOBAL 0xdeadbeef #define NVOBJ_CINST_GLOBAL 0xdeadbeef

25
drivers/gpu/drm/nouveau/nv50_instmem.c
View File

@ -302,6 +302,7 @@ nv50_instmem_resume(struct drm_device *dev)
struct nv50_gpuobj_node { struct nv50_gpuobj_node {
struct nouveau_vram *vram; struct nouveau_vram *vram;
struct nouveau_vma chan_vma;
u32 align; u32 align;
}; };
@ -310,6 +311,7 @@ int
nv50_instmem_get(struct nouveau_gpuobj *gpuobj, u32 size, u32 align) nv50_instmem_get(struct nouveau_gpuobj *gpuobj, u32 size, u32 align)
{ {
struct drm_device *dev = gpuobj->dev; struct drm_device *dev = gpuobj->dev;
struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nv50_gpuobj_node *node = NULL; struct nv50_gpuobj_node *node = NULL;
int ret; int ret;
@ -328,8 +330,23 @@ nv50_instmem_get(struct nouveau_gpuobj *gpuobj, u32 size, u32 align)
} }
gpuobj->vinst = node->vram->offset; gpuobj->vinst = node->vram->offset;
gpuobj->size = size;
gpuobj->node = node; if (gpuobj->flags & NVOBJ_FLAG_VM) {
ret = nouveau_vm_get(dev_priv->chan_vm, size, 12,
NV_MEM_ACCESS_RW | NV_MEM_ACCESS_SYS,
&node->chan_vma);
if (ret) {
nv50_vram_del(dev, &node->vram);
kfree(node);
return ret;
}
nouveau_vm_map(&node->chan_vma, node->vram);
gpuobj->vinst = node->chan_vma.offset;
}
gpuobj->size = size;
gpuobj->node = node;
return 0; return 0;
} }
@ -342,6 +359,10 @@ nv50_instmem_put(struct nouveau_gpuobj *gpuobj)
node = gpuobj->node; node = gpuobj->node;
gpuobj->node = NULL; gpuobj->node = NULL;
if (node->chan_vma.node) {
nouveau_vm_unmap(&node->chan_vma);
nouveau_vm_put(&node->chan_vma);
}
nv50_vram_del(dev, &node->vram); nv50_vram_del(dev, &node->vram);
kfree(node); kfree(node);
} }