svn commit: r278846 - in head/sys: dev/fb sys

[Hans Petter Selasky]

Author: hselasky
Date: Mon Feb 16 11:49:48 2015
New Revision: 278846
URL: https://svnweb.freebsd.org/changeset/base/278846

Log:
  Forward the FBIO_BLANK IOCTL to framebuffer clients. Bump the FreeBSD
  version to force re-compilation of external video driver kernel
  modules.
  
  Discussed with:		ray @

Modified:
  head/sys/dev/fb/fbd.c
  head/sys/sys/fbio.h
  head/sys/sys/param.h

Modified: head/sys/dev/fb/fbd.c
==============================================================================
--- head/sys/dev/fb/fbd.c	Mon Feb 16 11:03:36 2015	(r278845)
+++ head/sys/dev/fb/fbd.c	Mon Feb 16 11:49:48 2015	(r278846)
@@ -134,7 +134,8 @@ fb_ioctl(struct cdev *dev, u_long cmd, c
 		break;
 
 	case FBIO_BLANK:	/* blank display */
-		error = 0;	/* TODO */
+		if (info->setblankmode != NULL)
+			error = info->setblankmode(info->fb_priv, *(int *)data);
 		break;
 
 	default:

Modified: head/sys/sys/fbio.h
==============================================================================
--- head/sys/sys/fbio.h	Mon Feb 16 11:03:36 2015	(r278845)
+++ head/sys/sys/fbio.h	Mon Feb 16 11:49:48 2015	(r278846)
@@ -115,6 +115,7 @@ struct fb_info;
 
 typedef int fb_enter_t(void *priv);
 typedef int fb_leave_t(void *priv);
+typedef int fb_setblankmode_t(void *priv, int mode);
 
 struct fb_info {
 	/* Raw copy of fbtype. Do not change. */
@@ -129,6 +130,7 @@ struct fb_info {
 
 	fb_enter_t	*enter;
 	fb_leave_t	*leave;
+	fb_setblankmode_t *setblankmode;
 
 	intptr_t	fb_pbase;	/* For FB mmap. */
 	intptr_t	fb_vbase;	/* if NULL, use fb_write/fb_read. */

Modified: head/sys/sys/param.h
==============================================================================
--- head/sys/sys/param.h	Mon Feb 16 11:03:36 2015	(r278845)
+++ head/sys/sys/param.h	Mon Feb 16 11:49:48 2015	(r278846)
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1100059	/* Master, propagated to newvers */
+#define __FreeBSD_version 1100060	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,