From owner-svn-src-user@FreeBSD.ORG Tue Oct 15 12:29:37 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 09C2020A; Tue, 15 Oct 2013 12:29:37 +0000 (UTC) (envelope-from ray@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D1DF32DDE; Tue, 15 Oct 2013 12:29:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9FCTabh085896; Tue, 15 Oct 2013 12:29:36 GMT (envelope-from ray@svn.freebsd.org) Received: (from ray@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9FCTaDd085894; Tue, 15 Oct 2013 12:29:36 GMT (envelope-from ray@svn.freebsd.org) Message-Id: <201310151229.r9FCTaDd085894@svn.freebsd.org> From: Aleksandr Rybalko Date: Tue, 15 Oct 2013 12:29:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r256528 - user/ed/newcons/sys/dev/drm2 X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Oct 2013 12:29:37 -0000 Author: ray Date: Tue Oct 15 12:29:36 2013 New Revision: 256528 URL: http://svnweb.freebsd.org/changeset/base/256528 Log: Rename bitblt method to bitbltchr. Sponsored by: The FreeBSD Foundation Modified: user/ed/newcons/sys/dev/drm2/drm_fb_helper.c Modified: user/ed/newcons/sys/dev/drm2/drm_fb_helper.c ============================================================================== --- user/ed/newcons/sys/dev/drm2/drm_fb_helper.c Tue Oct 15 12:28:24 2013 (r256527) +++ user/ed/newcons/sys/dev/drm2/drm_fb_helper.c Tue Oct 15 12:29:36 2013 (r256528) @@ -51,14 +51,16 @@ struct vt_kms_softc { static vd_init_t vt_kms_init; static vd_blank_t vt_kms_blank; -static vd_bitblt_t vt_kms_bitblt; +static vd_bitbltchr_t vt_kms_bitbltchr; static vd_postswitch_t vt_kms_postswitch; +#if 0 static void vt_restore_fbdev_mode(void *, int); +#endif static struct vt_driver vt_vt_kms_driver = { .vd_init = vt_kms_init, .vd_blank = vt_kms_blank, - .vd_bitblt = vt_kms_bitblt, + .vd_bitbltchr = vt_kms_bitbltchr, .vd_postswitch = vt_kms_postswitch, }; @@ -112,7 +114,7 @@ vt_kms_blank(struct vt_device *vd, term_ } static void -vt_kms_bitblt(struct vt_device *vd, const uint8_t *src, +vt_kms_bitbltchr(struct vt_device *vd, const uint8_t *src, vt_axis_t top, vt_axis_t left, unsigned int width, unsigned int height, term_color_t fg, term_color_t bg) { @@ -165,11 +167,14 @@ vt_kms_init(struct vt_device *vd) /* Clear the screen. */ vt_kms_blank(vd, TC_BLACK); +#if 0 TASK_INIT(&sc->fb_mode_task, 0, vt_restore_fbdev_mode, vd); +#endif return (CN_INTERNAL); } +#if 0 /* Call restore out of vt(9) locks. */ static void vt_restore_fbdev_mode(void *arg, int pending) @@ -181,6 +186,7 @@ vt_restore_fbdev_mode(void *arg, int pen sc = vd->vd_softc; drm_fb_helper_restore_fbdev_mode(sc->fb_helper); } +#endif static void vt_kms_postswitch(struct vt_device *vd) @@ -188,7 +194,11 @@ vt_kms_postswitch(struct vt_device *vd) struct vt_kms_softc *sc; sc = vd->vd_softc; +#if 0 taskqueue_enqueue_fast(taskqueue_thread, &sc->fb_mode_task); +#else + drm_fb_helper_restore_fbdev_mode(sc->fb_helper); +#endif } static DRM_LIST_HEAD(kernel_fb_helper_list);