diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-05-07 20:24:27 -0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-07-25 20:28:15 -0400 |
| commit | 2a259a3d84c4409918c5d094f0969da58283a947 (patch) | |
| tree | e261df7f7f038bbb9761c91ee5784a4fdfb0bfb5 /drivers/gpu/drm/nouveau/nouveau_gpuobj.c | |
| parent | ce22af03da2cd700332a384e240378cae1355773 (diff) | |
drm/nouveau: mark most of our ioctls as deprecated, move to compat layer
These will be replaced in the near future, the code isn't yet stable enough
for this merge window however.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_gpuobj.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_gpuobj.c | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_gpuobj.c b/drivers/gpu/drm/nouveau/nouveau_gpuobj.c index b190cc01c820..bd79fedb7054 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gpuobj.c +++ b/drivers/gpu/drm/nouveau/nouveau_gpuobj.c | |||
| @@ -758,66 +758,6 @@ nouveau_gpuobj_resume(struct drm_device *dev) | |||
| 758 | dev_priv->engine.instmem.flush(dev); | 758 | dev_priv->engine.instmem.flush(dev); |
| 759 | } | 759 | } |
| 760 | 760 | ||
| 761 | int nouveau_ioctl_grobj_alloc(struct drm_device *dev, void *data, | ||
| 762 | struct drm_file *file_priv) | ||
| 763 | { | ||
| 764 | struct drm_nouveau_grobj_alloc *init = data; | ||
| 765 | struct nouveau_channel *chan; | ||
| 766 | int ret; | ||
| 767 | |||
| 768 | if (init->handle == ~0) | ||
| 769 | return -EINVAL; | ||
| 770 | |||
| 771 | /* compatibility with userspace that assumes 506e for all chipsets */ | ||
| 772 | if (init->class == 0x506e) { | ||
| 773 | init->class = nouveau_software_class(dev); | ||
| 774 | if (init->class == 0x906e) | ||
| 775 | return 0; | ||
| 776 | } else | ||
| 777 | if (init->class == 0x906e) { | ||
| 778 | NV_ERROR(dev, "906e not supported yet\n"); | ||
| 779 | return -EINVAL; | ||
| 780 | } | ||
| 781 | |||
| 782 | chan = nouveau_channel_get(file_priv, init->channel); | ||
| 783 | if (IS_ERR(chan)) | ||
| 784 | return PTR_ERR(chan); | ||
| 785 | |||
| 786 | if (nouveau_ramht_find(chan, init->handle)) { | ||
| 787 | ret = -EEXIST; | ||
| 788 | goto out; | ||
| 789 | } | ||
| 790 | |||
| 791 | ret = nouveau_gpuobj_gr_new(chan, init->handle, init->class); | ||
| 792 | if (ret) { | ||
| 793 | NV_ERROR(dev, "Error creating object: %d (%d/0x%08x)\n", | ||
| 794 | ret, init->channel, init->handle); | ||
| 795 | } | ||
| 796 | |||
| 797 | out: | ||
| 798 | nouveau_channel_put(&chan); | ||
| 799 | return ret; | ||
| 800 | } | ||
| 801 | |||
| 802 | int nouveau_ioctl_gpuobj_free(struct drm_device *dev, void *data, | ||
| 803 | struct drm_file *file_priv) | ||
| 804 | { | ||
| 805 | struct drm_nouveau_gpuobj_free *objfree = data; | ||
| 806 | struct nouveau_channel *chan; | ||
| 807 | int ret; | ||
| 808 | |||
| 809 | chan = nouveau_channel_get(file_priv, objfree->channel); | ||
| 810 | if (IS_ERR(chan)) | ||
| 811 | return PTR_ERR(chan); | ||
| 812 | |||
| 813 | /* Synchronize with the user channel */ | ||
| 814 | nouveau_channel_idle(chan); | ||
| 815 | |||
| 816 | ret = nouveau_ramht_remove(chan, objfree->handle); | ||
| 817 | nouveau_channel_put(&chan); | ||
| 818 | return ret; | ||
| 819 | } | ||
| 820 | |||
| 821 | u32 | 761 | u32 |
| 822 | nv_ro32(struct nouveau_gpuobj *gpuobj, u32 offset) | 762 | nv_ro32(struct nouveau_gpuobj *gpuobj, u32 offset) |
| 823 | { | 763 | { |