diff options
author | emaste <emaste@FreeBSD.org> | 2014-09-04 18:54:01 +0000 |
---|---|---|
committer | emaste <emaste@FreeBSD.org> | 2014-09-04 18:54:01 +0000 |
commit | 2b70382fb373e317fcc9f6c5d3a23f3ddba289fc (patch) | |
tree | 360afba7371220f8c52d717b8d8d35d1848b1caf /sys/dev | |
parent | d3502c5201c3953f761c2abc08d154325cd8b335 (diff) | |
download | FreeBSD-src-2b70382fb373e317fcc9f6c5d3a23f3ddba289fc.zip FreeBSD-src-2b70382fb373e317fcc9f6c5d3a23f3ddba289fc.tar.gz |
MFC r269636 by nwhitehorn:
Set fb_pbase properly on PowerPC in the case where we have to guess at
the right register bank for the framebuffer. Disable the assigned-
addresses path on SPARC since it is just a hack for IBM PPC systems
and was neither relevant for nor worked on SPARC anyway.
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/vt/hw/ofwfb/ofwfb.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/vt/hw/ofwfb/ofwfb.c b/sys/dev/vt/hw/ofwfb/ofwfb.c index bec89e4..68e30d2 100644 --- a/sys/dev/vt/hw/ofwfb/ofwfb.c +++ b/sys/dev/vt/hw/ofwfb/ofwfb.c @@ -337,6 +337,8 @@ ofwfb_init(struct vt_device *vd) #else #error Unsupported platform! #endif + + sc->fb.fb_pbase = fb_phys; } else { /* * Some IBM systems don't have an address property. Try to @@ -386,17 +388,13 @@ ofwfb_init(struct vt_device *vd) #if defined(__powerpc__) OF_decode_addr(node, fb_phys, &sc->sc_memt, &sc->fb.fb_vbase); - #elif defined(__sparc64__) - OF_decode_addr(node, fb_phys, &space, &phys); - sc->sc_memt = &ofwfb_memt[0]; - sc->fb.fb_vbase = sparc64_fake_bustag(space, phys, sc->sc_memt); + sc->fb.fb_pbase = sc->fb.fb_vbase; /* 1:1 mapped */ #else /* No ability to interpret assigned-addresses otherwise */ return (CN_DEAD); #endif } - sc->fb.fb_pbase = fb_phys; ofwfb_initialize(vd); vt_fb_init(vd); |