summaryrefslogtreecommitdiffstats
path: root/drivers/staging/gma500/psb_drv.h
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2011-07-15 17:32:13 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-07-15 19:05:06 +0200
commitbd7b9f91ddc2d08381a853bd33b3ce7d0012b1df (patch)
tree59eeafe297d904397a3ce11bdc002874e4f921dc /drivers/staging/gma500/psb_drv.h
parentc5c44531ad00ed87078e799f0932c220031aa1c9 (diff)
downloadop-kernel-dev-bd7b9f91ddc2d08381a853bd33b3ce7d0012b1df.zip
op-kernel-dev-bd7b9f91ddc2d08381a853bd33b3ce7d0012b1df.tar.gz
gma500: Move the 2D operations into DRM
We currently have a test hack framebuffer mode ioctl, turn that into a DRM interface. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/gma500/psb_drv.h')
-rw-r--r--drivers/staging/gma500/psb_drv.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/staging/gma500/psb_drv.h b/drivers/staging/gma500/psb_drv.h
index 12d13ae..db3e356 100644
--- a/drivers/staging/gma500/psb_drv.h
+++ b/drivers/staging/gma500/psb_drv.h
@@ -599,6 +599,9 @@ struct drm_psb_private {
bool dsr_enable;
void (*exit_idle)(struct drm_device *dev, u32 update_src, void *p_surfaceAddr, bool check_hw_on_only);
+ /* 2D acceleration */
+ struct mutex mutex_2d;
+
/* FIXME: Arrays anyone ? */
struct mdfld_dsi_encoder *encoder0;
struct mdfld_dsi_encoder *encoder2;
@@ -744,8 +747,8 @@ extern void psbfb_copyarea(struct fb_info *info,
const struct fb_copyarea *region);
extern int psbfb_sync(struct fb_info *info);
extern void psb_spank(struct drm_psb_private *dev_priv);
-extern int psbfb_2d_submit(struct drm_psb_private *dev_priv, uint32_t *cmdbuf,
- unsigned size);
+extern int psb_accel_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file);
/*
* psb_reset.c
OpenPOWER on IntegriCloud