Commit 70063a59 authored by Amy Zhang's avatar Amy Zhang Committed by Alex Deucher
Browse files

drm/amd/display: Add bypass case for PQ transfer function 



- Source and destination color space should be the same for
  app control case
- Bypass degamma, regamma, and gamut remap
- Add hdr supported check for info frame

Signed-off-by: default avatarAmy Zhang <Amy.Zhang@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5c1879b6

drivers/gpu/drm/amd/display/dc/core/dc_resource.c

+1 −1
Original line number Diff line number Diff line
@@ -1675,7 +1675,7 @@ static void set_hdr_static_info_packet( 


	hdr_metadata = surface->public.hdr_static_ctx;



	if (!hdr_metadata.is_hdr)

	if (!hdr_metadata.hdr_supported)

		return;



	if (dc_is_hdmi_signal(signal)) {

drivers/gpu/drm/amd/display/dc/dc.h

+2 −0
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ enum { 
};



struct dc_hdr_static_metadata {

	bool hdr_supported;

	bool is_hdr;



	/* display chromaticities and white point in units of 0.00001 */
@@ -207,6 +208,7 @@ struct dc_hdr_static_metadata { 
enum dc_transfer_func_type {

	TF_TYPE_PREDEFINED,

	TF_TYPE_DISTRIBUTED_POINTS,

	TF_TYPE_BYPASS

};



struct dc_transfer_func_distributed_points {

drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c

+4 −1
Original line number Diff line number Diff line
@@ -279,6 +279,8 @@ static bool dce110_set_input_transfer_func( 
			result = false;

			break;

		}

	} else if (tf->public.type == TF_TYPE_BYPASS) {

		ipp->funcs->ipp_set_degamma(ipp, IPP_DEGAMMA_MODE_BYPASS);

	} else {

		/*TF_TYPE_DISTRIBUTED_POINTS - Not supported in DCE 11*/

		result = false;
@@ -428,7 +430,8 @@ static bool dce110_translate_regamma_to_hw_format(const struct dc_transfer_func 
	int32_t segment_start, segment_end;

	uint32_t i, j, k, seg_distr[16], increment, start_index, hw_points;



	if (output_tf == NULL || regamma_params == NULL)

	if (output_tf == NULL || regamma_params == NULL ||

			output_tf->type == TF_TYPE_BYPASS)

		return false;



	arr_points = regamma_params->arr_points;