From 3d56235cb9b596ad4fcc72db109d4d499b4b92c1 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Sun, 3 May 2009 17:57:42 +0100 Subject: Create glamo-buffer.c This just creates a new file for the memory management stuff. Signed-off-by: Thomas White --- drivers/mfd/glamo/Makefile | 2 +- drivers/mfd/glamo/glamo-buffer.c | 75 +++++++++++++++++++++++++++++++++++++++ drivers/mfd/glamo/glamo-buffer.h | 48 +++++++++++++++++++++++++ drivers/mfd/glamo/glamo-drm-drv.c | 45 ++--------------------- 4 files changed, 126 insertions(+), 44 deletions(-) create mode 100644 drivers/mfd/glamo/glamo-buffer.c create mode 100644 drivers/mfd/glamo/glamo-buffer.h (limited to 'drivers/mfd/glamo') diff --git a/drivers/mfd/glamo/Makefile b/drivers/mfd/glamo/Makefile index ed5ac578508..75476de5ad7 100644 --- a/drivers/mfd/glamo/Makefile +++ b/drivers/mfd/glamo/Makefile @@ -12,4 +12,4 @@ obj-$(CONFIG_MFD_GLAMO_SPI_FB) += glamo-lcm-spi.o obj-$(CONFIG_MFD_GLAMO_MCI) += glamo-mci.o obj-$(CONFIG_MFD_GLAMO_DRM) += glamo-drm.o -glamo-drm-objs := glamo-drm-drv.o glamo-cmdq.o +glamo-drm-objs := glamo-drm-drv.o glamo-cmdq.o glamo-buffer.o diff --git a/drivers/mfd/glamo/glamo-buffer.c b/drivers/mfd/glamo/glamo-buffer.c new file mode 100644 index 00000000000..d72c0fb737c --- /dev/null +++ b/drivers/mfd/glamo/glamo-buffer.c @@ -0,0 +1,75 @@ +/* + * SMedia Glamo 336x/337x memory management + * + * Copyright (c) 2009 Thomas White + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + */ + + +#include +#include + +#include "glamo-drm-private.h" + + +int glamo_ioctl_gem_create(struct drm_device *dev, void *data, + struct drm_file *file_priv) +{ + printk(KERN_INFO "glamo_ioctl_gem_create\n"); + return 0; +} + + +int glamo_ioctl_gem_mmap(struct drm_device *dev, void *data, + struct drm_file *file_priv) +{ + printk(KERN_INFO "glamo_ioctl_gem_mmap\n"); + return 0; +} + + +int glamo_ioctl_gem_pin(struct drm_device *dev, void *data, + struct drm_file *file_priv) +{ + printk(KERN_INFO "glamo_ioctl_gem_pin\n"); + return 0; +} + + +int glamo_ioctl_gem_unpin(struct drm_device *dev, void *data, + struct drm_file *file_priv) +{ + printk(KERN_INFO "glamo_ioctl_gem_unpin\n"); + return 0; +} + + +int glamo_ioctl_gem_pread(struct drm_device *dev, void *data, + struct drm_file *file_priv) +{ + printk(KERN_INFO "glamo_ioctl_gem_pread\n"); + return 0; +} + + +int glamo_ioctl_gem_pwrite(struct drm_device *dev, void *data, + struct drm_file *file_priv) +{ + printk(KERN_INFO "glamo_ioctl_gem_pwrite\n"); + return 0; +} diff --git a/drivers/mfd/glamo/glamo-buffer.h b/drivers/mfd/glamo/glamo-buffer.h new file mode 100644 index 00000000000..f4d5b3c3aae --- /dev/null +++ b/drivers/mfd/glamo/glamo-buffer.h @@ -0,0 +1,48 @@ +/* + * SMedia Glamo 336x/337x memory management + * + * Copyright (c) 2009 Thomas White + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + */ + +#ifndef __GLAMO_BUFFER_H +#define __GLAMO_BUFFER_H + +#include + +#include "glamo-drm-private.h" + +extern int glamo_ioctl_gem_create(struct drm_device *dev, void *data, + struct drm_file *file_priv); + +extern int glamo_ioctl_gem_mmap(struct drm_device *dev, void *data, + struct drm_file *file_priv); + +extern int glamo_ioctl_gem_pin(struct drm_device *dev, void *data, + struct drm_file *file_priv); + +extern int glamo_ioctl_gem_unpin(struct drm_device *dev, void *data, + struct drm_file *file_priv); + +extern int glamo_ioctl_gem_pread(struct drm_device *dev, void *data, + struct drm_file *file_priv); + +extern int glamo_ioctl_gem_pwrite(struct drm_device *dev, void *data, + struct drm_file *file_priv); + +#endif /* __GLAMO_BUFFER_H */ diff --git a/drivers/mfd/glamo/glamo-drm-drv.c b/drivers/mfd/glamo/glamo-drm-drv.c index d08f84089a5..d402b780c66 100644 --- a/drivers/mfd/glamo/glamo-drm-drv.c +++ b/drivers/mfd/glamo/glamo-drm-drv.c @@ -29,6 +29,7 @@ #include "glamo-core.h" #include "glamo-cmdq.h" +#include "glamo-buffer.h" #include "glamo-drm-private.h" #define DRIVER_AUTHOR "Openmoko, Inc." @@ -53,48 +54,6 @@ static int glamo_ioctl_gem_info(struct drm_device *dev, void *data, return 0; } -static int glamo_ioctl_gem_create(struct drm_device *dev, void *data, - struct drm_file *file_priv) -{ - printk(KERN_INFO "glamo_ioctl_gem_create\n"); - return 0; -} - -static int glamo_ioctl_gem_mmap(struct drm_device *dev, void *data, - struct drm_file *file_priv) -{ - printk(KERN_INFO "glamo_ioctl_gem_mmap\n"); - return 0; -} - -static int glamo_ioctl_gem_pin(struct drm_device *dev, void *data, - struct drm_file *file_priv) -{ - printk(KERN_INFO "glamo_ioctl_gem_pin\n"); - return 0; -} - -static int glamo_ioctl_gem_unpin(struct drm_device *dev, void *data, - struct drm_file *file_priv) -{ - printk(KERN_INFO "glamo_ioctl_gem_unpin\n"); - return 0; -} - -static int glamo_ioctl_gem_pread(struct drm_device *dev, void *data, - struct drm_file *file_priv) -{ - printk(KERN_INFO "glamo_ioctl_gem_pread\n"); - return 0; -} - -static int glamo_ioctl_gem_pwrite(struct drm_device *dev, void *data, - struct drm_file *file_priv) -{ - printk(KERN_INFO "glamo_ioctl_gem_pwrite\n"); - return 0; -} - static int glamo_ioctl_gem_wait_rendering(struct drm_device *dev, void *data, struct drm_file *file_priv) { @@ -344,7 +303,7 @@ static int glamodrm_remove(struct platform_device *pdev) } -static int glamodrm_suspend(struct platform_device *pdev) +static int glamodrm_suspend(struct platform_device *pdev, pm_message_t state) { /* glamo_core.c will suspend the engines for us */ return 0; -- cgit v1.2.3