From owner-svn-src-all@FreeBSD.ORG Mon Feb 16 11:54:46 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CD91715F; Mon, 16 Feb 2015 11:54:46 +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 9EE88C0A; Mon, 16 Feb 2015 11:54:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1GBskTG084595; Mon, 16 Feb 2015 11:54:46 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1GBskOm084594; Mon, 16 Feb 2015 11:54:46 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201502161154.t1GBskOm084594@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:54:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r278847 - head/sys/dev/usb/video 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:54:46 -0000 Author: hselasky Date: Mon Feb 16 11:54:45 2015 New Revision: 278847 URL: https://svnweb.freebsd.org/changeset/base/278847 Log: Allow the display port to be powered off. Modified: head/sys/dev/usb/video/udl.c Modified: head/sys/dev/usb/video/udl.c ============================================================================== --- head/sys/dev/usb/video/udl.c Mon Feb 16 11:49:48 2015 (r278846) +++ head/sys/dev/usb/video/udl.c Mon Feb 16 11:54:45 2015 (r278847) @@ -78,9 +78,7 @@ static device_probe_t udl_probe; static device_attach_t udl_attach; static device_detach_t udl_detach; static fb_getinfo_t udl_fb_getinfo; -#if 0 -static fb_blank_display_t udl_fb_blank_display; -#endif +static fb_setblankmode_t udl_fb_setblankmode; static void udl_select_chip(struct udl_softc *, struct usb_attach_arg *); static int udl_init_chip(struct udl_softc *); @@ -94,9 +92,7 @@ static void udl_cmd_insert_int_3(struct static void udl_cmd_insert_buf_le16(struct udl_cmd_buf *, const uint8_t *, uint32_t); static void udl_cmd_write_reg_1(struct udl_cmd_buf *, uint8_t, uint8_t); static void udl_cmd_write_reg_3(struct udl_cmd_buf *, uint8_t, uint32_t); -#if 0 static int udl_power_save(struct udl_softc *, int, int); -#endif static const struct usb_config udl_config[UDL_N_TRANSFER] = { [UDL_BULK_WRITE_0] = { @@ -131,9 +127,6 @@ static device_method_t udl_methods[] = { DEVMETHOD(device_attach, udl_attach), DEVMETHOD(device_detach, udl_detach), DEVMETHOD(fb_getinfo, udl_fb_getinfo), -#if 0 - DEVMETHOD(fb_blank_display, udl_fb_blank_display), -#endif DEVMETHOD_END }; @@ -350,6 +343,8 @@ udl_attach(device_t dev) sc->sc_fb_info.fb_stride = sc->sc_fb_info.fb_width * 2; sc->sc_fb_info.fb_pbase = 0; sc->sc_fb_info.fb_vbase = (uintptr_t)sc->sc_fb_addr; + sc->sc_fb_info.fb_priv = sc; + sc->sc_fb_info.setblankmode = &udl_fb_setblankmode; sc->sc_fbdev = device_add_child(dev, "fbd", -1); if (sc->sc_fbdev == NULL) @@ -407,11 +402,10 @@ udl_fb_getinfo(device_t dev) return (&sc->sc_fb_info); } -#if 0 static int -udl_fb_blank_display(device_t dev, int mode) +udl_fb_setblankmode(void *arg, int mode) { - struct udl_softc *sc = device_get_softc(dev); + struct udl_softc *sc = arg; switch (mode) { case V_DISPLAY_ON: @@ -432,7 +426,6 @@ udl_fb_blank_display(device_t dev, int m } return (0); } -#endif static struct udl_cmd_buf * udl_cmd_buf_alloc(struct udl_softc *sc, int flags) @@ -552,7 +545,6 @@ tr_setup: cv_signal(&sc->sc_cv); } -#if 0 static int udl_power_save(struct udl_softc *sc, int on, int flags) { @@ -576,7 +568,6 @@ udl_power_save(struct udl_softc *sc, int udl_cmd_buf_send(sc, cb); return (0); } -#endif static int udl_ctrl_msg(struct udl_softc *sc, uint8_t rt, uint8_t r,