Merge branch 'smack-for-3.19' of git://git.gitorious.org/smack-next/kernel into next

[cascardo/linux.git] / drivers / gpu / drm / nouveau / nouveau_gem.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index df9d451..292a677 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
@@ -24,8 +24,6 @@
  *
  */
 
-#include <subdev/fb.h>
-
 #include "nouveau_drm.h"
 #include "nouveau_dma.h"
 #include "nouveau_fence.h"
@@ -58,14 +56,14 @@ nouveau_gem_object_open(struct drm_gem_object *gem, struct drm_file *file_priv)
        struct nouveau_vma *vma;
        int ret;
 
-       if (!cli->base.vm)
+       if (!cli->vm)
                return 0;
 
        ret = ttm_bo_reserve(&nvbo->bo, false, false, false, NULL);
        if (ret)
                return ret;
 
-       vma = nouveau_bo_vma_find(nvbo, cli->base.vm);
+       vma = nouveau_bo_vma_find(nvbo, cli->vm);
        if (!vma) {
                vma = kzalloc(sizeof(*vma), GFP_KERNEL);
                if (!vma) {
@@ -73,7 +71,7 @@ nouveau_gem_object_open(struct drm_gem_object *gem, struct drm_file *file_priv)
                        goto out;
                }
 
-               ret = nouveau_bo_vma_add(nvbo, cli->base.vm, vma);
+               ret = nouveau_bo_vma_add(nvbo, cli->vm, vma);
                if (ret) {
                        kfree(vma);
                        goto out;
@@ -129,14 +127,14 @@ nouveau_gem_object_close(struct drm_gem_object *gem, struct drm_file *file_priv)
        struct nouveau_vma *vma;
        int ret;
 
-       if (!cli->base.vm)
+       if (!cli->vm)
                return;
 
        ret = ttm_bo_reserve(&nvbo->bo, false, false, false, NULL);
        if (ret)
                return;
 
-       vma = nouveau_bo_vma_find(nvbo, cli->base.vm);
+       vma = nouveau_bo_vma_find(nvbo, cli->vm);
        if (vma) {
                if (--vma->refcount == 0)
                        nouveau_gem_object_unmap(nvbo, vma);
@@ -173,7 +171,7 @@ nouveau_gem_new(struct drm_device *dev, int size, int align, uint32_t domain,
         */
        nvbo->valid_domains = NOUVEAU_GEM_DOMAIN_VRAM |
                              NOUVEAU_GEM_DOMAIN_GART;
-       if (nv_device(drm->device)->card_type >= NV_50)
+       if (drm->device.info.family >= NV_DEVICE_INFO_V0_TESLA)
                nvbo->valid_domains &= domain;
 
        /* Initialize the embedded gem-object. We return a single gem-reference
@@ -202,8 +200,8 @@ nouveau_gem_info(struct drm_file *file_priv, struct drm_gem_object *gem,
                rep->domain = NOUVEAU_GEM_DOMAIN_VRAM;
 
        rep->offset = nvbo->bo.offset;
-       if (cli->base.vm) {
-               vma = nouveau_bo_vma_find(nvbo, cli->base.vm);
+       if (cli->vm) {
+               vma = nouveau_bo_vma_find(nvbo, cli->vm);
                if (!vma)
                        return -EINVAL;
 
@@ -223,13 +221,13 @@ nouveau_gem_ioctl_new(struct drm_device *dev, void *data,
 {
        struct nouveau_drm *drm = nouveau_drm(dev);
        struct nouveau_cli *cli = nouveau_cli(file_priv);
-       struct nouveau_fb *pfb = nouveau_fb(drm->device);
+       struct nouveau_fb *pfb = nvkm_fb(&drm->device);
        struct drm_nouveau_gem_new *req = data;
        struct nouveau_bo *nvbo = NULL;
        int ret = 0;
 
        if (!pfb->memtype_valid(pfb, req->info.tile_flags)) {
-               NV_ERROR(cli, "bad page flags: 0x%08x\n", req->info.tile_flags);
+               NV_PRINTK(error, cli, "bad page flags: 0x%08x\n", req->info.tile_flags);
                return -EINVAL;
        }
 
@@ -350,7 +348,7 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv,
        ww_acquire_init(&op->ticket, &reservation_ww_class);
 retry:
        if (++trycnt > 100000) {
-               NV_ERROR(cli, "%s failed and gave up.\n", __func__);
+               NV_PRINTK(error, cli, "%s failed and gave up.\n", __func__);
                return -EINVAL;
        }
 
@@ -361,7 +359,7 @@ retry:
 
                gem = drm_gem_object_lookup(dev, file_priv, b->handle);
                if (!gem) {
-                       NV_ERROR(cli, "Unknown handle 0x%08x\n", b->handle);
+                       NV_PRINTK(error, cli, "Unknown handle 0x%08x\n", b->handle);
                        ww_acquire_done(&op->ticket);
                        validate_fini(op, NULL);
                        return -ENOENT;
@@ -374,7 +372,7 @@ retry:
                }
 
                if (nvbo->reserved_by && nvbo->reserved_by == file_priv) {
-                       NV_ERROR(cli, "multiple instances of buffer %d on "
+                       NV_PRINTK(error, cli, "multiple instances of buffer %d on "
                                      "validation list\n", b->handle);
                        drm_gem_object_unreference_unlocked(gem);
                        ww_acquire_done(&op->ticket);
@@ -396,7 +394,7 @@ retry:
                                ww_acquire_fini(&op->ticket);
                                drm_gem_object_unreference_unlocked(gem);
                                if (ret != -ERESTARTSYS)
-                                       NV_ERROR(cli, "fail reserve\n");
+                                       NV_PRINTK(error, cli, "fail reserve\n");
                                return ret;
                        }
                }
@@ -414,7 +412,7 @@ retry:
                if (b->valid_domains & NOUVEAU_GEM_DOMAIN_GART)
                        list_add_tail(&nvbo->entry, &op->gart_list);
                else {
-                       NV_ERROR(cli, "invalid valid domains: 0x%08x\n",
+                       NV_PRINTK(error, cli, "invalid valid domains: 0x%08x\n",
                                 b->valid_domains);
                        list_add_tail(&nvbo->entry, &op->both_list);
                        ww_acquire_done(&op->ticket);
@@ -465,24 +463,24 @@ validate_list(struct nouveau_channel *chan, struct nouveau_cli *cli,
                                             b->write_domains,
                                             b->valid_domains);
                if (unlikely(ret)) {
-                       NV_ERROR(cli, "fail set_domain\n");
+                       NV_PRINTK(error, cli, "fail set_domain\n");
                        return ret;
                }
 
                ret = nouveau_bo_validate(nvbo, true, false);
                if (unlikely(ret)) {
                        if (ret != -ERESTARTSYS)
-                               NV_ERROR(cli, "fail ttm_validate\n");
+                               NV_PRINTK(error, cli, "fail ttm_validate\n");
                        return ret;
                }
 
                ret = validate_sync(chan, nvbo);
                if (unlikely(ret)) {
-                       NV_ERROR(cli, "fail post-validate sync\n");
+                       NV_PRINTK(error, cli, "fail post-validate sync\n");
                        return ret;
                }
 
-               if (nv_device(drm->device)->card_type < NV_50) {
+               if (drm->device.info.family < NV_DEVICE_INFO_V0_TESLA) {
                        if (nvbo->bo.offset == b->presumed.offset &&
                            ((nvbo->bo.mem.mem_type == TTM_PL_VRAM &&
                              b->presumed.domain & NOUVEAU_GEM_DOMAIN_VRAM) ||
@@ -527,14 +525,14 @@ nouveau_gem_pushbuf_validate(struct nouveau_channel *chan,
        ret = validate_init(chan, file_priv, pbbo, nr_buffers, op);
        if (unlikely(ret)) {
                if (ret != -ERESTARTSYS)
-                       NV_ERROR(cli, "validate_init\n");
+                       NV_PRINTK(error, cli, "validate_init\n");
                return ret;
        }
 
        ret = validate_list(chan, cli, &op->vram_list, pbbo, user_buffers);
        if (unlikely(ret < 0)) {
                if (ret != -ERESTARTSYS)
-                       NV_ERROR(cli, "validate vram_list\n");
+                       NV_PRINTK(error, cli, "validate vram_list\n");
                validate_fini(op, NULL);
                return ret;
        }
@@ -543,7 +541,7 @@ nouveau_gem_pushbuf_validate(struct nouveau_channel *chan,
        ret = validate_list(chan, cli, &op->gart_list, pbbo, user_buffers);
        if (unlikely(ret < 0)) {
                if (ret != -ERESTARTSYS)
-                       NV_ERROR(cli, "validate gart_list\n");
+                       NV_PRINTK(error, cli, "validate gart_list\n");
                validate_fini(op, NULL);
                return ret;
        }
@@ -552,7 +550,7 @@ nouveau_gem_pushbuf_validate(struct nouveau_channel *chan,
        ret = validate_list(chan, cli, &op->both_list, pbbo, user_buffers);
        if (unlikely(ret < 0)) {
                if (ret != -ERESTARTSYS)
-                       NV_ERROR(cli, "validate both_list\n");
+                       NV_PRINTK(error, cli, "validate both_list\n");
                validate_fini(op, NULL);
                return ret;
        }
@@ -613,7 +611,7 @@ nouveau_gem_pushbuf_reloc_apply(struct nouveau_cli *cli,
                uint32_t data;
 
                if (unlikely(r->bo_index > req->nr_buffers)) {
-                       NV_ERROR(cli, "reloc bo index invalid\n");
+                       NV_PRINTK(error, cli, "reloc bo index invalid\n");
                        ret = -EINVAL;
                        break;
                }
@@ -623,7 +621,7 @@ nouveau_gem_pushbuf_reloc_apply(struct nouveau_cli *cli,
                        continue;
 
                if (unlikely(r->reloc_bo_index > req->nr_buffers)) {
-                       NV_ERROR(cli, "reloc container bo index invalid\n");
+                       NV_PRINTK(error, cli, "reloc container bo index invalid\n");
                        ret = -EINVAL;
                        break;
                }
@@ -631,7 +629,7 @@ nouveau_gem_pushbuf_reloc_apply(struct nouveau_cli *cli,
 
                if (unlikely(r->reloc_bo_offset + 4 >
                             nvbo->bo.mem.num_pages << PAGE_SHIFT)) {
-                       NV_ERROR(cli, "reloc outside of bo\n");
+                       NV_PRINTK(error, cli, "reloc outside of bo\n");
                        ret = -EINVAL;
                        break;
                }
@@ -640,7 +638,7 @@ nouveau_gem_pushbuf_reloc_apply(struct nouveau_cli *cli,
                        ret = ttm_bo_kmap(&nvbo->bo, 0, nvbo->bo.mem.num_pages,
                                          &nvbo->kmap);
                        if (ret) {
-                               NV_ERROR(cli, "failed kmap for reloc\n");
+                               NV_PRINTK(error, cli, "failed kmap for reloc\n");
                                break;
                        }
                        nvbo->validate_mapped = true;
@@ -665,7 +663,7 @@ nouveau_gem_pushbuf_reloc_apply(struct nouveau_cli *cli,
                ret = ttm_bo_wait(&nvbo->bo, false, false, false);
                spin_unlock(&nvbo->bo.bdev->fence_lock);
                if (ret) {
-                       NV_ERROR(cli, "reloc wait_idle failed: %d\n", ret);
+                       NV_PRINTK(error, cli, "reloc wait_idle failed: %d\n", ret);
                        break;
                }
 
@@ -696,7 +694,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
                return -ENOMEM;
 
        list_for_each_entry(temp, &abi16->channels, head) {
-               if (temp->chan->handle == (NVDRM_CHAN | req->channel)) {
+               if (temp->chan->object->handle == (NVDRM_CHAN | req->channel)) {
                        chan = temp->chan;
                        break;
                }
@@ -711,19 +709,19 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
                goto out_next;
 
        if (unlikely(req->nr_push > NOUVEAU_GEM_MAX_PUSH)) {
-               NV_ERROR(cli, "pushbuf push count exceeds limit: %d max %d\n",
+               NV_PRINTK(error, cli, "pushbuf push count exceeds limit: %d max %d\n",
                         req->nr_push, NOUVEAU_GEM_MAX_PUSH);
                return nouveau_abi16_put(abi16, -EINVAL);
        }
 
        if (unlikely(req->nr_buffers > NOUVEAU_GEM_MAX_BUFFERS)) {
-               NV_ERROR(cli, "pushbuf bo count exceeds limit: %d max %d\n",
+               NV_PRINTK(error, cli, "pushbuf bo count exceeds limit: %d max %d\n",
                         req->nr_buffers, NOUVEAU_GEM_MAX_BUFFERS);
                return nouveau_abi16_put(abi16, -EINVAL);
        }
 
        if (unlikely(req->nr_relocs > NOUVEAU_GEM_MAX_RELOCS)) {
-               NV_ERROR(cli, "pushbuf reloc count exceeds limit: %d max %d\n",
+               NV_PRINTK(error, cli, "pushbuf reloc count exceeds limit: %d max %d\n",
                         req->nr_relocs, NOUVEAU_GEM_MAX_RELOCS);
                return nouveau_abi16_put(abi16, -EINVAL);
        }
@@ -741,7 +739,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
        /* Ensure all push buffers are on validate list */
        for (i = 0; i < req->nr_push; i++) {
                if (push[i].bo_index >= req->nr_buffers) {
-                       NV_ERROR(cli, "push %d buffer not in list\n", i);
+                       NV_PRINTK(error, cli, "push %d buffer not in list\n", i);
                        ret = -EINVAL;
                        goto out_prevalid;
                }
@@ -752,7 +750,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
                                           req->nr_buffers, &op, &do_reloc);
        if (ret) {
                if (ret != -ERESTARTSYS)
-                       NV_ERROR(cli, "validate: %d\n", ret);
+                       NV_PRINTK(error, cli, "validate: %d\n", ret);
                goto out_prevalid;
        }
 
@@ -760,7 +758,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
        if (do_reloc) {
                ret = nouveau_gem_pushbuf_reloc_apply(cli, req, bo);
                if (ret) {
-                       NV_ERROR(cli, "reloc apply: %d\n", ret);
+                       NV_PRINTK(error, cli, "reloc apply: %d\n", ret);
                        goto out;
                }
        }
@@ -768,7 +766,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
        if (chan->dma.ib_max) {
                ret = nouveau_dma_wait(chan, req->nr_push + 1, 16);
                if (ret) {
-                       NV_ERROR(cli, "nv50cal_space: %d\n", ret);
+                       NV_PRINTK(error, cli, "nv50cal_space: %d\n", ret);
                        goto out;
                }
 
@@ -780,10 +778,10 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
                                      push[i].length);
                }
        } else
-       if (nv_device(drm->device)->chipset >= 0x25) {
+       if (drm->device.info.chipset >= 0x25) {
                ret = RING_SPACE(chan, req->nr_push * 2);
                if (ret) {
-                       NV_ERROR(cli, "cal_space: %d\n", ret);
+                       NV_PRINTK(error, cli, "cal_space: %d\n", ret);
                        goto out;
                }
 
@@ -797,7 +795,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
        } else {
                ret = RING_SPACE(chan, req->nr_push * (2 + NOUVEAU_DMA_SKIPS));
                if (ret) {
-                       NV_ERROR(cli, "jmp_space: %d\n", ret);
+                       NV_PRINTK(error, cli, "jmp_space: %d\n", ret);
                        goto out;
                }
 
@@ -835,7 +833,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,
 
        ret = nouveau_fence_new(chan, false, &fence);
        if (ret) {
-               NV_ERROR(cli, "error fencing pushbuf: %d\n", ret);
+               NV_PRINTK(error, cli, "error fencing pushbuf: %d\n", ret);
                WIND_RING(chan);
                goto out;
        }
@@ -853,7 +851,7 @@ out_next:
                req->suffix0 = 0x00000000;
                req->suffix1 = 0x00000000;
        } else
-       if (nv_device(drm->device)->chipset >= 0x25) {
+       if (drm->device.info.chipset >= 0x25) {
                req->suffix0 = 0x00020000;
                req->suffix1 = 0x00000000;
        } else {