From d64cf0eb8af643de2dd949539de56fcbc95de704 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Wed, 19 Aug 2009 17:42:57 +0100 Subject: Move glamo_ioctl_gem_wait_rendering() to glamo-cmdq.c Signed-off-by: Thomas White --- drivers/mfd/glamo/glamo-cmdq.c | 7 +++++++ drivers/mfd/glamo/glamo-cmdq.h | 2 ++ drivers/mfd/glamo/glamo-drm-drv.c | 8 -------- 3 files changed, 9 insertions(+), 8 deletions(-) (limited to 'drivers/mfd') diff --git a/drivers/mfd/glamo/glamo-cmdq.c b/drivers/mfd/glamo/glamo-cmdq.c index b09ddb8edd9..80340b100d3 100644 --- a/drivers/mfd/glamo/glamo-cmdq.c +++ b/drivers/mfd/glamo/glamo-cmdq.c @@ -305,6 +305,13 @@ cleanup: } +int glamo_ioctl_gem_wait_rendering(struct drm_device *dev, void *data, + struct drm_file *file_priv) +{ + return 0; +} + + int glamo_cmdq_init(struct glamodrm_handle *gdrm) { unsigned int i; diff --git a/drivers/mfd/glamo/glamo-cmdq.h b/drivers/mfd/glamo/glamo-cmdq.h index 35c8bea1dcb..8a518288eb4 100644 --- a/drivers/mfd/glamo/glamo-cmdq.h +++ b/drivers/mfd/glamo/glamo-cmdq.h @@ -33,6 +33,8 @@ extern int glamo_ioctl_cmdbuf(struct drm_device *dev, void *data, struct drm_file *file_priv); +extern int glamo_ioctl_gem_wait_rendering(struct drm_device *dev, void *data, + struct drm_file *file_priv); extern int glamo_cmdq_init(struct glamodrm_handle *gdrm); extern int glamo_cmdq_shutdown(struct glamodrm_handle *gdrm); diff --git a/drivers/mfd/glamo/glamo-drm-drv.c b/drivers/mfd/glamo/glamo-drm-drv.c index caf024b9aff..1f1446659f5 100644 --- a/drivers/mfd/glamo/glamo-drm-drv.c +++ b/drivers/mfd/glamo/glamo-drm-drv.c @@ -60,14 +60,6 @@ static int glamo_ioctl_gem_info(struct drm_device *dev, void *data, } -static int glamo_ioctl_gem_wait_rendering(struct drm_device *dev, void *data, - struct drm_file *file_priv) -{ - printk(KERN_INFO "glamo_ioctl_gem_wait_rendering\n"); - return 0; -} - - struct drm_ioctl_desc glamo_ioctls[] = { DRM_IOCTL_DEF(DRM_GLAMO_CMDBUF, glamo_ioctl_cmdbuf, DRM_AUTH), DRM_IOCTL_DEF(DRM_GLAMO_SWAP, glamo_ioctl_swap, DRM_AUTH), -- cgit v1.2.3