diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4487-drm-amd-display-cleanup-of-construct-and-destruct-fu.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4487-drm-amd-display-cleanup-of-construct-and-destruct-fu.patch | 1071 |
1 files changed, 1071 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4487-drm-amd-display-cleanup-of-construct-and-destruct-fu.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4487-drm-amd-display-cleanup-of-construct-and-destruct-fu.patch new file mode 100644 index 00000000..8fbd65ce --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4487-drm-amd-display-cleanup-of-construct-and-destruct-fu.patch @@ -0,0 +1,1071 @@ +From a476c483cb70b9fb28ee2336785d225a0f920330 Mon Sep 17 00:00:00 2001 +From: Anthony Koo <Anthony.Koo@amd.com> +Date: Thu, 31 Oct 2019 21:39:39 -0400 +Subject: [PATCH 4487/4736] drm/amd/display: cleanup of construct and destruct + funcs + +[Why] +Too many construct functions which makes searching +difficult, especially on some debuggers. + +[How] +Append all construct and destruct functions with dcn +number and object type to make each construct function +name unique + +Signed-off-by: Anthony Koo <Anthony.Koo@amd.com> +Reviewed-by: Aric Cyr <Aric.Cyr@amd.com> +Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com> +--- + .../gpu/drm/amd/display/dc/bios/bios_parser.c | 4 +-- + .../drm/amd/display/dc/bios/bios_parser2.c | 8 ++--- + drivers/gpu/drm/amd/display/dc/core/dc.c | 10 +++--- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 8 ++--- + .../gpu/drm/amd/display/dc/core/dc_link_ddc.c | 8 ++--- + drivers/gpu/drm/amd/display/dc/core/dc_sink.c | 8 ++--- + .../gpu/drm/amd/display/dc/core/dc_stream.c | 8 ++--- + .../gpu/drm/amd/display/dc/core/dc_surface.c | 8 ++--- + .../amd/display/dc/dce100/dce100_resource.c | 10 +++--- + .../amd/display/dc/dce110/dce110_resource.c | 10 +++--- + .../amd/display/dc/dce112/dce112_resource.c | 10 +++--- + .../amd/display/dc/dce120/dce120_resource.c | 10 +++--- + .../drm/amd/display/dc/dce80/dce80_resource.c | 10 +++--- + .../drm/amd/display/dc/dcn10/dcn10_resource.c | 10 +++--- + .../drm/amd/display/dc/dcn20/dcn20_resource.c | 10 +++--- + .../drm/amd/display/dc/dcn21/dcn21_resource.c | 10 +++--- + drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c | 12 +++---- + .../gpu/drm/amd/display/dc/gpio/hw_generic.c | 23 ++++--------- + drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c | 32 +++++-------------- + .../dc/irq/dce110/irq_service_dce110.c | 4 +-- + .../dc/irq/dce120/irq_service_dce120.c | 4 +-- + .../display/dc/irq/dce80/irq_service_dce80.c | 4 +-- + .../display/dc/irq/dcn10/irq_service_dcn10.c | 4 +-- + .../display/dc/irq/dcn20/irq_service_dcn20.c | 4 +-- + .../display/dc/irq/dcn21/irq_service_dcn21.c | 4 +-- + 25 files changed, 104 insertions(+), 129 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c b/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c +index 0d4993691199..714a862e7321 100644 +--- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c ++++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c +@@ -109,7 +109,7 @@ struct dc_bios *bios_parser_create( + return NULL; + } + +-static void destruct(struct bios_parser *bp) ++static void bios_parser_destruct(struct bios_parser *bp) + { + kfree(bp->base.bios_local_image); + kfree(bp->base.integrated_info); +@@ -124,7 +124,7 @@ static void bios_parser_destroy(struct dc_bios **dcb) + return; + } + +- destruct(bp); ++ bios_parser_destruct(bp); + + kfree(bp); + *dcb = NULL; +diff --git a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c +index 884b07774f6d..03a5e82a7b2d 100644 +--- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c ++++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c +@@ -109,7 +109,7 @@ static struct atom_encoder_caps_record *get_encoder_cap_record( + + #define DATA_TABLES(table) (bp->master_data_tbl->listOfdatatables.table) + +-static void destruct(struct bios_parser *bp) ++static void bios_parser2_destruct(struct bios_parser *bp) + { + kfree(bp->base.bios_local_image); + kfree(bp->base.integrated_info); +@@ -124,7 +124,7 @@ static void firmware_parser_destroy(struct dc_bios **dcb) + return; + } + +- destruct(bp); ++ bios_parser2_destruct(bp); + + kfree(bp); + *dcb = NULL; +@@ -1925,7 +1925,7 @@ static const struct dc_vbios_funcs vbios_funcs = { + .get_board_layout_info = bios_get_board_layout_info, + }; + +-static bool bios_parser_construct( ++static bool bios_parser2_construct( + struct bios_parser *bp, + struct bp_init_data *init, + enum dce_version dce_version) +@@ -2018,7 +2018,7 @@ struct dc_bios *firmware_parser_create( + if (!bp) + return NULL; + +- if (bios_parser_construct(bp, init, dce_version)) ++ if (bios_parser2_construct(bp, init, dce_version)) + return &bp->base; + + kfree(bp); +diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c +index 9e600d3e2fd8..7539c3accd59 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc.c +@@ -534,7 +534,7 @@ void dc_stream_set_static_screen_events(struct dc *dc, + dc->hwss.set_static_screen_control(pipes_affected, num_pipes_affected, events); + } + +-static void destruct(struct dc *dc) ++static void dc_destruct(struct dc *dc) + { + if (dc->current_state) { + dc_release_state(dc->current_state); +@@ -582,7 +582,7 @@ static void destruct(struct dc *dc) + #endif + } + +-static bool construct(struct dc *dc, ++static bool dc_construct(struct dc *dc, + const struct dc_init_data *init_params) + { + struct dc_context *dc_ctx; +@@ -734,7 +734,7 @@ static bool construct(struct dc *dc, + + fail: + +- destruct(dc); ++ dc_destruct(dc); + return false; + } + +@@ -806,7 +806,7 @@ struct dc *dc_create(const struct dc_init_data *init_params) + if (NULL == dc) + goto alloc_fail; + +- if (false == construct(dc, init_params)) ++ if (false == dc_construct(dc, init_params)) + goto construct_fail; + + full_pipe_count = dc->res_pool->pipe_count; +@@ -863,7 +863,7 @@ void dc_deinit_callbacks(struct dc *dc) + + void dc_destroy(struct dc **dc) + { +- destruct(*dc); ++ dc_destruct(*dc); + kfree(*dc); + *dc = NULL; + } +diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c +index 58b63612c926..014cb7cf9cba 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c +@@ -72,7 +72,7 @@ enum { + /******************************************************************************* + * Private functions + ******************************************************************************/ +-static void destruct(struct dc_link *link) ++static void dc_link_destruct(struct dc_link *link) + { + int i; + +@@ -1242,7 +1242,7 @@ static enum transmitter translate_encoder_to_transmitter( + } + } + +-static bool construct( ++static bool dc_link_construct( + struct dc_link *link, + const struct link_init_data *init_params) + { +@@ -1444,7 +1444,7 @@ struct dc_link *link_create(const struct link_init_data *init_params) + if (NULL == link) + goto alloc_fail; + +- if (false == construct(link, init_params)) ++ if (false == dc_link_construct(link, init_params)) + goto construct_fail; + + return link; +@@ -1458,7 +1458,7 @@ struct dc_link *link_create(const struct link_init_data *init_params) + + void link_destroy(struct dc_link **link) + { +- destruct(*link); ++ dc_link_destruct(*link); + kfree(*link); + *link = NULL; + } +diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c +index 68c0cf85deb7..60d3c164495d 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c +@@ -185,7 +185,7 @@ void dal_ddc_i2c_payloads_add( + + } + +-static void construct( ++static void ddc_service_construct( + struct ddc_service *ddc_service, + struct ddc_service_init_data *init_data) + { +@@ -237,11 +237,11 @@ struct ddc_service *dal_ddc_service_create( + if (!ddc_service) + return NULL; + +- construct(ddc_service, init_data); ++ ddc_service_construct(ddc_service, init_data); + return ddc_service; + } + +-static void destruct(struct ddc_service *ddc) ++static void ddc_service_destruct(struct ddc_service *ddc) + { + if (ddc->ddc_pin) + dal_gpio_destroy_ddc(&ddc->ddc_pin); +@@ -253,7 +253,7 @@ void dal_ddc_service_destroy(struct ddc_service **ddc) + BREAK_TO_DEBUGGER(); + return; + } +- destruct(*ddc); ++ ddc_service_destruct(*ddc); + kfree(*ddc); + *ddc = NULL; + } +diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_sink.c b/drivers/gpu/drm/amd/display/dc/core/dc_sink.c +index 9971b515c3eb..a3fa001ef585 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc_sink.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc_sink.c +@@ -31,7 +31,7 @@ + * Private functions + ******************************************************************************/ + +-static void destruct(struct dc_sink *sink) ++static void dc_sink_destruct(struct dc_sink *sink) + { + if (sink->dc_container_id) { + kfree(sink->dc_container_id); +@@ -39,7 +39,7 @@ static void destruct(struct dc_sink *sink) + } + } + +-static bool construct(struct dc_sink *sink, const struct dc_sink_init_data *init_params) ++static bool dc_sink_construct(struct dc_sink *sink, const struct dc_sink_init_data *init_params) + { + + struct dc_link *link = init_params->link; +@@ -73,7 +73,7 @@ void dc_sink_retain(struct dc_sink *sink) + static void dc_sink_free(struct kref *kref) + { + struct dc_sink *sink = container_of(kref, struct dc_sink, refcount); +- destruct(sink); ++ dc_sink_destruct(sink); + kfree(sink); + } + +@@ -89,7 +89,7 @@ struct dc_sink *dc_sink_create(const struct dc_sink_init_data *init_params) + if (NULL == sink) + goto alloc_fail; + +- if (false == construct(sink, init_params)) ++ if (false == dc_sink_construct(sink, init_params)) + goto construct_fail; + + kref_init(&sink->refcount); +diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c +index 2e03a1120bee..ae7cbb6d7847 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc_stream.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc_stream.c +@@ -55,7 +55,7 @@ void update_stream_signal(struct dc_stream_state *stream, struct dc_sink *sink) + } + } + +-static void construct(struct dc_stream_state *stream, ++static void dc_stream_construct(struct dc_stream_state *stream, + struct dc_sink *dc_sink_data) + { + uint32_t i = 0; +@@ -126,7 +126,7 @@ static void construct(struct dc_stream_state *stream, + stream->ctx->dc_stream_id_count++; + } + +-static void destruct(struct dc_stream_state *stream) ++static void dc_stream_destruct(struct dc_stream_state *stream) + { + dc_sink_release(stream->sink); + if (stream->out_transfer_func != NULL) { +@@ -144,7 +144,7 @@ static void dc_stream_free(struct kref *kref) + { + struct dc_stream_state *stream = container_of(kref, struct dc_stream_state, refcount); + +- destruct(stream); ++ dc_stream_destruct(stream); + kfree(stream); + } + +@@ -167,7 +167,7 @@ struct dc_stream_state *dc_create_stream_for_sink( + if (stream == NULL) + return NULL; + +- construct(stream, sink); ++ dc_stream_construct(stream, sink); + + kref_init(&stream->refcount); + +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 9184f877f537..d534ac166512 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc_surface.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc_surface.c +@@ -35,7 +35,7 @@ + /******************************************************************************* + * Private functions + ******************************************************************************/ +-static void construct(struct dc_context *ctx, struct dc_plane_state *plane_state) ++static void dc_plane_construct(struct dc_context *ctx, struct dc_plane_state *plane_state) + { + plane_state->ctx = ctx; + +@@ -68,7 +68,7 @@ static void construct(struct dc_context *ctx, struct dc_plane_state *plane_state + #endif + } + +-static void destruct(struct dc_plane_state *plane_state) ++static void dc_plane_destruct(struct dc_plane_state *plane_state) + { + if (plane_state->gamma_correction != NULL) { + dc_gamma_release(&plane_state->gamma_correction); +@@ -119,7 +119,7 @@ struct dc_plane_state *dc_create_plane_state(struct dc *dc) + return NULL; + + kref_init(&plane_state->refcount); +- construct(core_dc->ctx, plane_state); ++ dc_plane_construct(core_dc->ctx, plane_state); + + return plane_state; + } +@@ -189,7 +189,7 @@ void dc_plane_state_retain(struct dc_plane_state *plane_state) + static void dc_plane_state_free(struct kref *kref) + { + struct dc_plane_state *plane_state = container_of(kref, struct dc_plane_state, refcount); +- destruct(plane_state); ++ dc_plane_destruct(plane_state); + kvfree(plane_state); + } + +diff --git a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c +index 8ec9b4639fe7..2a5ad50ba454 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c +@@ -722,7 +722,7 @@ void dce100_clock_source_destroy(struct clock_source **clk_src) + *clk_src = NULL; + } + +-static void destruct(struct dce110_resource_pool *pool) ++static void dce100_resource_destruct(struct dce110_resource_pool *pool) + { + unsigned int i; + +@@ -882,7 +882,7 @@ static void dce100_destroy_resource_pool(struct resource_pool **pool) + { + struct dce110_resource_pool *dce110_pool = TO_DCE110_RES_POOL(*pool); + +- destruct(dce110_pool); ++ dce100_resource_destruct(dce110_pool); + kfree(dce110_pool); + *pool = NULL; + } +@@ -947,7 +947,7 @@ static const struct resource_funcs dce100_res_pool_funcs = { + .find_first_free_match_stream_enc_for_link = dce100_find_first_free_match_stream_enc_for_link + }; + +-static bool construct( ++static bool dce100_resource_construct( + uint8_t num_virtual_links, + struct dc *dc, + struct dce110_resource_pool *pool) +@@ -1119,7 +1119,7 @@ static bool construct( + return true; + + res_create_fail: +- destruct(pool); ++ dce100_resource_destruct(pool); + + return false; + } +@@ -1134,7 +1134,7 @@ struct resource_pool *dce100_create_resource_pool( + if (!pool) + return NULL; + +- if (construct(num_virtual_links, dc, pool)) ++ if (dce100_resource_construct(num_virtual_links, dc, pool)) + return &pool->base; + + kfree(pool); +diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c +index 377fa9193ce1..762f97b48f0f 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c +@@ -780,7 +780,7 @@ void dce110_clock_source_destroy(struct clock_source **clk_src) + *clk_src = NULL; + } + +-static void destruct(struct dce110_resource_pool *pool) ++static void dce110_resource_destruct(struct dce110_resource_pool *pool) + { + unsigned int i; + +@@ -1159,7 +1159,7 @@ static void dce110_destroy_resource_pool(struct resource_pool **pool) + { + struct dce110_resource_pool *dce110_pool = TO_DCE110_RES_POOL(*pool); + +- destruct(dce110_pool); ++ dce110_resource_destruct(dce110_pool); + kfree(dce110_pool); + *pool = NULL; + } +@@ -1311,7 +1311,7 @@ const struct resource_caps *dce110_resource_cap( + return &carrizo_resource_cap; + } + +-static bool construct( ++static bool dce110_resource_construct( + uint8_t num_virtual_links, + struct dc *dc, + struct dce110_resource_pool *pool, +@@ -1490,7 +1490,7 @@ static bool construct( + return true; + + res_create_fail: +- destruct(pool); ++ dce110_resource_destruct(pool); + return false; + } + +@@ -1505,7 +1505,7 @@ struct resource_pool *dce110_create_resource_pool( + if (!pool) + return NULL; + +- if (construct(num_virtual_links, dc, pool, asic_id)) ++ if (dce110_resource_construct(num_virtual_links, dc, pool, asic_id)) + return &pool->base; + + kfree(pool); +diff --git a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c +index 5bde6ac2fa7e..b2f127bd85ee 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c +@@ -742,7 +742,7 @@ void dce112_clock_source_destroy(struct clock_source **clk_src) + *clk_src = NULL; + } + +-static void destruct(struct dce110_resource_pool *pool) ++static void dce112_resource_destruct(struct dce110_resource_pool *pool) + { + unsigned int i; + +@@ -1011,7 +1011,7 @@ static void dce112_destroy_resource_pool(struct resource_pool **pool) + { + struct dce110_resource_pool *dce110_pool = TO_DCE110_RES_POOL(*pool); + +- destruct(dce110_pool); ++ dce112_resource_destruct(dce110_pool); + kfree(dce110_pool); + *pool = NULL; + } +@@ -1184,7 +1184,7 @@ const struct resource_caps *dce112_resource_cap( + return &polaris_10_resource_cap; + } + +-static bool construct( ++static bool dce112_resource_construct( + uint8_t num_virtual_links, + struct dc *dc, + struct dce110_resource_pool *pool) +@@ -1370,7 +1370,7 @@ static bool construct( + return true; + + res_create_fail: +- destruct(pool); ++ dce112_resource_destruct(pool); + return false; + } + +@@ -1384,7 +1384,7 @@ struct resource_pool *dce112_create_resource_pool( + if (!pool) + return NULL; + +- if (construct(num_virtual_links, dc, pool)) ++ if (dce112_resource_construct(num_virtual_links, dc, pool)) + return &pool->base; + + kfree(pool); +diff --git a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c +index c982fd336cae..e9157583817f 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c +@@ -585,7 +585,7 @@ static void dce120_transform_destroy(struct transform **xfm) + *xfm = NULL; + } + +-static void destruct(struct dce110_resource_pool *pool) ++static void dce120_resource_destruct(struct dce110_resource_pool *pool) + { + unsigned int i; + +@@ -870,7 +870,7 @@ static void dce120_destroy_resource_pool(struct resource_pool **pool) + { + struct dce110_resource_pool *dce110_pool = TO_DCE110_RES_POOL(*pool); + +- destruct(dce110_pool); ++ dce120_resource_destruct(dce110_pool); + kfree(dce110_pool); + *pool = NULL; + } +@@ -1022,7 +1022,7 @@ static uint32_t read_pipe_fuses(struct dc_context *ctx) + return value; + } + +-static bool construct( ++static bool dce120_resource_construct( + uint8_t num_virtual_links, + struct dc *dc, + struct dce110_resource_pool *pool) +@@ -1235,7 +1235,7 @@ static bool construct( + clk_src_create_fail: + res_create_fail: + +- destruct(pool); ++ dce120_resource_destruct(pool); + + return false; + } +@@ -1250,7 +1250,7 @@ struct resource_pool *dce120_create_resource_pool( + if (!pool) + return NULL; + +- if (construct(num_virtual_links, dc, pool)) ++ if (dce120_resource_construct(num_virtual_links, dc, pool)) + return &pool->base; + + kfree(pool); +diff --git a/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c b/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c +index 6a9efa3bb93e..fd7acdb561b3 100644 +--- a/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c +@@ -771,7 +771,7 @@ static struct input_pixel_processor *dce80_ipp_create( + return &ipp->base; + } + +-static void destruct(struct dce110_resource_pool *pool) ++static void dce80_resource_destruct(struct dce110_resource_pool *pool) + { + unsigned int i; + +@@ -899,7 +899,7 @@ static void dce80_destroy_resource_pool(struct resource_pool **pool) + { + struct dce110_resource_pool *dce110_pool = TO_DCE110_RES_POOL(*pool); + +- destruct(dce110_pool); ++ dce80_resource_destruct(dce110_pool); + kfree(dce110_pool); + *pool = NULL; + } +@@ -1091,7 +1091,7 @@ static bool dce80_construct( + return true; + + res_create_fail: +- destruct(pool); ++ dce80_resource_destruct(pool); + return false; + } + +@@ -1288,7 +1288,7 @@ static bool dce81_construct( + return true; + + res_create_fail: +- destruct(pool); ++ dce80_resource_destruct(pool); + return false; + } + +@@ -1481,7 +1481,7 @@ static bool dce83_construct( + return true; + + res_create_fail: +- destruct(pool); ++ dce80_resource_destruct(pool); + return false; + } + +diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c +index a38c83c6aa5c..c4129e21e643 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c +@@ -917,7 +917,7 @@ static struct pp_smu_funcs *dcn10_pp_smu_create(struct dc_context *ctx) + return pp_smu; + } + +-static void destruct(struct dcn10_resource_pool *pool) ++static void dcn10_resource_destruct(struct dcn10_resource_pool *pool) + { + unsigned int i; + +@@ -1164,7 +1164,7 @@ static void dcn10_destroy_resource_pool(struct resource_pool **pool) + { + struct dcn10_resource_pool *dcn10_pool = TO_DCN10_RES_POOL(*pool); + +- destruct(dcn10_pool); ++ dcn10_resource_destruct(dcn10_pool); + kfree(dcn10_pool); + *pool = NULL; + } +@@ -1303,7 +1303,7 @@ static uint32_t read_pipe_fuses(struct dc_context *ctx) + return value; + } + +-static bool construct( ++static bool dcn10_resource_construct( + uint8_t num_virtual_links, + struct dc *dc, + struct dcn10_resource_pool *pool) +@@ -1590,7 +1590,7 @@ static bool construct( + + fail: + +- destruct(pool); ++ dcn10_resource_destruct(pool); + + return false; + } +@@ -1605,7 +1605,7 @@ struct resource_pool *dcn10_create_resource_pool( + if (!pool) + return NULL; + +- if (construct(init_data->num_virtual_links, dc, pool)) ++ if (dcn10_resource_construct(init_data->num_virtual_links, dc, pool)) + return &pool->base; + + kfree(pool); +diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +index d437be449edb..3119714586dd 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +@@ -1236,7 +1236,7 @@ void dcn20_dsc_destroy(struct display_stream_compressor **dsc) + + #endif + +-static void destruct(struct dcn20_resource_pool *pool) ++static void dcn20_resource_destruct(struct dcn20_resource_pool *pool) + { + unsigned int i; + +@@ -2932,7 +2932,7 @@ static void dcn20_destroy_resource_pool(struct resource_pool **pool) + { + struct dcn20_resource_pool *dcn20_pool = TO_DCN20_RES_POOL(*pool); + +- destruct(dcn20_pool); ++ dcn20_resource_destruct(dcn20_pool); + kfree(dcn20_pool); + *pool = NULL; + } +@@ -3388,7 +3388,7 @@ static bool init_soc_bounding_box(struct dc *dc, + return true; + } + +-static bool construct( ++static bool dcn20_resource_construct( + uint8_t num_virtual_links, + struct dc *dc, + struct dcn20_resource_pool *pool) +@@ -3707,7 +3707,7 @@ static bool construct( + + create_fail: + +- destruct(pool); ++ dcn20_resource_destruct(pool); + + return false; + } +@@ -3722,7 +3722,7 @@ struct resource_pool *dcn20_create_resource_pool( + if (!pool) + return NULL; + +- if (construct(init_data->num_virtual_links, dc, pool)) ++ if (dcn20_resource_construct(init_data->num_virtual_links, dc, pool)) + return &pool->base; + + BREAK_TO_DEBUGGER(); +diff --git a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +index de3ffefbf1f4..9ec73b513488 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +@@ -854,7 +854,7 @@ enum dcn20_clk_src_array_id { + DCN20_CLK_SRC_TOTAL_DCN21 + }; + +-static void destruct(struct dcn21_resource_pool *pool) ++static void dcn21_resource_destruct(struct dcn21_resource_pool *pool) + { + unsigned int i; + +@@ -1160,7 +1160,7 @@ static void dcn21_destroy_resource_pool(struct resource_pool **pool) + { + struct dcn21_resource_pool *dcn21_pool = TO_DCN21_RES_POOL(*pool); + +- destruct(dcn21_pool); ++ dcn21_resource_destruct(dcn21_pool); + kfree(dcn21_pool); + *pool = NULL; + } +@@ -1661,7 +1661,7 @@ static struct resource_funcs dcn21_res_pool_funcs = { + .update_bw_bounding_box = update_bw_bounding_box + }; + +-static bool construct( ++static bool dcn21_resource_construct( + uint8_t num_virtual_links, + struct dc *dc, + struct dcn21_resource_pool *pool) +@@ -1915,7 +1915,7 @@ static bool construct( + + create_fail: + +- destruct(pool); ++ dcn21_resource_destruct(pool); + + return false; + } +@@ -1930,7 +1930,7 @@ struct resource_pool *dcn21_create_resource_pool( + if (!pool) + return NULL; + +- if (construct(init_data->num_virtual_links, dc, pool)) ++ if (dcn21_resource_construct(init_data->num_virtual_links, dc, pool)) + return &pool->base; + + BREAK_TO_DEBUGGER(); +diff --git a/drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c b/drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c +index e1c84a2f7298..95d1c44a1d47 100644 +--- a/drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c ++++ b/drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c +@@ -45,18 +45,18 @@ + + struct gpio; + +-static void destruct( ++static void dal_hw_ddc_destruct( + struct hw_ddc *pin) + { + dal_hw_gpio_destruct(&pin->base); + } + +-static void destroy( ++static void dal_hw_ddc_destroy( + struct hw_gpio_pin **ptr) + { + struct hw_ddc *pin = HW_DDC_FROM_BASE(*ptr); + +- destruct(pin); ++ dal_hw_ddc_destruct(pin); + + kfree(pin); + +@@ -208,7 +208,7 @@ static enum gpio_result set_config( + } + + static const struct hw_gpio_pin_funcs funcs = { +- .destroy = destroy, ++ .destroy = dal_hw_ddc_destroy, + .open = dal_hw_gpio_open, + .get_value = dal_hw_gpio_get_value, + .set_value = dal_hw_gpio_set_value, +@@ -217,7 +217,7 @@ static const struct hw_gpio_pin_funcs funcs = { + .close = dal_hw_gpio_close, + }; + +-static void construct( ++static void dal_hw_ddc_construct( + struct hw_ddc *ddc, + enum gpio_id id, + uint32_t en, +@@ -244,7 +244,7 @@ void dal_hw_ddc_init( + return; + } + +- construct(*hw_ddc, id, en, ctx); ++ dal_hw_ddc_construct(*hw_ddc, id, en, ctx); + } + + struct hw_gpio_pin *dal_hw_ddc_get_pin(struct gpio *gpio) +diff --git a/drivers/gpu/drm/amd/display/dc/gpio/hw_generic.c b/drivers/gpu/drm/amd/display/dc/gpio/hw_generic.c +index f039c5982ac8..e41f60b23749 100644 +--- a/drivers/gpu/drm/amd/display/dc/gpio/hw_generic.c ++++ b/drivers/gpu/drm/amd/display/dc/gpio/hw_generic.c +@@ -44,22 +44,13 @@ + + struct gpio; + +-static void dal_hw_generic_construct( +- struct hw_generic *pin, +- enum gpio_id id, +- uint32_t en, +- struct dc_context *ctx) +-{ +- dal_hw_gpio_construct(&pin->base, id, en, ctx); +-} +- + static void dal_hw_generic_destruct( + struct hw_generic *pin) + { + dal_hw_gpio_destruct(&pin->base); + } + +-static void destroy( ++static void dal_hw_generic_destroy( + struct hw_gpio_pin **ptr) + { + struct hw_generic *generic = HW_GENERIC_FROM_BASE(*ptr); +@@ -88,7 +79,7 @@ static enum gpio_result set_config( + } + + static const struct hw_gpio_pin_funcs funcs = { +- .destroy = destroy, ++ .destroy = dal_hw_generic_destroy, + .open = dal_hw_gpio_open, + .get_value = dal_hw_gpio_get_value, + .set_value = dal_hw_gpio_set_value, +@@ -97,14 +88,14 @@ static const struct hw_gpio_pin_funcs funcs = { + .close = dal_hw_gpio_close, + }; + +-static void construct( +- struct hw_generic *generic, ++static void dal_hw_generic_construct( ++ struct hw_generic *pin, + enum gpio_id id, + uint32_t en, + struct dc_context *ctx) + { +- dal_hw_generic_construct(generic, id, en, ctx); +- generic->base.base.funcs = &funcs; ++ dal_hw_gpio_construct(&pin->base, id, en, ctx); ++ pin->base.base.funcs = &funcs; + } + + void dal_hw_generic_init( +@@ -124,7 +115,7 @@ void dal_hw_generic_init( + return; + } + +- construct(*hw_generic, id, en, ctx); ++ dal_hw_generic_construct(*hw_generic, id, en, ctx); + } + + +diff --git a/drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c b/drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c +index 88798cf3965e..1489fdfaf0e7 100644 +--- a/drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c ++++ b/drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c +@@ -44,34 +44,18 @@ + + struct gpio; + +-static void dal_hw_hpd_construct( +- struct hw_hpd *pin, +- enum gpio_id id, +- uint32_t en, +- struct dc_context *ctx) +-{ +- dal_hw_gpio_construct(&pin->base, id, en, ctx); +-} +- + static void dal_hw_hpd_destruct( + struct hw_hpd *pin) + { + dal_hw_gpio_destruct(&pin->base); + } + +- +-static void destruct( +- struct hw_hpd *hpd) +-{ +- dal_hw_hpd_destruct(hpd); +-} +- +-static void destroy( ++static void dal_hw_hpd_destroy( + struct hw_gpio_pin **ptr) + { + struct hw_hpd *hpd = HW_HPD_FROM_BASE(*ptr); + +- destruct(hpd); ++ dal_hw_hpd_destruct(hpd); + + kfree(hpd); + +@@ -118,7 +102,7 @@ static enum gpio_result set_config( + } + + static const struct hw_gpio_pin_funcs funcs = { +- .destroy = destroy, ++ .destroy = dal_hw_hpd_destroy, + .open = dal_hw_gpio_open, + .get_value = get_value, + .set_value = dal_hw_gpio_set_value, +@@ -127,14 +111,14 @@ static const struct hw_gpio_pin_funcs funcs = { + .close = dal_hw_gpio_close, + }; + +-static void construct( +- struct hw_hpd *hpd, ++static void dal_hw_hpd_construct( ++ struct hw_hpd *pin, + enum gpio_id id, + uint32_t en, + struct dc_context *ctx) + { +- dal_hw_hpd_construct(hpd, id, en, ctx); +- hpd->base.base.funcs = &funcs; ++ dal_hw_gpio_construct(&pin->base, id, en, ctx); ++ pin->base.base.funcs = &funcs; + } + + void dal_hw_hpd_init( +@@ -154,7 +138,7 @@ void dal_hw_hpd_init( + return; + } + +- construct(*hw_hpd, id, en, ctx); ++ dal_hw_hpd_construct(*hw_hpd, id, en, ctx); + } + + struct hw_gpio_pin *dal_hw_hpd_get_pin(struct gpio *gpio) +diff --git a/drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c b/drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c +index 86987f5e8bd5..80603e18ecd6 100644 +--- a/drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c ++++ b/drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c +@@ -401,7 +401,7 @@ static const struct irq_service_funcs irq_service_funcs_dce110 = { + .to_dal_irq_source = to_dal_irq_source_dce110 + }; + +-static void construct(struct irq_service *irq_service, ++static void dce110_irq_construct(struct irq_service *irq_service, + struct irq_service_init_data *init_data) + { + dal_irq_service_construct(irq_service, init_data); +@@ -419,6 +419,6 @@ dal_irq_service_dce110_create(struct irq_service_init_data *init_data) + if (!irq_service) + return NULL; + +- construct(irq_service, init_data); ++ dce110_irq_construct(irq_service, init_data); + return irq_service; + } +diff --git a/drivers/gpu/drm/amd/display/dc/irq/dce120/irq_service_dce120.c b/drivers/gpu/drm/amd/display/dc/irq/dce120/irq_service_dce120.c +index 750ba0ab4106..0a5e1a2a3c61 100644 +--- a/drivers/gpu/drm/amd/display/dc/irq/dce120/irq_service_dce120.c ++++ b/drivers/gpu/drm/amd/display/dc/irq/dce120/irq_service_dce120.c +@@ -271,7 +271,7 @@ static const struct irq_service_funcs irq_service_funcs_dce120 = { + .to_dal_irq_source = to_dal_irq_source_dce110 + }; + +-static void construct( ++static void dce120_irq_construct( + struct irq_service *irq_service, + struct irq_service_init_data *init_data) + { +@@ -290,6 +290,6 @@ struct irq_service *dal_irq_service_dce120_create( + if (!irq_service) + return NULL; + +- construct(irq_service, init_data); ++ dce120_irq_construct(irq_service, init_data); + return irq_service; + } +diff --git a/drivers/gpu/drm/amd/display/dc/irq/dce80/irq_service_dce80.c b/drivers/gpu/drm/amd/display/dc/irq/dce80/irq_service_dce80.c +index de218fe84a43..85f63b4a8b90 100644 +--- a/drivers/gpu/drm/amd/display/dc/irq/dce80/irq_service_dce80.c ++++ b/drivers/gpu/drm/amd/display/dc/irq/dce80/irq_service_dce80.c +@@ -281,7 +281,7 @@ static const struct irq_service_funcs irq_service_funcs_dce80 = { + .to_dal_irq_source = to_dal_irq_source_dce110 + }; + +-static void construct( ++static void dce80_irq_construct( + struct irq_service *irq_service, + struct irq_service_init_data *init_data) + { +@@ -300,7 +300,7 @@ struct irq_service *dal_irq_service_dce80_create( + if (!irq_service) + return NULL; + +- construct(irq_service, init_data); ++ dce80_irq_construct(irq_service, init_data); + return irq_service; + } + +diff --git a/drivers/gpu/drm/amd/display/dc/irq/dcn10/irq_service_dcn10.c b/drivers/gpu/drm/amd/display/dc/irq/dcn10/irq_service_dcn10.c +index d179e4d8c485..f86eb50ac461 100644 +--- a/drivers/gpu/drm/amd/display/dc/irq/dcn10/irq_service_dcn10.c ++++ b/drivers/gpu/drm/amd/display/dc/irq/dcn10/irq_service_dcn10.c +@@ -353,7 +353,7 @@ static const struct irq_service_funcs irq_service_funcs_dcn10 = { + .to_dal_irq_source = to_dal_irq_source_dcn10 + }; + +-static void construct( ++static void dcn10_irq_construct( + struct irq_service *irq_service, + struct irq_service_init_data *init_data) + { +@@ -372,6 +372,6 @@ struct irq_service *dal_irq_service_dcn10_create( + if (!irq_service) + return NULL; + +- construct(irq_service, init_data); ++ dcn10_irq_construct(irq_service, init_data); + return irq_service; + } +diff --git a/drivers/gpu/drm/amd/display/dc/irq/dcn20/irq_service_dcn20.c b/drivers/gpu/drm/amd/display/dc/irq/dcn20/irq_service_dcn20.c +index 1fdbc9e5f7bc..4711ea6f43e3 100644 +--- a/drivers/gpu/drm/amd/display/dc/irq/dcn20/irq_service_dcn20.c ++++ b/drivers/gpu/drm/amd/display/dc/irq/dcn20/irq_service_dcn20.c +@@ -357,7 +357,7 @@ static const struct irq_service_funcs irq_service_funcs_dcn20 = { + .to_dal_irq_source = to_dal_irq_source_dcn20 + }; + +-static void construct( ++static void dcn20_irq_construct( + struct irq_service *irq_service, + struct irq_service_init_data *init_data) + { +@@ -376,6 +376,6 @@ struct irq_service *dal_irq_service_dcn20_create( + if (!irq_service) + return NULL; + +- construct(irq_service, init_data); ++ dcn20_irq_construct(irq_service, init_data); + return irq_service; + } +diff --git a/drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c b/drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c +index 2794c0598f1e..8ec1f8f592ae 100644 +--- a/drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c ++++ b/drivers/gpu/drm/amd/display/dc/irq/dcn21/irq_service_dcn21.c +@@ -348,7 +348,7 @@ static const struct irq_service_funcs irq_service_funcs_dcn21 = { + .to_dal_irq_source = to_dal_irq_source_dcn21 + }; + +-static void construct( ++static void dcn21_irq_construct( + struct irq_service *irq_service, + struct irq_service_init_data *init_data) + { +@@ -367,6 +367,6 @@ struct irq_service *dal_irq_service_dcn21_create( + if (!irq_service) + return NULL; + +- construct(irq_service, init_data); ++ dcn21_irq_construct(irq_service, init_data); + return irq_service; + } +-- +2.17.1 + |