leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
- 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: Amy Zhang <Amy.Zhang@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Amy Zhang 2017-02-16 11:04:48 -05:00 committed by Alex Deucher
parent 5c1879b6b9
commit 70063a5957
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/amd/display/dc/core/dc_resource.c
View File

@ -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)) {

2
drivers/gpu/drm/amd/display/dc/dc.h
View File

@ -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 {

5
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
View File

@ -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;