drm/amd/display: Flattening to dc_transfer_func

Flattening dc transfer functions in the following manner:
transfer_func > core_transfer_func > dc_transfer_func

References to deleted structs are updated as needed.

Signed-off-by: Leo (Sunpeng) Li <sunpeng.li@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>

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_surface.c b/drivers/gpu/drm/amd/display/dc/core/dc_surface.c
index aa6ac95962358706696df45c064cb9ef43517efc..d44ddfb85748b1a14efc50b9078aaee237f43ce4 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_surface.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_surface.c
@@ -45,18 +45,11 @@ struct gamma {
        int ref_count;
 };
 
-struct transfer_func {
-       struct core_transfer_func protected;
-       int ref_count;
-};
-
 #define DC_SURFACE_TO_SURFACE(dc_surface) container_of(dc_surface, struct surface, protected.public)
 #define CORE_SURFACE_TO_SURFACE(core_surface) container_of(core_surface, struct surface, protected)
 
 #define DC_GAMMA_TO_GAMMA(dc_gamma) \
        container_of(dc_gamma, struct gamma, protected.public)
-#define DC_TRANSFER_FUNC_TO_TRANSFER_FUNC(dc_tf) \
-       container_of(dc_tf, struct transfer_func, protected.public)
 #define CORE_GAMMA_TO_GAMMA(core_gamma) \
        container_of(core_gamma, struct gamma, protected)
 
@@ -208,18 +201,14 @@ struct dc_gamma *dc_create_gamma()
        return NULL;
 }
 
-void dc_transfer_func_retain(const struct dc_transfer_func *dc_tf)
+void dc_transfer_func_retain(struct dc_transfer_func *tf)
 {
-       struct transfer_func *tf = DC_TRANSFER_FUNC_TO_TRANSFER_FUNC(dc_tf);
-
        ASSERT(tf->ref_count > 0);
        ++tf->ref_count;
 }
 
