aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Whitehorn <nwhitehorn@FreeBSD.org>2014-08-06 18:13:09 +0000
committerNathan Whitehorn <nwhitehorn@FreeBSD.org>2014-08-06 18:13:09 +0000
commitf051baa008b4a52ba5173d35a406411cb3ba09bd (patch)
tree048f41f901b5d94999078edc3460f86fb6724d1f
parentd0746cb4be3797c8189edf978613d5679c2150d2 (diff)
downloadsrc-f051baa008b4a52ba5173d35a406411cb3ba09bd.tar.gz
src-f051baa008b4a52ba5173d35a406411cb3ba09bd.zip
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.
Notes
Notes: svn path=/head/; revision=269636
-rw-r--r--sys/dev/vt/hw/ofwfb/ofwfb.c8
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 c22815b4d48d..e1d0c9fea835 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);