tegra: dc: enable CMU for secondary display.

Enable CMU for secondary display as default. If
DC type is HDMI, use sRGB-to-sRGB (limited range)
conversion configuration.

Bug 1162082
Bug 1162069
Bug 1407045

Change-Id: Ibb75ae0522fcf3aca6cffd3cfd747dfe5c6038bd
Signed-off-by: Markus Hiienkari <mhiienkari@nvidia.com>
Reviewed-on: http://git-master/r/337981
Reviewed-on: http://git-master/r/353697
Tested-by: Sanjay Singh Chauhan <schauhan@nvidia.com>
Reviewed-by: Thomas J. Meier <tmeier@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Michael I Gold <gold@nvidia.com>
Reviewed-by: Xuezhou Ma <xuezhoum@nvidia.com>

4 files changed, 187 insertions, 5 deletions

diff --git a/arch/arm/mach-tegra/board-dalmore-panel.c b/arch/arm/mach-tegra/board-dalmore-panel.c
index 95be8eaac945..5ca03aac2e6e 100644
--- a/arch/arm/mach-tegra/board-dalmore-panel.c
+++ b/arch/arm/mach-tegra/board-dalmore-panel.c
@@ -267,6 +267,9 @@ static struct tegra_dc_platform_data dalmore_disp2_pdata = {
 	.default_out	= &dalmore_disp2_out,
 	.fb		= &dalmore_disp2_fb_data,
 	.emc_clk_rate	= 300000000,
+#ifdef CONFIG_TEGRA_DC_CMU
+	.cmu_enable	= 1,
+#endif
 };
 
 static struct platform_device dalmore_disp2_device = {
diff --git a/arch/arm/mach-tegra/board-pluto-panel.c b/arch/arm/mach-tegra/board-pluto-panel.c
index af40a674f0e5..94f61ee5c8b5 100644
--- a/arch/arm/mach-tegra/board-pluto-panel.c
+++ b/arch/arm/mach-tegra/board-pluto-panel.c
@@ -219,6 +219,9 @@ static struct tegra_dc_platform_data pluto_disp2_pdata = {
 	.default_out	= &pluto_disp2_out,
 	.fb		= &pluto_disp2_fb_data,
 	.emc_clk_rate	= 300000000,
+#ifdef CONFIG_TEGRA_DC_CMU
+	.cmu_enable	= 1,
+#endif
 };
 
 static struct platform_device pluto_disp2_device = {
diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c
index c85b75ef5877..728fb555344f 100644
--- a/drivers/video/tegra/dc/dc.c
+++ b/drivers/video/tegra/dc/dc.c
@@ -266,6 +266,176 @@ static struct tegra_dc_cmu default_cmu = {
 		253,  253,  254,  254,  254,  254,  255,  255,
 	},
 };
+
+static struct tegra_dc_cmu default_limited_cmu = {
+	/* lut1 maps sRGB to linear space. */
+	{
+		0,    1,    2,    4,    5,    6,    7,    9,
+		10,   11,   12,   14,   15,   16,   18,   20,
+		21,   23,   25,   27,   29,   31,   33,   35,
+		37,   40,   42,   45,   48,   50,   53,   56,
+		59,   62,   66,   69,   72,   76,   79,   83,
+		87,   91,   95,   99,   103,  107,  112,  116,
+		121,  126,  131,  136,  141,  146,  151,  156,
+		162,  168,  173,  179,  185,  191,  197,  204,
+		210,  216,  223,  230,  237,  244,  251,  258,
+		265,  273,  280,  288,  296,  304,  312,  320,
+		329,  337,  346,  354,  363,  372,  381,  390,
+		400,  409,  419,  428,  438,  448,  458,  469,
+		479,  490,  500,  511,  522,  533,  544,  555,
+		567,  578,  590,  602,  614,  626,  639,  651,
+		664,  676,  689,  702,  715,  728,  742,  755,
+		769,  783,  797,  811,  825,  840,  854,  869,
+		884,  899,  914,  929,  945,  960,  976,  992,
+		1008, 1024, 1041, 1057, 1074, 1091, 1108, 1125,
+		1142, 1159, 1177, 1195, 1213, 1231, 1249, 1267,
+		1286, 1304, 1323, 1342, 1361, 1381, 1400, 1420,
+		1440, 1459, 1480, 1500, 1520, 1541, 1562, 1582,
+		1603, 1625, 1646, 1668, 1689, 1711, 1733, 1755,
+		1778, 1800, 1823, 1846, 1869, 1892, 1916, 1939,
+		1963, 1987, 2011, 2035, 2059, 2084, 2109, 2133,
+		2159, 2184, 2209, 2235, 2260, 2286, 2312, 2339,
+		2365, 2392, 2419, 2446, 2473, 2500, 2527, 2555,
+		2583, 2611, 2639, 2668, 2696, 2725, 2754, 2783,
+		2812, 2841, 2871, 2901, 2931, 2961, 2991, 3022,
+		3052, 3083, 3114, 3146, 3177, 3209, 3240, 3272,
+		3304, 3337, 3369, 3402, 3435, 3468, 3501, 3535,
+		3568, 3602, 3636, 3670, 3705, 3739, 3774, 3809,
+		3844, 3879, 3915, 3950, 3986, 4022, 4059, 4095,
+	},
+	/* csc */
+	{
+		0x100, 0x000, 0x000,
+		0x000, 0x100, 0x000,
+		0x000, 0x000, 0x100,
+	},
+	/*
+	 * lut2 maps linear space back to sRGB, where
+	 * the output range is [16...235] (limited).
+	 */
+	{
+		16,  17,  17,  18,  19,  19,  20,  21,
+		22,  22,  23,  24,  24,  25,  26,  26,
+		27,  27,  28,  29,  29,  30,  30,  31,
+		31,  32,  32,  32,  33,  33,  34,  34,
+		35,  35,  35,  36,  36,  36,  37,  37,
+		38,  38,  38,  39,  39,  39,  40,  40,
+		40,  41,  41,  41,  41,  42,  42,  42,
+		43,  43,  43,  43,  44,  44,  44,  45,
+		45,  45,  45,  46,  46,  46,  46,  47,
+		47,  47,  47,  48,  48,  48,  48,  49,
+		49,  49,  49,  49,  50,  50,  50,  50,
+		51,  51,  51,  51,  51,  52,  52,  52,
+		52,  53,  53,  53,  53,  53,  54,  54,
+		54,  54,  54,  55,  55,  55,  55,  55,
+		56,  56,  56,  56,  56,  56,  57,  57,
+		57,  57,  57,  58,  58,  58,  58,  58,
+		58,  59,  59,  59,  59,  59,  60,  60,
+		60,  60,  60,  60,  61,  61,  61,  61,
+		61,  61,  62,  62,  62,  62,  62,  62,
+		63,  63,  63,  63,  63,  63,  63,  64,
+		64,  64,  64,  64,  64,  65,  65,  65,
+		65,  65,  65,  65,  66,  66,  66,  66,
+		66,  66,  67,  67,  67,  67,  67,  67,
+		67,  68,  68,  68,  68,  68,  68,  68,
+		69,  69,  69,  69,  69,  69,  69,  69,
+		70,  70,  70,  70,  70,  70,  70,  71,
+		71,  71,  71,  71,  71,  71,  72,  72,
+		72,  72,  72,  72,  72,  72,  73,  73,
+		73,  73,  73,  73,  73,  73,  74,  74,
+		74,  74,  74,  74,  74,  74,  75,  75,
+		75,  75,  75,  75,  75,  75,  76,  76,
+		76,  76,  76,  76,  76,  76,  76,  77,
+		77,  77,  77,  77,  77,  77,  77,  78,
+		78,  78,  78,  78,  78,  78,  78,  78,
+		79,  79,  79,  79,  79,  79,  79,  79,
+		80,  80,  80,  80,  80,  80,  80,  80,
+		80,  81,  81,  81,  81,  81,  81,  81,
+		81,  81,  81,  82,  82,  82,  82,  82,
+		82,  82,  82,  82,  83,  83,  83,  83,
+		83,  83,  83,  83,  83,  84,  84,  84,
+		84,  84,  84,  84,  84,  84,  84,  85,
+		85,  85,  85,  85,  85,  85,  85,  85,
+		85,  86,  86,  86,  86,  86,  86,  86,
+		86,  86,  86,  87,  87,  87,  87,  87,
+		87,  87,  87,  87,  87,  88,  88,  88,
+		88,  88,  88,  88,  88,  88,  88,  89,
+		89,  89,  89,  89,  89,  89,  89,  89,
+		89,  89,  90,  90,  90,  90,  90,  90,
+		90,  90,  90,  90,  91,  91,  91,  91,
+		91,  91,  91,  91,  91,  91,  91,  92,
+		92,  92,  92,  92,  92,  92,  92,  92,
+		92,  92,  93,  93,  93,  93,  93,  93,
+		93,  93,  93,  93,  93,  94,  94,  94,
+		94,  94,  94,  94,  94,  94,  94,  94,
+		94,  95,  95,  95,  95,  95,  95,  95,
+		95,  95,  95,  95,  96,  96,  96,  96,
+		96,  96,  96,  96,  96,  96,  96,  96,
+		97,  97,  97,  97,  97,  97,  97,  97,
+		97,  97,  97,  97,  98,  98,  98,  98,
+		98,  98,  98,  98,  98,  98,  98,  98,
+		99,  99,  99,  99,  99,  99,  99,  99,
+		99,  99,  99,  99, 100, 100, 100, 100,
+		100, 100, 100, 100, 100, 100, 100, 100,
+		100, 101, 101, 101, 101, 101, 101, 101,
+		102, 102, 103, 104, 104, 105, 105, 106,
+		107, 107, 108, 108, 109, 109, 110, 111,
+		111, 112, 112, 113, 113, 114, 114, 115,
+		115, 116, 116, 117, 117, 118, 118, 119,
+		119, 120, 120, 121, 121, 122, 122, 123,
+		123, 124, 124, 125, 125, 126, 126, 127,
+		127, 127, 128, 128, 129, 129, 130, 130,
+		131, 131, 131, 132, 132, 133, 133, 134,
+		134, 134, 135, 135, 136, 136, 136, 137,
+		137, 138, 138, 139, 139, 139, 140, 140,
+		141, 141, 141, 142, 142, 142, 143, 143,
+		144, 144, 144, 145, 145, 145, 146, 146,
+		147, 147, 147, 148, 148, 148, 149, 149,
+		150, 150, 150, 151, 151, 151, 152, 152,
+		152, 153, 153, 153, 154, 154, 154, 155,
+		155, 155, 156, 156, 156, 157, 157, 157,
+		158, 158, 158, 159, 159, 159, 160, 160,
+		160, 161, 161, 161, 162, 162, 162, 163,
+		163, 163, 164, 164, 164, 165, 165, 165,
+		166, 166, 166, 166, 167, 167, 167, 168,
+		168, 168, 169, 169, 169, 169, 170, 170,
+		170, 171, 171, 171, 172, 172, 172, 172,
+		173, 173, 173, 174, 174, 174, 174, 175,
+		175, 175, 176, 176, 176, 176, 177, 177,
+		177, 178, 178, 178, 178, 179, 179, 179,
+		180, 180, 180, 180, 181, 181, 181, 181,
+		182, 182, 182, 183, 183, 183, 183, 184,
+		184, 184, 184, 185, 185, 185, 185, 186,
+		186, 186, 187, 187, 187, 187, 188, 188,
+		188, 188, 189, 189, 189, 189, 190, 190,
+		190, 190, 191, 191, 191, 191, 192, 192,
+		192, 192, 193, 193, 193, 193, 194, 194,
+		194, 194, 195, 195, 195, 195, 196, 196,
+		196, 196, 197, 197, 197, 197, 198, 198,
+		198, 198, 199, 199, 199, 199, 199, 200,
+		200, 200, 200, 201, 201, 201, 201, 202,
+		202, 202, 202, 203, 203, 203, 203, 203,
+		204, 204, 204, 204, 205, 205, 205, 205,
+		206, 206, 206, 206, 206, 207, 207, 207,
+		207, 208, 208, 208, 208, 208, 209, 209,
+		209, 209, 210, 210, 210, 210, 210, 211,
+		211, 211, 211, 212, 212, 212, 212, 212,
+		213, 213, 213, 213, 213, 214, 214, 214,
+		214, 215, 215, 215, 215, 215, 216, 216,
+		216, 216, 216, 217, 217, 217, 217, 218,
+		218, 218, 218, 218, 219, 219, 219, 219,
+		219, 220, 220, 220, 220, 220, 221, 221,
+		221, 221, 221, 222, 222, 222, 222, 222,
+		223, 223, 223, 223, 224, 224, 224, 224,
+		224, 225, 225, 225, 225, 225, 226, 226,
+		226, 226, 226, 227, 227, 227, 227, 227,
+		227, 228, 228, 228, 228, 228, 229, 229,
+		229, 229, 229, 230, 230, 230, 230, 230,
+		231, 231, 231, 231, 231, 232, 232, 232,
+		232, 232, 233, 233, 233, 233, 233, 233,
+		234, 234, 234, 234, 234, 235, 235, 235,
+	},
+};
 #endif
 
 void tegra_dc_clk_enable(struct tegra_dc *dc)
@@ -1784,10 +1954,14 @@ static int tegra_dc_init(struct tegra_dc *dc)
 	tegra_dc_writel(dc, 0x00000000, DC_DISP_BORDER_COLOR);
 
 #ifdef CONFIG_TEGRA_DC_CMU
-	if (dc->pdata->cmu)
+	if (dc->pdata->cmu) {
 		_tegra_dc_update_cmu(dc, dc->pdata->cmu);
-	else
-		_tegra_dc_update_cmu(dc, &default_cmu);
+	} else {
+		if (dc->out->type == TEGRA_DC_OUT_HDMI)
+			_tegra_dc_update_cmu(dc, &default_limited_cmu);
+		else
+			_tegra_dc_update_cmu(dc, &default_cmu);
+	}
 #endif
 	tegra_dc_set_color_control(dc);
 	for (i = 0; i < DC_N_WINDOWS; i++) {
diff --git a/drivers/video/tegra/dc/hdmi.c b/drivers/video/tegra/dc/hdmi.c
index d7629e8b4d15..b19b824488f5 100644
--- a/drivers/video/tegra/dc/hdmi.c
+++ b/drivers/video/tegra/dc/hdmi.c
@@ -1844,8 +1844,10 @@ static void tegra_dc_hdmi_enable(struct tegra_dc *dc)
 
 	tegra_dc_io_start(dc);
 	tegra_dc_writel(dc, VSYNC_H_POSITION(1), DC_DISP_DISP_TIMING_OPTIONS);
-	tegra_dc_writel(dc, DITHER_CONTROL_DISABLE | BASE_COLOR_SIZE888,
-			DC_DISP_DISP_COLOR_CONTROL);
+
+	dc->out->depth = 24;
+	dc->out->dither = TEGRA_DC_DISABLE_DITHER;
+	tegra_dc_set_color_control(dc);
 
 	/* video_preamble uses h_pulse2 */
 	pulse_start = dc->mode.h_ref_to_sync + dc->mode.h_sync_width +