mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-04 16:25:34 +00:00
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> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
5c6161162a
commit
586f27a3c2
9 changed files with 13 additions and 13 deletions
|
@ -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;
|
||||
};
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -61,7 +61,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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Add table
Reference in a new issue