d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert r255420. This seems to break some Powermac systems and will be

Browse Source 
revisited much later.

Pointy hat to:		me
Approved by:		re (kib, implicit due to breakage 10 minutes ago)
This commit is contained in:
Nathan Whitehorn 2013-09-09 13:40:53 +00:00
parent 5d46492ddc
commit 32fa1ceff1
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/powerpc/ofw/ofw_syscons.c
View File

@ -218,7 +218,6 @@ ofwfb_configure(int flags)
ihandle_t stdout;
phandle_t node;
uint32_t fb_phys;
ssize_t proplen;
int depth;
int disable;
int len;
@ -265,21 +264,12 @@ ofwfb_configure(int flags)
} else
return (0);
if (OF_getproplen(node, "height") != sizeof(sc->sc_height) ||
OF_getproplen(node, "width") != sizeof(sc->sc_width))
return (0);
sc->sc_depth = depth;
sc->sc_node = node;
sc->sc_console = 1;
sc->sc_stride = -1;
OF_getprop(node, "height", &sc->sc_height, sizeof(sc->sc_height));
OF_getprop(node, "width", &sc->sc_width, sizeof(sc->sc_width));
proplen = OF_getprop(node, "linebytes", &sc->sc_stride,
sizeof(sc->sc_stride));
if (proplen != sizeof(sc->sc_stride) ||
sc->sc_stride < sc->sc_width*sc->sc_depth/4)
sc->sc_stride = sc->sc_width*sc->sc_depth/4;
OF_getprop(node, "linebytes", &sc->sc_stride, sizeof(sc->sc_stride));
/*
* Grab the physical address of the framebuffer, and then map it
@ -288,8 +278,6 @@ ofwfb_configure(int flags)
*
* XXX We assume #address-cells is 1 at this point.
*/
if (OF_getproplen(node, "address") != sizeof(fb_phys))
return (0);
OF_getprop(node, "address", &fb_phys, sizeof(fb_phys));
bus_space_map(&bs_be_tag, fb_phys, sc->sc_height * sc->sc_stride,