Commit 99172946 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman

staging: gma500: Add a test ioctl for issuing 2D accel ops via user space

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ad9f792e
...@@ -84,7 +84,7 @@ static int psb_2d_wait_available(struct drm_psb_private *dev_priv, ...@@ -84,7 +84,7 @@ static int psb_2d_wait_available(struct drm_psb_private *dev_priv,
/* FIXME: Remember if we expose the 2D engine to the DRM we need to serialize /* FIXME: Remember if we expose the 2D engine to the DRM we need to serialize
it with console use */ it with console use */
static int psbfb_2d_submit(struct drm_psb_private *dev_priv, uint32_t *cmdbuf, int psbfb_2d_submit(struct drm_psb_private *dev_priv, uint32_t *cmdbuf,
unsigned size) unsigned size)
{ {
int ret = 0; int ret = 0;
......
...@@ -709,6 +709,9 @@ extern int psbfb_sync(struct fb_info *info); ...@@ -709,6 +709,9 @@ extern int psbfb_sync(struct fb_info *info);
extern void psb_spank(struct drm_psb_private *dev_priv); 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);
/* /*
*psb_reset.c *psb_reset.c
*/ */
......
...@@ -270,6 +270,31 @@ static int psbfb_mmap(struct fb_info *info, struct vm_area_struct *vma) ...@@ -270,6 +270,31 @@ static int psbfb_mmap(struct fb_info *info, struct vm_area_struct *vma)
return 0; return 0;
} }
static int psbfb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
{
struct psb_fbdev *fbdev = info->par;
struct psb_framebuffer *psbfb = fbdev->pfb;
struct drm_device *dev = psbfb->base.dev;
struct drm_psb_private *dev_priv = dev->dev_private;
u32 __user *p = (u32 __user *)arg;
u32 l;
u32 buf[32];
switch (cmd) {
case 0x12345678:
if (!capable(CAP_SYS_RAWIO))
return -EPERM;
if (get_user(l, p))
return -EFAULT;
if (l > 32)
return -EMSGSIZE;
if (copy_from_user(buf, p + 1, l))
return -EFAULT;
psbfb_2d_submit(dev_priv, buf, l);
return 0;
default:
return -ENOTTY;
}
}
static struct fb_ops psbfb_ops = { static struct fb_ops psbfb_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
...@@ -282,6 +307,7 @@ static struct fb_ops psbfb_ops = { ...@@ -282,6 +307,7 @@ static struct fb_ops psbfb_ops = {
.fb_imageblit = psbfb_imageblit, .fb_imageblit = psbfb_imageblit,
.fb_mmap = psbfb_mmap, .fb_mmap = psbfb_mmap,
.fb_sync = psbfb_sync, .fb_sync = psbfb_sync,
.fb_ioctl = psbfb_ioctl,
}; };
static struct drm_framebuffer *psb_framebuffer_create static struct drm_framebuffer *psb_framebuffer_create
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment