Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98c8afd3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mdss: Add support for SRGB IGC"

parents e3af8f8c ccec56bc

drivers/video/msm/mdss/mdss_mdp_pp.c

+1 −0
Original line number Diff line number Diff line
@@ -6212,6 +6212,7 @@ static int sspp_cache_location(u32 pipe_type, enum pp_config_block *block) 
		break;

	case MDSS_MDP_PIPE_TYPE_DMA:

		*block = SSPP_DMA;

		break;

	default:

		pr_err("invalid pipe type %d\n", pipe_type);

		ret = -EINVAL;

drivers/video/msm/mdss/mdss_mdp_pp_cache_config.c

+30 −0
Original line number Diff line number Diff line
@@ -71,6 +71,29 @@ static u32 pp_igc_709[IGC_LUT_ENTRIES] = { 
	4095,

};



static u32 pp_igc_srgb[IGC_LUT_ENTRIES] = {

	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

};



static int pp_hist_lut_cache_params_v1_7(struct mdp_hist_lut_data *config,

				      struct mdss_pp_res_type *mdss_pp_res)

{
@@ -851,6 +874,13 @@ static int pp_igc_lut_cache_params_pipe_v1_7(struct mdp_igc_lut_data *config, 
		copy_from_kernel = 1;

		fix_up = 1;

		break;

	case mdp_igc_srgb:

		v17_usr_config.c0_c1_data = pp_igc_srgb;

		v17_usr_config.c2_data = pp_igc_srgb;

		v17_usr_config.len = IGC_LUT_ENTRIES;

		copy_from_kernel = 1;

		fix_up = 1;

		break;

	case mdp_igc_rec601:

		v17_usr_config.c0_c1_data = pp_igc_601;

		v17_usr_config.c2_data = pp_igc_601;

include/uapi/linux/msm_mdp.h

+1 −0
Original line number Diff line number Diff line
@@ -559,6 +559,7 @@ struct mdp_pa_v2_cfg_data { 
enum {

	mdp_igc_rec601 = 1,

	mdp_igc_rec709,

	mdp_igc_srgb,

	mdp_igc_custom,

	mdp_igc_rec_max,

};