svn commit: r271112 - in stable/10/sys: conf dev/fb

[Ed Maste]

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

Log:
  MFC vt(4) driver for Sun creator(4) framebuffers
  
  r269601 (nwhitehorn):
  
    Add a simple unaccelerated vt(4) framebuffer driver for Sun
    framebuffers handled by creator(4) (Sun Creator 3D, Elite 3D, etc.).
    This provides vt(4) consoles on all devices currently supported by
    syscons on sparc64.  The driver should also be easily adaptable to
    support newer Sun framebuffers such as the XVR-500 and higher.
  
    Many thanks to dumbbell@ (Jean-Sebastien Pedron) for testing this
    remotely during development.
  
  r269783 (dumbbell):
  
    vt(4): Colors are indexed against a console palette, not a VGA palette
  
  Sponsored by:	The FreeBSD Foundation

Added:
  stable/10/sys/dev/fb/creator_vt.c
     - copied, changed from r269601, head/sys/dev/fb/creator_vt.c
Modified:
  stable/10/sys/conf/files.sparc64
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/conf/files.sparc64
==============================================================================
--- stable/10/sys/conf/files.sparc64	Thu Sep  4 18:15:36 2014	(r271111)
+++ stable/10/sys/conf/files.sparc64	Thu Sep  4 18:18:29 2014	(r271112)
@@ -35,6 +35,7 @@ dev/atkbdc/psm.c		optional	psm atkbdc
 dev/auxio/auxio.c		optional	auxio sbus | auxio ebus
 dev/esp/esp_sbus.c		optional	esp sbus
 dev/fb/creator.c		optional	creator sc
+dev/fb/creator_vt.c		optional	creator vt
 dev/fb/fb.c			optional	sc
 dev/fb/gallant12x22.c		optional	sc
 dev/fb/machfb.c			optional	machfb sc

Copied and modified: stable/10/sys/dev/fb/creator_vt.c (from r269601, head/sys/dev/fb/creator_vt.c)
==============================================================================
--- head/sys/dev/fb/creator_vt.c	Tue Aug  5 18:19:51 2014	(r269601, copy source)
+++ stable/10/sys/dev/fb/creator_vt.c	Thu Sep  4 18:18:29 2014	(r271112)
@@ -152,8 +152,9 @@ creatorfb_init(struct vt_device *vd)
 	sc->memh = sparc64_fake_bustag(space, phys, &sc->memt[0]);
 
 	/* 32-bit VGA palette */
-	vt_generate_vga_palette(sc->fb.fb_cmap, COLOR_FORMAT_RGB,
-	    255, 16, 255, 8, 255, 0);
+	vt_generate_cons_palette(sc->fb.fb_cmap, COLOR_FORMAT_RGB,
+	    255, 0, 255, 8, 255, 16);
+	sc->fb.fb_cmsize = 16;
 
 	vt_fb_init(vd);