diff options
author | emaste <emaste@FreeBSD.org> | 2014-09-02 19:56:37 +0000 |
---|---|---|
committer | emaste <emaste@FreeBSD.org> | 2014-09-02 19:56:37 +0000 |
commit | 4dbb542d9923f0c98d1625bcdd2470d5bc6b0149 (patch) | |
tree | deb65e896f236b21040f77bc80b65fc85d6cfa59 /sys/dev/fb/fbd.c | |
parent | 1063e140b6647575ff2c49996adcc1545a94f57d (diff) | |
download | FreeBSD-src-4dbb542d9923f0c98d1625bcdd2470d5bc6b0149.zip FreeBSD-src-4dbb542d9923f0c98d1625bcdd2470d5bc6b0149.tar.gz |
MFC r268771, r268796 by nwhitehorn:
r268771:
Allow console drivers active from early boot to be used with
xf86-video-scfb, rather than only drivers attached later on. This
involves a small amount of code duplication with dev/fb/fbd.c, which
will fixed later on.
Also improve performance of vt_blank() by making it not read from the
framebuffer unnecessarily.
r268796:
Fix embarassing typos I made.
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sys/dev/fb/fbd.c')
-rw-r--r-- | sys/dev/fb/fbd.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sys/dev/fb/fbd.c b/sys/dev/fb/fbd.c index b75ca33..753923b 100644 --- a/sys/dev/fb/fbd.c +++ b/sys/dev/fb/fbd.c @@ -257,9 +257,6 @@ fb_probe(struct fb_info *info) } else if (info->fb_vbase != 0) { if (info->fb_pbase == 0) { info->fb_flags |= FB_FLAG_NOMMAP; - } else { - if (info->fb_mmap == NULL) - info->fb_mmap = &fb_mmap; } info->wr1 = &vt_fb_mem_wr1; info->wr2 = &vt_fb_mem_wr2; @@ -268,10 +265,6 @@ fb_probe(struct fb_info *info) } else return (ENXIO); - if (info->fb_ioctl == NULL) - info->fb_ioctl = &fb_ioctl; - - return (0); } |