[illumos-gate merge]release-20210128

commit beed421eff10640141fe8f9da29a5c8033a97f52
    13383 generalize check for serializing LFENCE
    13384 tsc_read() should use lfence when prudent
    13387 bhyve should expose lfence serialize in DE_CFG MSR
commit 78801af7286cd73dbc996d470f789e75993cf15d
    13365 Add option to testrunner to re-run just failed tests
commit 2d84dc94714fa18a51c85173f806acbc2d1b4257
    13360 loader: use BGRA RBG data in gfx functions
commit a98e9e2e16f7c0305e8538246f8f8464517b3884
    13432 idm: symbol 'idm' is multiply-defined
commit a35d0bb9919a1ab99b0305e759552bef6a8bd053
    13431 rdsib: multiply-defined symbols
commit 245cbc655bd26e8de57809bc109b82105a30693d
    13430 scsi_vhci: multiply-defined symbols
commit 9868091de5a69073a55e3b8cc1a378cac9220edf
    13429 nge: multiply-defined symbols
commit 6626685934fc28e358a8038d599be9e53aa0715e
    13428 rdsv3: symbol 'rdsv3_one_sec_in_hz' is multiply-defined
commit 734e1f66c3254ea498ea4ce3fe6dc7e6f9f293ff
    13473 svccfg: dirs for manifests are manifest not manifests
commit 4f1c2d80debdaa7ad92b0677c6c86fb6b782e811
    13425 i86xpv: multiply-defined symbols

Conflicts:
    usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh

1 files changed, 31 insertions, 4 deletions

diff --git a/usr/src/uts/common/sys/rgb.h b/usr/src/uts/common/sys/rgb.h
index 9ddfaa9e3f..6e0ba29af2 100644
--- a/usr/src/uts/common/sys/rgb.h
+++ b/usr/src/uts/common/sys/rgb.h
@@ -23,6 +23,13 @@ extern "C" {
 #endif
 
 /*
+ * Number of "base" colors is 16, 8 dark and 8 bright/light.
+ * Color map size for indexed colors is 256, to support VGA 256-color modes.
+ */
+#define	NCOLORS		16
+#define	NCMAP		256
+
+/*
  * Color data from bootloader.
  */
 typedef struct rgb_color {
@@ -37,9 +44,9 @@ typedef struct rgb {
 } rgb_t;
 
 typedef struct {
-	uint8_t red[16];
-	uint8_t green[16];
-	uint8_t blue[16];
+	uint8_t red[NCOLORS];
+	uint8_t green[NCOLORS];
+	uint8_t blue[NCOLORS];
 } text_cmap_t;
 
 extern const text_cmap_t cmap4_to_24;
@@ -67,10 +74,30 @@ typedef enum pc_colors {
 	pc_brt_white	= 15
 } pc_colors_t;
 
+typedef enum sun_colors {
+	sun_brt_white	= 0,
+	sun_black	= 1,
+	sun_blue	= 2,
+	sun_green	= 3,
+	sun_cyan	= 4,
+	sun_red		= 5,
+	sun_magenta	= 6,
+	sun_brown	= 7,
+	sun_white	= 8,
+	sun_grey	= 9,
+	sun_brt_blue	= 10,
+	sun_brt_green	= 11,
+	sun_brt_cyan	= 12,
+	sun_brt_red	= 13,
+	sun_brt_magenta	= 14,
+	sun_yellow	= 15,
+} sun_colors_t;
+
 #define	XLATE_NCOLORS	8
 extern const uint8_t dim_xlate[XLATE_NCOLORS];
 extern const uint8_t brt_xlate[XLATE_NCOLORS];
-extern const uint8_t solaris_color_to_pc_color[16];
+extern const uint8_t solaris_color_to_pc_color[NCOLORS];
+extern const uint8_t pc_color_to_solaris_color[NCOLORS];
 
 extern uint32_t rgb_color_map(const rgb_t *, uint8_t);