Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d8d29cf authored by Daniel Vetter's avatar Daniel Vetter Committed by Dave Airlie
Browse files

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: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDave Airlie <airlied@gmail.com>
parent 81e95697

drivers/gpu/drm/drm_drv.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -122,7 +122,7 @@ static const struct drm_ioctl_desc drm_ioctls[] = { 
	DRM_IOCTL_DEF(DRM_IOCTL_AGP_UNBIND, drm_agp_unbind_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_AGP_UNBIND, drm_agp_unbind_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

#endif

#endif





	DRM_IOCTL_DEF(DRM_IOCTL_SG_ALLOC, drm_sg_alloc_ioctl, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_SG_ALLOC, drm_sg_alloc, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_SG_FREE, drm_sg_free, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),

	DRM_IOCTL_DEF(DRM_IOCTL_SG_FREE, drm_sg_free, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),





	DRM_IOCTL_DEF(DRM_IOCTL_WAIT_VBLANK, drm_wait_vblank, DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_WAIT_VBLANK, drm_wait_vblank, DRM_UNLOCKED),

drivers/gpu/drm/drm_scatter.c

+3 −10
Original line number Original line Diff line number Diff line
@@ -70,8 +70,10 @@ void drm_sg_cleanup(struct drm_sg_mem * entry) 
# define ScatterHandle(x) (unsigned int)(x)

# define ScatterHandle(x) (unsigned int)(x)

#endif

#endif





int drm_sg_alloc(struct drm_device *dev, struct drm_scatter_gather * request)

int drm_sg_alloc(struct drm_device *dev, void *data,

		 struct drm_file *file_priv)

{

{

	struct drm_scatter_gather *request = data;

	struct drm_sg_mem *entry;

	struct drm_sg_mem *entry;

	unsigned long pages, i, j;

	unsigned long pages, i, j;
@@ -181,15 +183,6 @@ int drm_sg_alloc(struct drm_device *dev, struct drm_scatter_gather * request) 
	return -ENOMEM;

	return -ENOMEM;

}

}





int drm_sg_alloc_ioctl(struct drm_device *dev, void *data,

		       struct drm_file *file_priv)

{

	struct drm_scatter_gather *request = data;



	return drm_sg_alloc(dev, request);



}



int drm_sg_free(struct drm_device *dev, void *data,

int drm_sg_free(struct drm_device *dev, void *data,

		struct drm_file *file_priv)

		struct drm_file *file_priv)

{

{

include/drm/drmP.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -1567,9 +1567,8 @@ extern int drm_vma_info(struct seq_file *m, void *data); 




				/* Scatter Gather Support (drm_scatter.h) */

				/* Scatter Gather Support (drm_scatter.h) */

extern void drm_sg_cleanup(struct drm_sg_mem * entry);

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);

			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,

extern int drm_sg_free(struct drm_device *dev, void *data,

		       struct drm_file *file_priv);

		       struct drm_file *file_priv);