From 8c9f5db4f4b684e90e027a27581a14e315d4f3be Mon Sep 17 00:00:00 2001 From: hselasky Date: Mon, 16 Feb 2015 11:49:48 +0000 Subject: [PATCH] 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 @ --- sys/dev/fb/fbd.c | 3 ++- sys/sys/fbio.h | 2 ++ sys/sys/param.h | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/dev/fb/fbd.c b/sys/dev/fb/fbd.c index 6bd5766543b5..f9b4d8e56c6b 100644 --- a/sys/dev/fb/fbd.c +++ b/sys/dev/fb/fbd.c @@ -134,7 +134,8 @@ fb_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, break; case FBIO_BLANK: /* blank display */ - error = 0; /* TODO */ + if (info->setblankmode != NULL) + error = info->setblankmode(info->fb_priv, *(int *)data); break; default: diff --git a/sys/sys/fbio.h b/sys/sys/fbio.h index c47304ac9661..034d05293904 100644 --- a/sys/sys/fbio.h +++ b/sys/sys/fbio.h @@ -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. */ diff --git a/sys/sys/param.h b/sys/sys/param.h index aba65aca1972..c92ee7b168d1 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -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,