Date: Tue, 15 Oct 2013 13:07:25 +0000 (UTC) From: Aleksandr Rybalko <ray@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r256534 - user/ed/newcons/sys/dev/drm2 Message-ID: <201310151307.r9FD7PnB011149@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ray Date: Tue Oct 15 13:07:24 2013 New Revision: 256534 URL: http://svnweb.freebsd.org/changeset/base/256534 Log: Partially revert accidentally committed #if from r256528. 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:59:40 2013 (r256533) +++ user/ed/newcons/sys/dev/drm2/drm_fb_helper.c Tue Oct 15 13:07:24 2013 (r256534) @@ -53,9 +53,7 @@ static vd_init_t vt_kms_init; static vd_blank_t vt_kms_blank; 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, @@ -167,14 +165,11 @@ 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) @@ -186,7 +181,6 @@ 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) @@ -194,11 +188,7 @@ 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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310151307.r9FD7PnB011149>