From owner-svn-src-head@FreeBSD.ORG Wed Aug 6 18:13:10 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 262EF2B8 for ; Wed, 6 Aug 2014 18:13:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F10CD2139 for ; Wed, 6 Aug 2014 18:13:09 +0000 (UTC) Received: from nwhitehorn (uid 1171) (envelope-from nwhitehorn@FreeBSD.org) id 5a5d by svn.freebsd.org (DragonFly Mail Agent v0.9+); Wed, 06 Aug 2014 18:13:09 +0000 From: Nathan Whitehorn Date: Wed, 6 Aug 2014 18:13:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r269636 - head/sys/dev/vt/hw/ofwfb X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e27035.5a5d.5e609498@svn.freebsd.org> X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Aug 2014 18:13:10 -0000 Author: nwhitehorn Date: Wed Aug 6 18:13:09 2014 New Revision: 269636 URL: http://svnweb.freebsd.org/changeset/base/269636 Log: 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. Modified: head/sys/dev/vt/hw/ofwfb/ofwfb.c Modified: head/sys/dev/vt/hw/ofwfb/ofwfb.c ============================================================================== --- head/sys/dev/vt/hw/ofwfb/ofwfb.c Wed Aug 6 18:09:46 2014 (r269635) +++ head/sys/dev/vt/hw/ofwfb/ofwfb.c Wed Aug 6 18:13:09 2014 (r269636) @@ -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);