diff options
| author | Dan McDonald <danmcd@joyent.com> | 2020-09-22 10:39:49 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2020-09-22 10:39:49 -0400 |
| commit | 267e12a7d9bf6e5fcefb9cc00f46bfff0dc5226e (patch) | |
| tree | 19a3941920d0039c35d53a5cbee189b5ca51995a /usr/src/uts/i86pc/io/gfx_private | |
| parent | 517abc5c668925e6092495bf332233c3599980d2 (diff) | |
| parent | e9faba760cdf80d7dfa110fe0830917ab94668c2 (diff) | |
| download | illumos-joyent-vpc.tar.gz | |
Merge branch 'master' into vpcvpc
Diffstat (limited to 'usr/src/uts/i86pc/io/gfx_private')
| -rw-r--r-- | usr/src/uts/i86pc/io/gfx_private/gfxp_fb.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/usr/src/uts/i86pc/io/gfx_private/gfxp_fb.c b/usr/src/uts/i86pc/io/gfx_private/gfxp_fb.c index 6d1a99ea05..0d2d1fe1de 100644 --- a/usr/src/uts/i86pc/io/gfx_private/gfxp_fb.c +++ b/usr/src/uts/i86pc/io/gfx_private/gfxp_fb.c @@ -11,6 +11,7 @@ /* * Copyright 2016 Toomas Soome <tsoome@me.com> + * Copyright 2020 RackTop Systems, Inc. */ /* @@ -81,6 +82,17 @@ gfxp_check_for_console(dev_info_t *devi, struct gfxp_fb_softc *softc, uint16_t data16; /* + * fb_info is filled in by data gathered by the bootloader. + * In particular we are interested in "paddr" which is the physical + * address of the framebuffer. If that is not zero, then we have + * a valid framebuffer and we can use this device as a console. + */ + if (fb_info.paddr != 0) { + softc->flags |= GFXP_FLAG_CONSOLE; + return; + } + + /* * Based on Section 11.3, "PCI Display Subsystem Initialization", * of the 1.1 PCI-to-PCI Bridge Architecture Specification * determine if this is the boot console device. First, see |