From owner-svn-src-all@FreeBSD.ORG Mon Feb 16 11:49:50 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 07DEEF3B; Mon, 16 Feb 2015 11:49:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CD0E8B02; Mon, 16 Feb 2015 11:49:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1GBnnTR080555; Mon, 16 Feb 2015 11:49:49 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1GBnnUe080550; Mon, 16 Feb 2015 11:49:49 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201502161149.t1GBnnUe080550@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 16 Feb 2015 11:49:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278846 - in head/sys: dev/fb sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Feb 2015 11:49:50 -0000 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,