svn commit: r271118 - stable/10/sys/dev/vt/hw/ofwfb

[Ed Maste]

Author: emaste
Date: Thu Sep  4 18:54:01 2014
New Revision: 271118
URL: http://svnweb.freebsd.org/changeset/base/271118

Log:
  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

Modified:
  stable/10/sys/dev/vt/hw/ofwfb/ofwfb.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/vt/hw/ofwfb/ofwfb.c
==============================================================================
--- stable/10/sys/dev/vt/hw/ofwfb/ofwfb.c	Thu Sep  4 18:43:40 2014	(r271117)
+++ stable/10/sys/dev/vt/hw/ofwfb/ofwfb.c	Thu Sep  4 18:54:01 2014	(r271118)
@@ -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);