Browse Source

staging: gma500: enable the 2D op stuff

Well one of them anyway - not yet sure why the other fails

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Cox 14 years ago
parent
commit
cb048d5586
2 changed files with 2 additions and 2 deletions
  1. 1 1
      drivers/staging/gma500/psb_2d.c
  2. 1 1
      drivers/staging/gma500/psb_fb.c

+ 1 - 1
drivers/staging/gma500/psb_2d.c

@@ -343,7 +343,7 @@ void psbfb_copyarea(struct fb_info *info,
 	if (unlikely(info->state != FBINFO_STATE_RUNNING))
 		return;
 
-	if (1 || (info->flags & FBINFO_HWACCEL_DISABLED))
+	if (info->flags & FBINFO_HWACCEL_DISABLED)
 		return cfb_copyarea(info, region);
 
 	/* psb_check_power_state(dev, PSB_DEVICE_SGX); */

+ 1 - 1
drivers/staging/gma500/psb_fb.c

@@ -287,7 +287,7 @@ static int psbfb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg
 			return -EFAULT;
 		if (l > 32)
 			return -EMSGSIZE;
-		if (copy_from_user(buf, p + 1, l))
+		if (copy_from_user(buf, p + 1, l * sizeof(u32)))
 			return -EFAULT;
 		psbfb_2d_submit(dev_priv, buf, l);
 		return 0;