diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/4019-drm-amd-display-csc_transform-to-dc_csc_transform.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/4019-drm-amd-display-csc_transform-to-dc_csc_transform.patch | 156 |
1 files changed, 156 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/4019-drm-amd-display-csc_transform-to-dc_csc_transform.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/4019-drm-amd-display-csc_transform-to-dc_csc_transform.patch new file mode 100644 index 00000000..64f43dc1 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/4019-drm-amd-display-csc_transform-to-dc_csc_transform.patch @@ -0,0 +1,156 @@ +From 938a5a3cf20713349c171ecc8612f34f5060342d Mon Sep 17 00:00:00 2001 +From: Anthony Koo <Anthony.Koo@amd.com> +Date: Mon, 26 Mar 2018 16:19:18 -0400 +Subject: [PATCH 4019/4131] drm/amd/display: csc_transform to dc_csc_transform + +Signed-off-by: Anthony Koo <Anthony.Koo@amd.com> +Reviewed-by: Anthony Koo <Anthony.Koo@amd.com> +Reviewed-by: Aric Cyr <Aric.Cyr@amd.com> +Acked-by: Harry Wentland <harry.wentland@amd.com> +--- + drivers/gpu/drm/amd/display/dc/dc.h | 4 ++-- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 5 +++++ + drivers/gpu/drm/amd/display/dc/dc_stream.h | 2 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 5 ----- + drivers/gpu/drm/amd/display/dc/inc/hw/ipp.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/transform.h | 2 +- + 9 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h +index 40e6d48..ae817e0 100644 +--- a/drivers/gpu/drm/amd/display/dc/dc.h ++++ b/drivers/gpu/drm/amd/display/dc/dc.h +@@ -457,7 +457,7 @@ struct dc_plane_state { + struct dc_gamma *gamma_correction; + struct dc_transfer_func *in_transfer_func; + struct dc_bias_and_scale *bias_and_scale; +- struct csc_transform input_csc_color_matrix; ++ struct dc_csc_transform input_csc_color_matrix; + struct fixed31_32 coeff_reduction_factor; + uint32_t sdr_white_level; + +@@ -522,7 +522,7 @@ struct dc_surface_update { + struct dc_gamma *gamma; + struct dc_transfer_func *in_transfer_func; + +- struct csc_transform *input_csc_color_matrix; ++ struct dc_csc_transform *input_csc_color_matrix; + struct fixed31_32 *coeff_reduction_factor; + }; + +diff --git a/drivers/gpu/drm/amd/display/dc/dc_hw_types.h b/drivers/gpu/drm/amd/display/dc/dc_hw_types.h +index 5472316..4a05df3 100644 +--- a/drivers/gpu/drm/amd/display/dc/dc_hw_types.h ++++ b/drivers/gpu/drm/amd/display/dc/dc_hw_types.h +@@ -423,6 +423,11 @@ enum dc_gamma_type { + GAMMA_CS_TFM_1D = 3, + }; + ++struct dc_csc_transform { ++ uint16_t matrix[12]; ++ bool enable_adjustment; ++}; ++ + struct dc_gamma { + struct kref refcount; + enum dc_gamma_type type; +diff --git a/drivers/gpu/drm/amd/display/dc/dc_stream.h b/drivers/gpu/drm/amd/display/dc/dc_stream.h +index f90c578..aa73ce6 100644 +--- a/drivers/gpu/drm/amd/display/dc/dc_stream.h ++++ b/drivers/gpu/drm/amd/display/dc/dc_stream.h +@@ -67,7 +67,7 @@ struct dc_stream_state { + struct dc_info_packet hdr_static_metadata; + struct dc_transfer_func *out_transfer_func; + struct colorspace_transform gamut_remap_matrix; +- struct csc_transform csc_color_matrix; ++ struct dc_csc_transform csc_color_matrix; + + enum dc_color_space output_color_space; + enum dc_dither_option dither_option; +diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c +index 5f40a73..c008a71 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c +@@ -264,7 +264,7 @@ void dpp1_cnv_setup ( + struct dpp *dpp_base, + enum surface_pixel_format format, + enum expansion_mode mode, +- struct csc_transform input_csc_color_matrix, ++ struct dc_csc_transform input_csc_color_matrix, + enum dc_color_space input_color_space) + { + uint32_t pixel_format; +diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h +index 9b5ff76..3fccf99 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h ++++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h +@@ -1451,7 +1451,7 @@ void dpp1_cnv_setup ( + struct dpp *dpp_base, + enum surface_pixel_format format, + enum expansion_mode mode, +- struct csc_transform input_csc_color_matrix, ++ struct dc_csc_transform input_csc_color_matrix, + enum dc_color_space input_color_space); + + void dpp1_full_bypass(struct dpp *dpp_base); +diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h b/drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h +index 9999560..bb7af1b 100644 +--- a/drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h ++++ b/drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h +@@ -117,7 +117,7 @@ struct dpp_funcs { + struct dpp *dpp_base, + enum surface_pixel_format format, + enum expansion_mode mode, +- struct csc_transform input_csc_color_matrix, ++ struct dc_csc_transform input_csc_color_matrix, + enum dc_color_space input_color_space); + + void (*dpp_full_bypass)(struct dpp *dpp_base); +diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h b/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h +index 93da445..9fe7302 100644 +--- a/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h ++++ b/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h +@@ -140,11 +140,6 @@ enum opp_regamma { + OPP_REGAMMA_USER + }; + +-struct csc_transform { +- uint16_t matrix[12]; +- bool enable_adjustment; +-}; +- + struct dc_bias_and_scale { + uint16_t scale_red; + uint16_t bias_red; +diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/ipp.h b/drivers/gpu/drm/amd/display/dc/inc/hw/ipp.h +index 2109eac..b2fa4c4 100644 +--- a/drivers/gpu/drm/amd/display/dc/inc/hw/ipp.h ++++ b/drivers/gpu/drm/amd/display/dc/inc/hw/ipp.h +@@ -87,7 +87,7 @@ struct ipp_funcs { + struct input_pixel_processor *ipp, + enum surface_pixel_format format, + enum expansion_mode mode, +- struct csc_transform input_csc_color_matrix, ++ struct dc_csc_transform input_csc_color_matrix, + enum dc_color_space input_color_space); + + /* DCE function to setup IPP. TODO: see if we can consolidate to setup */ +diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/transform.h b/drivers/gpu/drm/amd/display/dc/inc/hw/transform.h +index c5b3623..fecc80c 100644 +--- a/drivers/gpu/drm/amd/display/dc/inc/hw/transform.h ++++ b/drivers/gpu/drm/amd/display/dc/inc/hw/transform.h +@@ -252,7 +252,7 @@ struct transform_funcs { + struct transform *xfm_base, + enum surface_pixel_format format, + enum expansion_mode mode, +- struct csc_transform input_csc_color_matrix, ++ struct dc_csc_transform input_csc_color_matrix, + enum dc_color_space input_color_space); + + void (*ipp_full_bypass)(struct transform *xfm_base); +-- +2.7.4 + |