-void dc_transfer_func_release(const struct dc_transfer_func *dc_tf)
+void dc_transfer_func_release(struct dc_transfer_func *tf)
 {
-       struct transfer_func *tf = DC_TRANSFER_FUNC_TO_TRANSFER_FUNC(dc_tf);
-
        ASSERT(tf->ref_count > 0);
        --tf->ref_count;
 
@@ -229,14 +218,14 @@ void dc_transfer_func_release(const struct dc_transfer_func *dc_tf)
 
 struct dc_transfer_func *dc_create_transfer_func()
 {
-       struct transfer_func *tf = dm_alloc(sizeof(*tf));
+       struct dc_transfer_func *tf = dm_alloc(sizeof(*tf));
 
        if (tf == NULL)
                goto alloc_fail;
 
        ++tf->ref_count;
 
-       return &tf->protected.public;
+       return tf;
 
 alloc_fail:
        return NULL;

diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index 42c1aa8d68afe0916a4e82608961d6ffad4ff521..1fad03cdeb9db8c6ad21f8c07a6ab7928834909d 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -293,6 +293,8 @@ struct dc_transfer_func {
        struct dc_transfer_func_distributed_points tf_pts;
        enum dc_transfer_func_type type;
        enum dc_transfer_func_predefined tf;
+       struct dc_context *ctx;
+       int ref_count;
 };
 
 struct dc_surface {
@@ -310,7 +312,7 @@ struct dc_surface {
        struct dc_hdr_static_metadata hdr_static_ctx;
 
        const struct dc_gamma *gamma_correction;
-       const struct dc_transfer_func *in_transfer_func;
+       struct dc_transfer_func *in_transfer_func;
 
        enum dc_color_space color_space;
        enum surface_pixel_format format;
@@ -384,8 +386,8 @@ void dc_gamma_retain(const struct dc_gamma *dc_gamma);
 void dc_gamma_release(const struct dc_gamma **dc_gamma);
 struct dc_gamma *dc_create_gamma(void);
 
-void dc_transfer_func_retain(const struct dc_transfer_func *dc_tf);
-void dc_transfer_func_release(const struct dc_transfer_func *dc_tf);
+void dc_transfer_func_retain(struct dc_transfer_func *dc_tf);
+void dc_transfer_func_release(struct dc_transfer_func *dc_tf);
 struct dc_transfer_func *dc_create_transfer_func(void);
 
 /*
@@ -465,7 +467,7 @@ struct dc_stream {
 
        struct freesync_context freesync_ctx;
 
-       const struct dc_transfer_func *out_transfer_func;
+       struct dc_transfer_func *out_transfer_func;
        struct colorspace_transform gamut_remap_matrix;
        struct csc_transform csc_color_matrix;
 

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 d3c84dc36b80ebf9c008a8ded390a25f6e9719d4..5d64611eb6a63779b409a74d76aa4e9a2bef44a0 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
@@ -242,7 +242,7 @@ static bool dce110_set_input_transfer_func(
        const struct core_surface *surface)
 {
        struct input_pixel_processor *ipp = pipe_ctx->ipp;
-       const struct core_transfer_func *tf = NULL;
+       const struct dc_transfer_func *tf = NULL;
        struct ipp_prescale_params prescale_params = { 0 };
        bool result = true;
 
@@ -250,7 +250,7 @@ static bool dce110_set_input_transfer_func(
                return false;
 
        if (surface->public.in_transfer_func)
-               tf = DC_TRANSFER_FUNC_TO_CORE(surface->public.in_transfer_func);
+               tf = surface->public.in_transfer_func;
 
        build_prescale_params(&prescale_params, surface);
        ipp->funcs->ipp_program_prescale(ipp, &prescale_params);
@@ -262,8 +262,8 @@ static bool dce110_set_input_transfer_func(
                /* Default case if no input transfer function specified */
                ipp->funcs->ipp_set_degamma(ipp,
                                IPP_DEGAMMA_MODE_HW_sRGB);
-       } else if (tf->public.type == TF_TYPE_PREDEFINED) {
-               switch (tf->public.tf) {
+       } else if (tf->type == TF_TYPE_PREDEFINED) {
+               switch (tf->tf) {
                case TRANSFER_FUNCTION_SRGB:
                        ipp->funcs->ipp_set_degamma(ipp,
                                        IPP_DEGAMMA_MODE_HW_sRGB);
@@ -283,7 +283,7 @@ static bool dce110_set_input_transfer_func(
                        result = false;
                        break;
                }
-       } else if (tf->public.type == TF_TYPE_BYPASS) {
+       } else if (tf->type == TF_TYPE_BYPASS) {
                ipp->funcs->ipp_set_degamma(ipp, IPP_DEGAMMA_MODE_BYPASS);
        } else {
                /*TF_TYPE_DISTRIBUTED_POINTS - Not supported in DCE 11*/

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
index 4c39bf052d08f9ae40c90ba5b2da59753e0420f5..ac0d62c10da282036610d2b012ce16591a4680b7 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c
@@ -602,14 +602,14 @@ static bool dcn10_set_input_transfer_func(
        struct pipe_ctx *pipe_ctx, const struct core_surface *surface)
 {
        struct input_pixel_processor *ipp = pipe_ctx->ipp;
-       const struct core_transfer_func *tf = NULL;
+       const struct dc_transfer_func *tf = NULL;
        bool result = true;
 
        if (ipp == NULL)
                return false;
 
        if (surface->public.in_transfer_func)
-               tf = DC_TRANSFER_FUNC_TO_CORE(surface->public.in_transfer_func);
+               tf = surface->public.in_transfer_func;
 
        if (surface->public.gamma_correction && dce_use_lut(surface))
                ipp->funcs->ipp_program_input_lut(ipp,
@@ -617,8 +617,8 @@ static bool dcn10_set_input_transfer_func(
 
        if (tf == NULL)
                ipp->funcs->ipp_set_degamma(ipp, IPP_DEGAMMA_MODE_BYPASS);
-       else if (tf->public.type == TF_TYPE_PREDEFINED) {
-               switch (tf->public.tf) {
+       else if (tf->type == TF_TYPE_PREDEFINED) {
+               switch (tf->tf) {
                case TRANSFER_FUNCTION_SRGB:
                        ipp->funcs->ipp_set_degamma(ipp,
                                        IPP_DEGAMMA_MODE_HW_sRGB);
@@ -638,7 +638,7 @@ static bool dcn10_set_input_transfer_func(
                        result = false;
                        break;
                }
-       } else if (tf->public.type == TF_TYPE_BYPASS) {
+       } else if (tf->type == TF_TYPE_BYPASS) {
                ipp->funcs->ipp_set_degamma(ipp, IPP_DEGAMMA_MODE_BYPASS);
        } else {
                /*TF_TYPE_DISTRIBUTED_POINTS*/

diff --git a/drivers/gpu/drm/amd/display/dc/inc/core_types.h b/drivers/gpu/drm/amd/display/dc/inc/core_types.h
index 03084188980352c7c457ccdb77ad8b9d214eba29..3e9a0ccca3b4002400b257c9dbfbf7a7dc482e8e 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/inc/core_types.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/core_types.h
@@ -49,9 +49,6 @@ struct core_stream;
 #define DC_GAMMA_TO_CORE(dc_gamma) \
        container_of(dc_gamma, struct core_gamma, public)
 
-#define DC_TRANSFER_FUNC_TO_CORE(dc_transfer_func) \
-       container_of(dc_transfer_func, struct core_transfer_func, public)
-
 struct core_surface {
        struct dc_surface public;
        struct dc_surface_status status;
@@ -63,11 +60,6 @@ struct core_gamma {
        struct dc_context *ctx;
 };
 
-struct core_transfer_func {
-       struct dc_transfer_func public;
-       struct dc_context *ctx;
-};
-
 void enable_surface_flip_reporting(struct dc_surface *dc_surface,
                uint32_t controller_id);