diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-07-10 14:11:50 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2013-07-23 19:34:01 +1000 |
| commit | 1d8d29cf2a9956ec5ea2395232a8121577a6cfee (patch) | |
| tree | e577fcde6379cc2f05bce6c9a5644bd0648ca3e7 /include/drm | |
| parent | 81e9569760127e473020d1c50c95086614f8d203 (diff) | |
| download | op-kernel-dev-1d8d29cf2a9956ec5ea2395232a8121577a6cfee.zip op-kernel-dev-1d8d29cf2a9956ec5ea2395232a8121577a6cfee.tar.gz | |
drm: fold in drm_sg_alloc into the ioctl
There's no other caller from driver code, so we can fold this in.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@gmail.com>
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drmP.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 6cde924..1ea404f 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1567,9 +1567,8 @@ extern int drm_vma_info(struct seq_file *m, void *data); /* Scatter Gather Support (drm_scatter.h) */ extern void drm_sg_cleanup(struct drm_sg_mem * entry); -extern int drm_sg_alloc_ioctl(struct drm_device *dev, void *data, +extern int drm_sg_alloc(struct drm_device *dev, void *data, struct drm_file *file_priv); -extern int drm_sg_alloc(struct drm_device *dev, struct drm_scatter_gather * request); extern int drm_sg_free(struct drm_device *dev, void *data, struct drm_file *file_priv); |
