diff options
Diffstat (limited to 'drm/nouveau/nouveau_gem.c')
-rw-r--r-- | drm/nouveau/nouveau_gem.c | 106 |
1 files changed, 52 insertions, 54 deletions
diff --git a/drm/nouveau/nouveau_gem.c b/drm/nouveau/nouveau_gem.c index 5e45e1d98..35c8a28bd 100644 --- a/drm/nouveau/nouveau_gem.c +++ b/drm/nouveau/nouveau_gem.c @@ -175,60 +175,6 @@ nouveau_gem_object_close(struct drm_gem_object *gem, struct drm_file *file_priv) } int -nouveau_gem_ioctl_set_tiling(struct drm_device *dev, void *data, - struct drm_file *file_priv) -{ - struct nouveau_drm *drm = nouveau_drm(dev); - struct nouveau_cli *cli = nouveau_cli(file_priv); - struct nvkm_fb *pfb = nvxx_fb(&drm->device); - struct drm_nouveau_gem_set_tiling *req = data; - struct drm_gem_object *gem; - struct nouveau_bo *nvbo; - struct nvkm_vma *vma; - int ret = 0; - - if (!nvkm_fb_memtype_valid(pfb, req->tile_flags)) { - NV_PRINTK(err, cli, "bad page flags: 0x%08x\n", req->tile_flags); - return -EINVAL; - } - - gem = drm_gem_object_lookup(dev, file_priv, req->handle); - if (!gem) - return -ENOENT; - - nvbo = nouveau_gem_object(gem); - - /* We can only change tiling on PRIME-imported buffers */ - if (nvbo->bo.type != ttm_bo_type_sg) { - ret = -EINVAL; - goto out; - } - - if (nvbo->tile_mode != req->tile_mode || - nvbo->tile_flags != req->tile_flags) { - ret = ttm_bo_reserve(&nvbo->bo, false, false, false, NULL); - if (ret) - goto out; - - nvbo->tile_mode = req->tile_mode; - nvbo->tile_flags = req->tile_flags; - - nouveau_bo_update_tiling(drm, nvbo, nvbo->bo.mem.mm_node); - - /* remap over existing mapping with new tile parameters */ - vma = nouveau_bo_vma_find(nvbo, cli->vm); - if (vma) - nvkm_vm_map(vma, nvbo->bo.mem.mm_node); - - ttm_bo_unreserve(&nvbo->bo); - } - -out: - drm_gem_object_unreference_unlocked(gem); - return ret; -} - -int nouveau_gem_new(struct drm_device *dev, int size, int align, uint32_t domain, uint32_t tile_mode, uint32_t tile_flags, struct nouveau_bo **pnvbo) @@ -1102,3 +1048,55 @@ nouveau_gem_ioctl_info(struct drm_device *dev, void *data, return ret; } +int +nouveau_gem_ioctl_set_info(struct drm_device *dev, void *data, + struct drm_file *file_priv) +{ + struct nouveau_drm *drm = nouveau_drm(dev); + struct nouveau_cli *cli = nouveau_cli(file_priv); + struct nvkm_fb *pfb = nvxx_fb(&drm->device); + struct drm_nouveau_gem_info *req = data; + struct drm_gem_object *gem; + struct nouveau_bo *nvbo; + struct nvkm_vma *vma; + int ret = 0; + + if (!nvkm_fb_memtype_valid(pfb, req->tile_flags)) { + NV_PRINTK(err, cli, "bad page flags: 0x%08x\n", req->tile_flags); + return -EINVAL; + } + + gem = drm_gem_object_lookup(dev, file_priv, req->handle); + if (!gem) + return -ENOENT; + nvbo = nouveau_gem_object(gem); + + /* We can only change info of PRIME-imported buffers */ + if (nvbo->bo.type != ttm_bo_type_sg) { + ret = -EINVAL; + goto out; + } + + ret = ttm_bo_reserve(&nvbo->bo, false, false, false, NULL); + if (ret) + goto out; + + if (nvbo->tile_mode != req->tile_mode || + nvbo->tile_flags != req->tile_flags) { + nvbo->tile_mode = req->tile_mode; + nvbo->tile_flags = req->tile_flags; + + nouveau_bo_update_tiling(drm, nvbo, nvbo->bo.mem.mm_node); + + /* remap over existing mapping with new tile parameters */ + vma = nouveau_bo_vma_find(nvbo, cli->vm); + if (vma) + nvkm_vm_map(vma, nvbo->bo.mem.mm_node); + } + + ttm_bo_unreserve(&nvbo->bo); + +out: + drm_gem_object_unreference_unlocked(gem); + return ret; +} |