diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0222-drm-amd-display-Add-bypass-case-for-PQ-transfer-func.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0222-drm-amd-display-Add-bypass-case-for-PQ-transfer-func.patch | 80 |
1 files changed, 80 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0222-drm-amd-display-Add-bypass-case-for-PQ-transfer-func.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0222-drm-amd-display-Add-bypass-case-for-PQ-transfer-func.patch new file mode 100644 index 00000000..de9f5fa0 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0222-drm-amd-display-Add-bypass-case-for-PQ-transfer-func.patch @@ -0,0 +1,80 @@ +From bd3f623515ba8ef764280eab812048bcd655de77 Mon Sep 17 00:00:00 2001 +From: Amy Zhang <Amy.Zhang@amd.com> +Date: Thu, 16 Feb 2017 11:04:48 -0500 +Subject: [PATCH 0222/4131] 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: 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> +--- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dc.h | 2 ++ + drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 5 ++++- + 3 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +index 991828f..4d556b3 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +@@ -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)) { +diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h +index 13e7134..71d7dde 100644 +--- a/drivers/gpu/drm/amd/display/dc/dc.h ++++ b/drivers/gpu/drm/amd/display/dc/dc.h +@@ -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 { +diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +index 9b6d251a..9c9183f 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c ++++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +@@ -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; +-- +2.7.4 + |