~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1368,13 +1368,14 @@
1368	1368
1369	1369	void dpp1_set_cursor_attributes(
1370	1370	struct dpp *dpp_base,
1371		- enum dc_cursor_color_format color_format);
	1371	+ struct dc_cursor_attributes *cursor_attributes);
1372	1372
1373	1373	void dpp1_set_cursor_position(
1374	1374	struct dpp *dpp_base,
1375	1375	const struct dc_cursor_position *pos,
1376	1376	const struct dc_cursor_mi_param *param,
1377		- uint32_t width);
	1377	+ uint32_t width,
	1378	+ uint32_t height);
1378	1379
1379	1380	void dpp1_cnv_set_optional_cursor_attributes(
1380	1381	struct dpp *dpp_base,
..	..	@@ -1485,7 +1486,8 @@
1485	1486	enum surface_pixel_format format,
1486	1487	enum expansion_mode mode,
1487	1488	struct dc_csc_transform input_csc_color_matrix,
1488		- enum dc_color_space input_color_space);
	1489	+ enum dc_color_space input_color_space,
	1490	+ struct cnv_alpha_2bit_lut *alpha_2bit_lut);
1489	1491
1490	1492	void dpp1_full_bypass(struct dpp *dpp_base);
1491	1493
..	..	@@ -1498,6 +1500,11 @@
1498	1500	struct dpp *dpp_base,
1499	1501	uint32_t multiplier);
1500	1502
	1503	+bool dpp1_get_optimal_number_of_taps(
	1504	+ struct dpp *dpp,
	1505	+ struct scaler_data *scl_data,
	1506	+ const struct scaling_taps *in_taps);
	1507	+
1501	1508	void dpp1_construct(struct dcn10_dpp *dpp1,
1502	1509	struct dc_context *ctx,
1503	1510	uint32_t inst,