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

staging: gma500: enable the 2D op stuff

Well one of them anyway - not yet sure why the other fails
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 636fa5c7
...@@ -343,7 +343,7 @@ void psbfb_copyarea(struct fb_info *info, ...@@ -343,7 +343,7 @@ void psbfb_copyarea(struct fb_info *info,
if (unlikely(info->state != FBINFO_STATE_RUNNING)) if (unlikely(info->state != FBINFO_STATE_RUNNING))
return; return;
if (1 || (info->flags & FBINFO_HWACCEL_DISABLED)) if (info->flags & FBINFO_HWACCEL_DISABLED)
return cfb_copyarea(info, region); return cfb_copyarea(info, region);
/* psb_check_power_state(dev, PSB_DEVICE_SGX); */ /* psb_check_power_state(dev, PSB_DEVICE_SGX); */
......
...@@ -287,7 +287,7 @@ static int psbfb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg ...@@ -287,7 +287,7 @@ static int psbfb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg
return -EFAULT; return -EFAULT;
if (l > 32) if (l > 32)
return -EMSGSIZE; return -EMSGSIZE;
if (copy_from_user(buf, p + 1, l)) if (copy_from_user(buf, p + 1, l * sizeof(u32)))
return -EFAULT; return -EFAULT;
psbfb_2d_submit(dev_priv, buf, l); psbfb_2d_submit(dev_priv, buf, l);
return 0; return 0;
......
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