Accueil Explorer Aide
S'inscrire Connexion
wareck
/
openwrt_lede
1
0
Fork 0
Fichiers Tickets 0 Pull Requests 0 Wiki
Branche: master
Branches Tags
openwrt_lede
/
target
/
linux
/
brcm2708
/
patches-4.4
/
0053-fbdev-add-FBIOCOPYAREA-ioctl.patch

0053-fbdev-add-FBIOCOPYAREA-ioctl.patch 2.8 KB
Lien permanent Historique Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091 
  1. From b76321eab2ff7ba2a69eefd643a6c5e5dc917529 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Siarhei Siamashka <siarhei.siamashka@gmail.com>
    3. 

  3. Date: Mon, 17 Jun 2013 13:32:11 +0300
    4. 

  4. Subject: [PATCH] fbdev: add FBIOCOPYAREA ioctl
    5. 

  5. 

  6. Based on the patch authored by Ali Gholami Rudi at
    7. 

  7.     https://lkml.org/lkml/2009/7/13/153
    8. 

  8. 

  9. Provide an ioctl for userspace applications, but only if this operation
    10. 

  10. is hardware accelerated (otherwide it does not make any sense).
    11. 

  11. 

  12. Signed-off-by: Siarhei Siamashka <siarhei.siamashka@gmail.com>
    13. 

  13. ---
    14. 

  14.  drivers/video/fbdev/core/fbmem.c | 30 ++++++++++++++++++++++++++++++
    15. 

  15.  include/uapi/linux/fb.h          |  5 +++++
    16. 

  16.  2 files changed, 35 insertions(+)
    17. 

  17. 

  18. --- a/drivers/video/fbdev/core/fbmem.c
    19. 

  19. +++ b/drivers/video/fbdev/core/fbmem.c
    20. 

  20. @@ -1091,6 +1091,25 @@ fb_blank(struct fb_info *info, int blank
    21. 

  21.  }
    22. 

  22.  EXPORT_SYMBOL(fb_blank);
    23. 

  23.  
    24. 

  24. +static int fb_copyarea_user(struct fb_info *info,
    25. 

  25. +			    struct fb_copyarea *copy)
    26. 

  26. +{
    27. 

  27. +	int ret = 0;
    28. 

  28. +	if (!lock_fb_info(info))
    29. 

  29. +		return -ENODEV;
    30. 

  30. +	if (copy->dx + copy->width > info->var.xres ||
    31. 

  31. +	    copy->sx + copy->width > info->var.xres ||
    32. 

  32. +	    copy->dy + copy->height > info->var.yres ||
    33. 

  33. +	    copy->sy + copy->height > info->var.yres) {
    34. 

  34. +		ret = -EINVAL;
    35. 

  35. +		goto out;
    36. 

  36. +	}
    37. 

  37. +	info->fbops->fb_copyarea(info, copy);
    38. 

  38. +out:
    39. 

  39. +	unlock_fb_info(info);
    40. 

  40. +	return ret;
    41. 

  41. +}
    42. 

  42. +
    43. 

  43.  static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
    44. 

  44.  			unsigned long arg)
    45. 

  45.  {
    46. 

  46. @@ -1101,6 +1120,7 @@ static long do_fb_ioctl(struct fb_info *
    47. 

  47.  	struct fb_cmap cmap_from;
    48. 

  48.  	struct fb_cmap_user cmap;
    49. 

  49.  	struct fb_event event;
    50. 

  50. +	struct fb_copyarea copy;
    51. 

  51.  	void __user *argp = (void __user *)arg;
    52. 

  52.  	long ret = 0;
    53. 

  53.  
    54. 

  54. @@ -1218,6 +1238,15 @@ static long do_fb_ioctl(struct fb_info *
    55. 

  55.  		unlock_fb_info(info);
    56. 

  56.  		console_unlock();
    57. 

  57.  		break;
    58. 

  58. +	case FBIOCOPYAREA:
    59. 

  59. +		if (info->flags & FBINFO_HWACCEL_COPYAREA) {
    60. 

  60. +			/* only provide this ioctl if it is accelerated */
    61. 

  61. +			if (copy_from_user(&copy, argp, sizeof(copy)))
    62. 

  62. +				return -EFAULT;
    63. 

  63. +			ret = fb_copyarea_user(info, &copy);
    64. 

  64. +			break;
    65. 

  65. +		}
    66. 

  66. +		/* fall through */
    67. 

  67.  	default:
    68. 

  68.  		if (!lock_fb_info(info))
    69. 

  69.  			return -ENODEV;
    70. 

  70. @@ -1372,6 +1401,7 @@ static long fb_compat_ioctl(struct file
    71. 

  71.  	case FBIOPAN_DISPLAY:
    72. 

  72.  	case FBIOGET_CON2FBMAP:
    73. 

  73.  	case FBIOPUT_CON2FBMAP:
    74. 

  74. +	case FBIOCOPYAREA:
    75. 

  75.  		arg = (unsigned long) compat_ptr(arg);
    76. 

  76.  	case FBIOBLANK:
    77. 

  77.  		ret = do_fb_ioctl(info, cmd, arg);
    78. 

  78. --- a/include/uapi/linux/fb.h
    79. 

  79. +++ b/include/uapi/linux/fb.h
    80. 

  80. @@ -34,6 +34,11 @@
    81. 

  81.  #define FBIOPUT_MODEINFO        0x4617
    82. 

  82.  #define FBIOGET_DISPINFO        0x4618
    83. 

  83.  #define FBIO_WAITFORVSYNC	_IOW('F', 0x20, __u32)
    84. 

  84. +/*
    85. 

  85. + * HACK: use 'z' in order not to clash with any other ioctl numbers which might
    86. 

  86. + * be concurrently added to the mainline kernel
    87. 

  87. + */
    88. 

  88. +#define FBIOCOPYAREA		_IOW('z', 0x21, struct fb_copyarea)
    89. 

  89.  
    90. 

  90.  #define FB_TYPE_PACKED_PIXELS		0	/* Packed Pixels	*/
    91. 

  91.  #define FB_TYPE_PLANES			1	/* Non interleaved planes */
    92.